Commits · 625e76a595319b7bdfb9e989b6f58484898a0d45 · edx / edx-platform · GitLab

27 Apr, 2016 24 commits
- Merge pull request #12262 from edx/jeskew/pillow_upgrade · 625e76a5
```
Upgrade pillow.
```
  John Eskew committed Apr 27, 2016
  625e76a5 Browse Files
- Merge pull request #12280 from edx/release · 0acccf2f
```
Release to Master (2016-04-26 release)
```
  David Ormsbee committed Apr 27, 2016
  0acccf2f Browse Files
- Merge pull request #12151 from edx/bjacobel/requirejs-errors-in-django-templates · 19b92429
```
Fix errors in old Django templates / migrate to Mako
```
  Brian Jacobel committed Apr 27, 2016
  19b92429 Browse Files
- Merge pull request #12263 from edx/tnl/next-button-fix · 036537f1
```
Fix Next Button's 404 error
```
  Nimisha Asthagiri committed Apr 27, 2016
  036537f1 Browse Files
- Merge pull request #12232 from edx/rc/2016-04-26 · 7d7d5a16
```
Release Candidate rc/2016-04-26
```
  David Ormsbee committed Apr 27, 2016
  7d7d5a16 Browse Files
- Merge pull request #12251 from edx/bjacobel/use-unminified-assets · 0f1366a7
```
Use unminified picturefill in development
```
  Brian Jacobel committed Apr 27, 2016
  0f1366a7 Browse Files
- Merge pull request #11042 from edx/jeskew/xml_removal · 08998719
```
Remove XML modulestore code from most tests.
```
  John Eskew committed Apr 27, 2016
  08998719 Browse Files
- Use unminified picturefill in development · 12d65f58
  Brian Jacobel committed Apr 27, 2016
  
  12d65f58 Browse Files
- Merge pull request #12273 from… · edb356a4
```
Merge pull request #12273 from edx/ahsan/revert-ECOM-4281-js-test-for-analytics-event-on-LMS-receipt-page

Revert "Add js test for analytics event on LMS receipt page"
```
  Ahsan Ulhaq committed Apr 27, 2016
  edb356a4 Browse Files
- Fix quality issue. · 8354e6d7
  John Eskew committed Apr 27, 2016
  
  8354e6d7 Browse Files
- Merge pull request #12231 from edx/renzo/program-progress · 63b65ab0
```
Measuring program progress
```
  Renzo Lucioni committed Apr 27, 2016
  63b65ab0 Browse Files
- Revert "Add js test for analytics event on LMS receipt page" · 5f6474ac
```
This reverts commit 785b752d.
```
  Ahsan Ulhaq committed Apr 27, 2016
  5f6474ac Browse Files
- Merge pull request #12037 from edx/fedx/upgrade-backbone · d97b3cbd
```
Upgrade backbone via npm.
```
  Muzaffar yousaf committed Apr 27, 2016
  d97b3cbd Browse Files
- Merge pull request #12260 from edx/clrux/ac-400 · c6a4c231
```
AC-400 removing tabindex from bookmark
```
  clrux committed Apr 27, 2016
  c6a4c231 Browse Files
- Merge pull request #12238 from edx/ahsan/ECOM-4281-js-test-for-analytics-event-on-LMS-receipt-page · be6aea17
```
Add js test for analytics event on LMS receipt page
```
  Ahsan Ulhaq committed Apr 27, 2016
  be6aea17 Browse Files
- 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
- Fix Next Button's 404 error · 2396cc49
```
MA-2305
```
  Nimisha Asthagiri committed Apr 26, 2016
  2396cc49 Browse Files
26 Apr, 2016 16 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
- Add js test for analytics event on LMS receipt page · 785b752d
```
ECOM-4281
```
  Ahsan Ulhaq committed Apr 27, 2016
  785b752d Browse Files
- Measuring program progress · 5da6a598
```
Introduces a utility class for gauging a user's progress towards program completion. Progress data is passed to the ProgramListFactory. ECOM-3200.
```
  Renzo Lucioni committed Apr 26, 2016
  5da6a598 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
- Upgrade pillow. · 71430055
  John Eskew committed Apr 26, 2016
  
  71430055 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
- AC-400 removing tabindex from bookmark · fed39609
  Chris Rodriguez committed Apr 26, 2016
  
  fed39609 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