Commits · 4fd2a7d176444d0a996a20b48addb4ef5668a9bf · edx / edx-platform · GitLab

27 Apr, 2016 8 commits
- LMS fixes required to upgrade BackboneJS · 4fd2a7d1
  muhammad-ammar committed Apr 27, 2016
  
  4fd2a7d1 Browse Files
- CMS event fixes required to upgrade backbonejs · c8782144
  Ehtesham committed Apr 27, 2016
  
  c8782144 Browse Files
- CMS fixes required to upgrade backbonejs · 59e1cafc
  Ehtesham committed Apr 27, 2016
  
  59e1cafc Browse Files
- Common, squire fixes required to upgrade backbonejs · a1cb7b8f
```
TNL-4358
```
  muzaffaryousaf committed Apr 27, 2016
  a1cb7b8f Browse Files
- Upgrade backbone via npm. · e89a32d5
```
TNL-4335
```
  muzaffaryousaf committed Apr 27, 2016
  e89a32d5 Browse Files
- Merge pull request #12257 from edx/muddasser/bokchoy/chrome/test_if_captions_are_draggable · d670f8c4
```
branch out at assert based on chrome and firefox
```
  Muddasser committed Apr 27, 2016
  d670f8c4 Browse Files
- Merge pull request #12259 from edx/muddasser/bokchoy/chrome/screenshots_test · 1220a0a9
```
Changed screenshots to incorporate firefox and chrome
```
  Muddasser committed Apr 27, 2016
  1220a0a9 Browse Files
- Merge pull request #12264 from edx/douglashall/upgrade_xblock_lti_consumer_1_0_6 · 9eefe6a9
```
Upgrade xblock_lti_consumer to 1.0.6
```
  Douglas Hall committed Apr 26, 2016
  9eefe6a9 Browse Files
26 Apr, 2016 17 commits
- Merge pull request #12183 from edx/robrap/linter-run-quality · 40b2711c
```
TNL-4321: Add Jenkins support for Safe Templates Linter
```
  Robert Raposa committed Apr 26, 2016
  40b2711c Browse Files
- Merge pull request #12250 from edx/bjacobel/underscore.string-removal-v2 · 90499e77
```
remove usage of minifed Underscore.string
```
  Brian Jacobel committed Apr 26, 2016
  90499e77 Browse Files
- Upgrade xblock_lti_consumer to 1.0.6 · 139524ca
  Douglas Hall committed Apr 26, 2016
  
  139524ca Browse Files
- Merge pull request #12242 from edx/benp/bok-choy-0.5.2 · badb2ec3
```
Use bok-choy v0.5.2 for various improvements.
```
  Ben Patterson committed Apr 26, 2016
  badb2ec3 Browse Files
- Add Jenkins support for Safe Templates Linter · ec442789
  Robert Raposa committed Apr 26, 2016
  
  ec442789 Browse Files
- Merge pull request #12194 from edx/clintonb/jwt-oauth-access-token · 3138ff97
```
Updated access token view to return a JWT as an access token
```
  Clinton Blackburn committed Apr 26, 2016
  3138ff97 Browse Files
- Merge pull request #12255 from edx/waheed/ecom-3437-fix-celery-task · 28b0d993
```
Fixed celery task.
```
  Waheed Ahmed committed Apr 26, 2016
  28b0d993 Browse Files
- Merge pull request #12220 from edx/bjacobel/adaptive-hint-bug · b27c8f06
```
Math inputs _and_ adaptive hints are sized/positioned correctly
```
  Brian Jacobel committed Apr 26, 2016
  b27c8f06 Browse Files
- Updated access token view to return a JWT as an access token · 6941fcd7
```
The JWT includes the user email and username, along with details pulled from the original access token (e.g. scope, expiration).

ECOM-4221
```
  Clinton Blackburn committed Apr 26, 2016
  6941fcd7 Browse Files
- Changed screenshots to incorporate firefox and chrome · 2857e662
  Muddasser committed Apr 26, 2016
  
  2857e662 Browse Files
- Fixed celery task. · 61de4ffc
```
ECOM-3437
```
  Waheed Ahmed committed Apr 26, 2016
  61de4ffc Browse Files
- branch out at assert based on chrome and firefox · 99cbf18e
  Muddasser committed Apr 26, 2016
  
  99cbf18e Browse Files
- Merge pull request #12253 from edx/benp/flaky-condition · d0b8f5d4
```
Fix flaky condition related to settings page.
```
  Ben Patterson committed Apr 26, 2016
  d0b8f5d4 Browse Files
- Merge pull request #12107 from edx/ibrahimahmed443/WL-309-new-fields-in-studio · 8b014f26
```
WL-309 Add new text fields to Studio schedule and details settings page
```
  Ibrahim Ahmed committed Apr 26, 2016
  8b014f26 Browse Files
- Merge pull request #12049 from edx/aj/safe-templates · b4e80863
```
Safe templates
```
  Awais Jibran committed Apr 26, 2016
  b4e80863 Browse Files
- add new text fields to schedule and details settings page · 720bde1d
  Ibrahim committed Apr 25, 2016
  
  720bde1d Browse Files
- Merge pull request #12252 from edx/mattdrayer/microsite-override-ecommerce-api · 5adf6fec
```
mattdrayer: Add microsite settings overrides
```
  Matt Drayer committed Apr 25, 2016
  5adf6fec Browse Files
25 Apr, 2016 15 commits
- Fix flaky condition related to settings page. · 6ee3ea68
  Ben Patterson committed Apr 25, 2016
  
  6ee3ea68 Browse Files
- mattdrayer: Add microsite settings overrides · fdd045b1
  Matt Drayer committed Apr 25, 2016
  
  fdd045b1 Browse Files
- Merge pull request #12057 from edx/alasdair/fedx-118-pattern-library-styles-with-current-partials · ae52b9c4
```
Alasdair/fedx 118 pattern library styles with current partials
```
  Andy Armstrong committed Apr 25, 2016
  ae52b9c4 Browse Files
- Merge branch 'master' into alasdair/fedx-118-pattern-library-styles-with-current-partials · fe884029
  Andy Armstrong committed Apr 25, 2016
  
  fe884029 Browse Files
- Merge pull request #12219 from stvstnfrd/staticfiles/cms · 56d003e4
```
Remove LMS_ROOT / static from cms/common.py
```
  Andy Armstrong committed Apr 25, 2016
  56d003e4 Browse Files
- remove usage of minifed Underscore.string · 217ea5d0
  Brian Jacobel committed Apr 25, 2016
  
  217ea5d0 Browse Files
- Merge pull request #12248 from edx/benp/course-page-existence · f53b900f
```
FEDX-88. Marking test as flaky.
```
  Ben Patterson committed Apr 25, 2016
  f53b900f Browse Files
- FEDX-88. Marking test as flaky. · 9efdda83
  Ben Patterson committed Apr 25, 2016
  
  9efdda83 Browse Files
- Fix FEDX-167: Both math inputs and adaptive hints are sized correctly · 00fcb9dd
  Brian Jacobel committed Apr 25, 2016
  
  00fcb9dd Browse Files
- Merge pull request #12239 from edx/clrux/ac-444 · 74db655e
```
AC-444 Adding legacy event_type for language menu events
```
  clrux committed Apr 25, 2016
  74db655e Browse Files
- Merge pull request #12199 from edx/clrux/ac-385 · 6aa76d3f
```
AC-385 adding events for closed captions
```
  clrux committed Apr 25, 2016
  6aa76d3f Browse Files
- Fixes · c42b36cc
  Andy Armstrong committed Apr 25, 2016
  
  c42b36cc Browse Files
- Merge pull request #12228 from edx/clytwynec/ac-367 · 7814e7c9
```
Fix start url format for paver pa11ycrawler
```
  Christine Lytwynec committed Apr 25, 2016
  7814e7c9 Browse Files
- Use bok-choy v0.5.2 for various improvements. · 54839cb7
  Ben Patterson committed Apr 25, 2016
  
  54839cb7 Browse Files
- Merge pull request #12101 from edx/clrux/ac-342-tweaking-skip-links · 8e347f40
```
AC-342 sending skip links to single main, relevant
```
  clrux committed Apr 25, 2016
  8e347f40 Browse Files