Commits · 943fbdd4ca1576c77e276e17b148f98275dba3c3 · edx / edx-platform · GitLab

19 Nov, 2015 1 commit
- Merge pull request #10665 from edx/benp/shard-7-rebal · 943fbdd4
```
Rebalance shard 7.
```
  Ben Patterson committed Nov 19, 2015
  943fbdd4 Browse Files
18 Nov, 2015 14 commits
- Rebalance shard 7. · 0d68cd01
  Ben Patterson committed Nov 18, 2015
  
  0d68cd01 Browse Files
- Merge pull request #10668 from edx/peter-fogg/correct-payment-message · 7c4ac3da
```
Add correct payment processor messages.
```
  Peter Fogg committed Nov 18, 2015
  7c4ac3da Browse Files
- Add correct payment processor messages. · 60f6bbe9
```
(facepalm)
```
  Peter Fogg committed Nov 18, 2015
  60f6bbe9 Browse Files
- Merge pull request #10662 from edx/peter-fogg/payment-processor-switches · 9d1290a1
```
Display an error message if no payment processors are available.
```
  Peter Fogg committed Nov 18, 2015
  9d1290a1 Browse Files
- Display an error message if no payment processors are available. · 284dc7a3
```
Otto is gaining the ability to temporarily disable payment
processors. If all are disabled, no checkout buttons will appear on
the payment page, and so we need to communicate to the user that they
cann't pay right now but should try again later.

ECOM-2346
```
  Peter Fogg committed Nov 18, 2015
  284dc7a3 Browse Files
- Merge pull request #10660 from open-craft/smarnach/coursekey-cleanup · 0054db10
```
Clean up occurrences of SlashSeparatedCourseKey in the django_comment_client app.
```
  Sven Marnach committed Nov 18, 2015
  0054db10 Browse Files
- Clean up occurrences of SlashSeparatedCourseKey in the django_comment_client app. · 3dcc3c4a
```
The preferred form is to use CourseKey.from_string() instead of
SlashSeparatedCourseKey.from_deprecated_string().
```
  Sven Marnach committed Nov 18, 2015
  3dcc3c4a Browse Files
- Merge pull request #9616 from open-craft/smarnach/forum-vote-events · 8f2ea979
```
Emit analytics events when users vote on forum posts.
```
  Sven Marnach committed Nov 18, 2015
  8f2ea979 Browse Files
- Add tests for the discussion forum vote events. · ef563e42
  Sven Marnach committed Nov 18, 2015
  
  ef563e42 Browse Files
- Emit events when users vote on forum posts. · cf5d276a
  Sven Marnach committed Nov 18, 2015
  
  cf5d276a Browse Files
- Merge pull request #10657 from edx/raees/chrome-bok-choy-EditVisibilityModalTest · 3f76da0b
```
Fixed Chrome Bok Choy tests
```
  raeeschachar committed Nov 18, 2015
  3f76da0b Browse Files
- Fixed Chrome Bok Choy tests · dfa0fe2d
  raeeschachar committed Nov 18, 2015
  
  dfa0fe2d Browse Files
- Merge pull request #10596 from edx/awais786/ECOM-2832-cache-programs-data · 06cd352e
```
Awais786/ecom 2832 cache programs data
```
  Awais Qureshi committed Nov 18, 2015
  06cd352e Browse Files
- Merge pull request #10302 from open-craft/sso-login-unactivated · 244b8ab9
```
SSO - Allow users to sign in with unactivated accounts (SOL-1324)
```
  Braden MacDonald committed Nov 17, 2015
  244b8ab9 Browse Files
17 Nov, 2015 12 commits
- Merge pull request #10613 from edx/mobile/unit-test-MA-1624 · 1870d4e5
```
MA-1624 Unit tests for User Partition Transformer
```
  Nimisha Asthagiri committed Nov 17, 2015
  1870d4e5 Browse Files
- Adding cache implementation for the programs api. · 86c66f55
```
ECOM-2832
```
  Awais committed Nov 17, 2015
  86c66f55 Browse Files
- Merge pull request #10646 from edx/asadiqbal08/SOL-1380-release-tag · bb91aeab
```
SOL-1380 release tag update in github.txt
```
  Matt Drayer committed Nov 17, 2015
  bb91aeab Browse Files
- Merge pull request #10567 from edx/jia/MA-860 · 3287e811
```
MA-860; No moderator permissions on closed thread
```
  wajeeha-khalid committed Nov 17, 2015
  3287e811 Browse Files
- Merge pull request #10640 from edx/usman/wiki-preview-fix · 9c2eb1f0
```
Use new django-pipeline tags.
```
  Usman Khalid committed Nov 17, 2015
  9c2eb1f0 Browse Files
- MA-860; No moderator permissions on closed thread · 7de58823
  wajeeha-khalid committed Nov 17, 2015
  
  7de58823 Browse Files
- SOL-1380 release tag update in github.txt · 290e577e
  asadiqbal committed Nov 17, 2015
  
  290e577e Browse Files
- Merge pull request #10586 from edx/jia/MA-862 · 9fcc1c32
```
MA-862; accept application/merge-patch+json for comment/thread update
```
  wajeeha-khalid committed Nov 17, 2015
  9fcc1c32 Browse Files
- Add some asserts and explanations, per review · 9ccf78ed
  Braden MacDonald committed Nov 16, 2015
  
  9ccf78ed Browse Files
- Address review comments and test failure · 40448e44
  Braden MacDonald committed Nov 16, 2015
  
  40448e44 Browse Files
- Clean up integration tests, test logging in without activation · f1bfa568
  Braden MacDonald committed Nov 16, 2015
  
  f1bfa568 Browse Files
- Allow users to login via third_party_auth even if not activated · 90cdb913
  Braden MacDonald committed Nov 16, 2015
  
  90cdb913 Browse Files
16 Nov, 2015 9 commits
- MA-1624 Unit tests for User Partition Transformer. · 52156893
  Nimisha Asthagiri committed Nov 16, 2015
  
  52156893 Browse Files
- Merge pull request #10643 from edx/christina/fix-remove-icons · 08087861
```
Correct the remove icon.
```
  Christina Roberts committed Nov 16, 2015
  08087861 Browse Files
- Correct the remove icon. · 37cf4672
  cahrens committed Nov 16, 2015
  
  37cf4672 Browse Files
- Merge pull request #10483 from mitocw/gdm_feature_ccx_api_#122 · 79eea58b
```
Enforced maximum amount of students for CCX
```
  Sarina Canelake committed Nov 16, 2015
  79eea58b Browse Files
- Use new django-pipeline tags. · 4c608077
  Usman Khalid committed Nov 16, 2015
  
  4c608077 Browse Files
- Enforced maximum amount of students for CCX · 64acf484
```
CCX overrides course max_student_enrollments_allowed
and set it to 200 during CCX creation
```
  Giovanni Di Milia committed Nov 16, 2015
  64acf484 Browse Files
- Merge pull request #10622 from edx/clytwynec/jshint · 32d0fc7c
```
Clytwynec/jshint
```
  Christine Lytwynec committed Nov 16, 2015
  32d0fc7c Browse Files
- Merge pull request #10599 from edx/adnan/chrome-bok-choy-fixes · fb348772
```
Adnan/chrome bok choy fixes
```
  Adnan Ghaffar committed Nov 16, 2015
  fb348772 Browse Files
- adding fixed tests for chrome · 7dac728e
  Adnan Ghaffar committed Nov 16, 2015
  
  7dac728e Browse Files
13 Nov, 2015 4 commits
- Merge pull request #10633 from edx/peter-fogg/login-no-internet · 4cba4007
```
Show a message when logging in with no internet connection.
```
  Peter Fogg committed Nov 13, 2015
  4cba4007 Browse Files
- use .jshintignore instead of hardcoded directory list · 9aa1f2b7
  Christine Lytwynec committed Nov 13, 2015
  
  9aa1f2b7 Browse Files
- Show a message when logging in with no internet connection. · c8fbadb2
```
ECOM-2890
```
  Peter Fogg committed Nov 13, 2015
  c8fbadb2 Browse Files
- Merge pull request #10621 from edx/benp/back-to-upstream-nose · b05c4af4
```
Use upstream nose instead of a fork.
```
  Ben Patterson committed Nov 13, 2015
  b05c4af4 Browse Files