Commits · ddbd7f917426ad0693efcfa7736daa9c417c491b · edx / edx-platform · GitLab

28 Apr, 2016 7 commits
- Designate 4th shard. · ddbd7f91
  Ben Patterson committed Apr 28, 2016
  
  ddbd7f91 Browse Files
- Create a 3rd explicit shard for unit tests. · b9558a90
```
More accurately, this creates a 4th shard because the
last shard is always the default.
```
  Ben Patterson committed Apr 28, 2016
  b9558a90 Browse Files
- Merge pull request #12293 from edx/revert-12144-SUST-35-course_key_from_string_or_404 · 9376c673
```
Revert "SUST-35 Implementation of course_key_from_string_or_404 to return course_key or raise a 404"
```
  Ayub khan committed Apr 28, 2016
  9376c673 Browse Files
- Merge pull request #12236 from edx/robrap/linter-python · 271f8233
```
TNL-4326: Add Python linting
```
  Robert Raposa committed Apr 28, 2016
  271f8233 Browse Files
- Merge pull request #12284 from edx/clrux/removing-outline-from-main · 1aab7516
```
Removing the focus outline for the main container in LMS
```
  clrux committed Apr 28, 2016
  1aab7516 Browse Files
- Revert "SUST-35 Implementation of course_key_from_string_or_404 to return… · 98620966
```
Revert "SUST-35 Implementation of course_key_from_string_or_404 to return course_key or raise a 404"
```
  Ayub khan committed Apr 28, 2016
  98620966 Browse Files
- Merge pull request #12271 from edx/waheed/ecom-4292-add-kosovo-to-country-list · 91d3b0bd
```
Added Kosovo in django country list.
```
  Waheed Ahmed committed Apr 28, 2016
  91d3b0bd Browse Files
27 Apr, 2016 29 commits
- Add Python linting · 374dcb32
  Robert Raposa committed Apr 27, 2016
  
  374dcb32 Browse Files
- Added Kosovo in django country list. · b7b4e0b0
```
ECOM-4292
```
  Waheed Ahmed committed Apr 28, 2016
  b7b4e0b0 Browse Files
- Merge pull request #12221 from edx/alasdair/ECOM-3200-program-card-learner-progress · a6da7159
```
Adding program progress bar to program cards
```
  AlasdairSwan committed Apr 27, 2016
  a6da7159 Browse Files
- Removing the focus outline for the main container in LMS · 746cae2c
  Chris Rodriguez committed Apr 27, 2016
  
  746cae2c Browse Files
- 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
- Adding program progress bar to program cards · cdb05c26
  AlasdairSwan committed Apr 27, 2016
  
  cdb05c26 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 4 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