Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,842 Commits 1 Branch 0 Tags
60f6bbe92933fdfdacfab80ab07dc58fbdc909bb
Commit Graph

33842 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peter Fogg
60f6bbe929 Add correct payment processor messages. 
(facepalm)
 2015-11-18 14:05:37 -05:00
Peter Fogg
9d1290a180 Merge pull request #10662 from edx/peter-fogg/payment-processor-switches 
Display an error message if no payment processors are available.
 2015-11-18 14:00:37 -05:00
Peter Fogg
284dc7a3c6 Display an error message if no payment processors are available. 
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
 2015-11-18 12:55:09 -05:00
Sven Marnach
0054db103f Merge pull request #10660 from open-craft/smarnach/coursekey-cleanup 
Clean up occurrences of SlashSeparatedCourseKey in the django_comment_client app.
 2015-11-18 17:27:18 +01:00
Sven Marnach
3dcc3c4aae Clean up occurrences of SlashSeparatedCourseKey in the django_comment_client app. 
The preferred form is to use CourseKey.from_string() instead of
SlashSeparatedCourseKey.from_deprecated_string().
 2015-11-18 16:37:57 +01:00
Sven Marnach
8f2ea979eb Merge pull request #9616 from open-craft/smarnach/forum-vote-events 
Emit analytics events when users vote on forum posts.
 2015-11-18 16:36:08 +01:00
Sven Marnach
ef563e4285 Add tests for the discussion forum vote events. 2015-11-18 16:22:59 +01:00
Sven Marnach
cf5d276aea Emit events when users vote on forum posts. 2015-11-18 16:21:50 +01:00
raeeschachar
3f76da0bef Merge pull request #10657 from edx/raees/chrome-bok-choy-EditVisibilityModalTest 
Fixed Chrome Bok Choy tests
 2015-11-18 20:04:50 +05:00
raeeschachar
dfa0fe2db7 Fixed Chrome Bok Choy tests 2015-11-18 17:24:22 +05:00
Awais Qureshi
06cd352e00 Merge pull request #10596 from edx/awais786/ECOM-2832-cache-programs-data 
Awais786/ecom 2832 cache programs data
 2015-11-18 12:40:21 +05:00
Braden MacDonald
244b8ab9de Merge pull request #10302 from open-craft/sso-login-unactivated 
SSO - Allow users to sign in with unactivated accounts (SOL-1324)
 2015-11-17 18:37:40 -08:00
Nimisha Asthagiri
1870d4e55a Merge pull request #10613 from edx/mobile/unit-test-MA-1624 
MA-1624 Unit tests for User Partition Transformer
 2015-11-17 11:08:27 -05:00
Awais
86c66f5534 Adding cache implementation for the programs api. 
ECOM-2832
 2015-11-17 20:25:27 +05:00
Matt Drayer
bb91aeabcb Merge pull request #10646 from edx/asadiqbal08/SOL-1380-release-tag 
SOL-1380 release tag update in github.txt
 2015-11-17 10:12:17 -05:00
wajeeha-khalid
3287e811db Merge pull request #10567 from edx/jia/MA-860 
MA-860; No moderator permissions on closed thread
 2015-11-17 18:24:48 +05:00
Usman Khalid
9c2eb1f04a Merge pull request #10640 from edx/usman/wiki-preview-fix 
Use new django-pipeline tags.
 2015-11-17 15:59:07 +05:00
wajeeha-khalid
7de5882372 MA-860; No moderator permissions on closed thread 2015-11-17 14:02:35 +05:00
asadiqbal
290e577ea7 SOL-1380 release tag update in github.txt 2015-11-17 13:35:31 +05:00
wajeeha-khalid
9fcc1c32a1 Merge pull request #10586 from edx/jia/MA-862 
MA-862; accept application/merge-patch+json for comment/thread update
 2015-11-17 11:01:37 +05:00
Braden MacDonald
9ccf78ed06 Add some asserts and explanations, per review 2015-11-16 17:18:54 -08:00
Braden MacDonald
40448e44fa Address review comments and test failure 2015-11-16 16:11:00 -08:00
Braden MacDonald
f1bfa56884 Clean up integration tests, test logging in without activation 2015-11-16 16:11:00 -08:00
Braden MacDonald
90cdb91391 Allow users to login via third_party_auth even if not activated 2015-11-16 16:10:57 -08:00
Nimisha Asthagiri
521568937d MA-1624 Unit tests for User Partition Transformer. 2015-11-16 16:30:38 -05:00
Christina Roberts
08087861e1 Merge pull request #10643 from edx/christina/fix-remove-icons 
Correct the remove icon.
 2015-11-16 14:13:08 -05:00
cahrens
37cf46728d Correct the remove icon. 2015-11-16 12:29:42 -05:00
Sarina Canelake
79eea58ba6 Merge pull request #10483 from mitocw/gdm_feature_ccx_api_#122 
Enforced maximum amount of students for CCX
 2015-11-16 11:08:52 -05:00
Usman Khalid
4c608077d7 Use new django-pipeline tags. 2015-11-16 20:57:13 +05:00
Giovanni Di Milia
64acf4846b Enforced maximum amount of students for CCX 
CCX overrides course max_student_enrollments_allowed
and set it to 200 during CCX creation
 2015-11-16 10:10:37 -05:00
Christine Lytwynec
32d0fc7c26 Merge pull request #10622 from edx/clytwynec/jshint 
Clytwynec/jshint
 2015-11-16 08:59:41 -05:00
Adnan Ghaffar
fb34877212 Merge pull request #10599 from edx/adnan/chrome-bok-choy-fixes 
Adnan/chrome bok choy fixes
 2015-11-16 16:02:16 +05:00
Adnan Ghaffar
7dac728ee9 adding fixed tests for chrome 2015-11-16 14:47:12 +05:00
Peter Fogg
4cba4007fd Merge pull request #10633 from edx/peter-fogg/login-no-internet 
Show a message when logging in with no internet connection.
 2015-11-13 16:51:32 -05:00
Christine Lytwynec
9aa1f2b73f use .jshintignore instead of hardcoded directory list 2015-11-13 16:19:02 -05:00
Peter Fogg
c8fbadb24a Show a message when logging in with no internet connection. 
ECOM-2890
 2015-11-13 15:58:14 -05:00
Ben Patterson
b05c4af41c Merge pull request #10621 from edx/benp/back-to-upstream-nose 
Use upstream nose instead of a fork.
 2015-11-13 13:49:59 -05:00
Peter Pinch
fd8b757c90 Merge pull request #10250 from mitocw/feature/aq/add_pagination_gradebook 
Added pagination on grade book.
 2015-11-13 12:37:34 -05:00
Ben Patterson
f81b7cefc9 Merge pull request #10582 from edx/saleem-latif/SOL-1384 
saleem-latif/SOL-1384: Refactor certificates bok-choy pages to use PageObject
 2015-11-13 12:23:11 -05:00
Peter Pinch
6687aa1a66 Merge pull request #10538 from mitocw/fix/aq/error/validation_on_start_time 
Added validations for start and due date in Schedule tab inside CCX coach dashboard
 2015-11-13 11:09:51 -05:00
Diana Huang
b3b1b7e476 Merge pull request #10610 from edx/diana/flaky-pdf-testbook-test-control 
Start running the PDF Textbook test again.
 2015-11-13 10:52:23 -05:00
Amir Qayyum Khan
3ee5acfc00 Added error message incase user specified start or due date without time and also added start date and due date comparison validation in ccx coach dashboard validation. 2015-11-13 20:25:19 +05:00
Diana Huang
de47bcde7e Start running the PDF Textbook test again. 
Remove redundant and skipped video test.
 2015-11-13 10:02:51 -05:00
Matt Drayer
04c0b3aea9 Merge pull request #10595 from edx/saleem-latif/SOL-1333-feedback-changes 
saleem-latif/SOL-1333: Invalidate Generated Certificates before regeneration
 2015-11-13 09:18:54 -05:00
Matt Drayer
b932a202d8 Merge pull request #10593 from edx/asadiqbal08/SOL-1385 
asadiqbal/SOL-1385 Disable "Generate Certs" button until cert is activated
 2015-11-13 09:15:18 -05:00
clrux
1587178525 Merge pull request #9974 from edx/clrux/ac-187 
Video player (1 of 2): refreshing the UI
 2015-11-13 08:06:43 -05:00
Saleem Latif
195178aa41 Refactor certificates bok-choy pages to use PageObject 2015-11-13 16:32:13 +05:00
asadiqbal
35d04bff89 SOL-1385 2015-11-13 15:23:02 +05:00
wajeeha-khalid
4ea70aeb19 MA-862; accept application/merge-patch+json for comment/thread update 2015-11-13 12:52:21 +05:00
Saleem Latif
15380a00f7 invalidate Generated Certificates before regeneration 2015-11-13 12:26:19 +05:00