Commits · ee2f22953ed274bb150917a258fcebe8c2b09632 · edx / edx-platform · GitLab

26 Jun, 2015 4 commits
- Consolidating merge from rebase · ee2f2295
  Jolyon Bloomfield committed Jun 27, 2015
  
  ee2f2295 Browse Files
- Making background pictures printable · 0e2865e4
  Jolyon Bloomfield committed Jun 27, 2015
  
  0e2865e4 Browse Files
- Merge pull request #8681 from edx/will/credit-provider-integration-fixups · 7f451c88
```
Credit provider integration fixups
```
  Will Daly committed Jun 25, 2015
  7f451c88 Browse Files
- Merge pull request #8682 from edx/muhhshoaib/PHX-40-sorting-of-popular-coupon-codes · 0bc2c42e
```
PHX-40 added the sorting of the most popular coupon codes used.
```
  chrisndodge committed Jun 25, 2015
  0bc2c42e Browse Files
25 Jun, 2015 24 commits
- Merge pull request #8658 from open-craft/library-create-unrestricted · 22a3f862
```
Remove restrictions on library creation in Studio (SOL-808)
```
  Braden MacDonald committed Jun 25, 2015
  22a3f862 Browse Files
- Merge pull request #8677 from edx/ahodges/video_help · 05972a60
```
Fixes DOC-1715, video doc is now in the correct RTD project
```
  Alison Hodges committed Jun 25, 2015
  05972a60 Browse Files
- Merge pull request #8676 from edx/will/fix-credit-provider-config-unicode-error · ab915d19
```
Gracefully handle credit provider keys with unicode type
```
  Will Daly committed Jun 25, 2015
  ab915d19 Browse Files
- Accept string-encoded timestamps · da982341
  Will Daly committed Jun 25, 2015
  
  da982341 Browse Files
- Make credit provider callback CSRF exempt · 62742952
  Will Daly committed Jun 25, 2015
  
  62742952 Browse Files
- Remove restrictions on library creation in Studio · 24af22ca
  Braden MacDonald committed Jun 25, 2015
  
  24af22ca Browse Files
- PHX-40 added the sorting of the most popular coupon codes used. · 0442e700
  Muhammad Shoaib committed Jun 26, 2015
  
  0442e700 Browse Files
- Merge pull request #8665 from edx/mekkz/course-overviews-fix · 4d6cefcc
```
MA-879 Fix bug in course_start_datetime_text
```
  Kyle McCormick committed Jun 25, 2015
  4d6cefcc Browse Files
- MA-879 Fix bug in course_start_datetime_text · 8c505e6b
  Kyle McCormick committed Jun 25, 2015
  
  8c505e6b Browse Files
- Fixes DOC-1715, video doc is now in the correct RTD project · 9ed127ec
  Alison Hodges committed Jun 25, 2015
  
  9ed127ec Browse Files
- Merge pull request #8675 from edx/release-merge-test · c63ac868
```
Release merge 06-24-2015
```
  Nimisha Asthagiri committed Jun 25, 2015
  c63ac868 Browse Files
- Gracefully handle credit provider keys with unicode type · 8548d557
  Will Daly committed Jun 25, 2015
  
  8548d557 Browse Files
- Merge pull request #8673 from edx/mattdrayer/SOL-449 · ee479a0b
```
mattdrayer/SOL-449: Add flaky decorator to bok choy test
```
  Matt Drayer committed Jun 25, 2015
  ee479a0b Browse Files
- Merge branch 'release' · 8b5e5c59
  Nimisha Asthagiri committed Jun 25, 2015
  
  8b5e5c59 Browse Files
- mattdrayer/SOL-449: Add flaky decorator to bok choy test · f7262a21
  Matt Drayer committed Jun 25, 2015
  
  f7262a21 Browse Files
- Merge pull request #8650 from edx/utkjad/platform-eusc · 091dc4c3
```
Moving xblock_user_state to edx-user-state-client, and add dependency to edx-platform
```
  Utkarsh committed Jun 25, 2015
  091dc4c3 Browse Files
- Merge pull request #8529 from edx/andya/bokchoy-asset-pipeline · 4ff1c8b3
```
Update Bok Choy to run against optimized static files
```
  Andy Armstrong committed Jun 25, 2015
  4ff1c8b3 Browse Files
- Merge pull request #8671 from edx/ahsan/ECOM-1739-reverification-ask-for-webcam-permission-twice · 95091794
```
Reverification flow asks for permission to use the webcam twice
```
  Ahsan Ulhaq committed Jun 25, 2015
  95091794 Browse Files
- Fix flaky test_import_timestamp test. · 923edee1
```
TNL-2386
```
  cahrens committed Jun 25, 2015
  923edee1 Browse Files
- Update Bok Choy to use optimized static assets · aa76d948
```
TNL-2465
```
  Andy Armstrong committed Jun 25, 2015
  aa76d948 Browse Files
- Merge pull request #8668 from edx/peter-fogg/update-team-tab-urls · 5ca6bfeb
```
Update URL when switching between Team tabs.
```
  Peter Fogg committed Jun 25, 2015
  5ca6bfeb Browse Files
- Reverification flow asks for permission to use the webcam twice · 84f03a16
```
In-course Reverification checkpoint ask for the camera access twice on
Chrome.

ECOM-1739
```
  Ahsan Ulhaq committed Jun 25, 2015
  84f03a16 Browse Files
- Adding dependency for edx-user-state-client · dac018f4
  Utkarsh committed Jun 25, 2015
  
  dac018f4 Browse Files
- Merge pull request #8648 from edx/will/eligibility-provider-refactor · 4662246b
```
Update credit eligibility
```
  Will Daly committed Jun 24, 2015
  4662246b Browse Files
24 Jun, 2015 12 commits
- Update credit eligibility · 75d194e2
```
* Update credit eligibility when a user satisfies an eligibility requirement.
* Refactor set_credit_requirement_status arguments.
* Use django-simple-history to track requirement status changes.
* Refactor progress page by moving credit into a helper function and adding comments.
```
  Will Daly committed Jun 24, 2015
  75d194e2 Browse Files
- Update URL when switching between Team tabs. · e6c7a571
  Peter Fogg committed Jun 24, 2015
  
  e6c7a571 Browse Files
- Merge pull request #8663 from edx/christina/move-forgot-password-modal · 16807d7f
```
Move forgot_password_modal to login.html.
```
  Christina Roberts committed Jun 24, 2015
  16807d7f Browse Files
- Merge pull request #8654 from edx/christina/delete-dead-lms-code · 5b91a97e
```
Delete LMS JS files that have no references to them.
```
  Christina Roberts committed Jun 24, 2015
  5b91a97e Browse Files
- Merge pull request #8662 from edx/christina/remove-flaky-test · 2013c963
```
Fix flaky teams test
```
  Christina Roberts committed Jun 24, 2015
  2013c963 Browse Files
- Merge branch 'rc/2015-06-24' into release · 4b643164
  Nimisha Asthagiri committed Jun 24, 2015
  
  4b643164 Browse Files
- Merge pull request #8664 from edx/clytwynec/TE-937 · 30c049c8
```
split common/lib and js unit tests into separate shards
```
  Christine Lytwynec committed Jun 24, 2015
  30c049c8 Browse Files
- Merge pull request #8601 from IONISx/tusbar/fix-enrollment-post-doc · 9e785235
```
Fix misleading enrollment API documentation & fix pylint errors
```
  Mark Hoeber committed Jun 24, 2015
  9e785235 Browse Files
- Fix flaky test. · a5fc4e6d
```
TNL-2494
```
  cahrens committed Jun 24, 2015
  a5fc4e6d Browse Files
- Merge pull request #8635 from edx/ahsan/ECOM-1594-Credit-eligibility-cms-accessibility-issues · 40808638
```
Credit Eligibility display on the CMS accessibility issues
```
  Ahsan Ulhaq committed Jun 24, 2015
  40808638 Browse Files
- Shorten long lines to resolve pylint issues · f19b3381
  Bertrand Marron committed Jun 24, 2015
  
  f19b3381 Browse Files
- Fix misleading enrollment API documentation · e0ed2d8a
```
The user parameter corresponds to the username, not the user ID.
```
  Bertrand Marron committed Jun 24, 2015
  e0ed2d8a Browse Files