Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
42,312 Commits 1 Branch 0 Tags
f55d79001df5aaa201152c7f1e14f686e92c65d2
Commit Graph

42312 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Beggs
f55d79001d Merge pull request #15825 from edx/bbeggs/devstack_forums 
Enable forums for docker devstack
 2017-08-16 09:33:25 -04:00
Christina Roberts
8e4ae99e8a Merge pull request #15814 from edx/christina/usage-key 
Replace deprecated_string methods.
 2017-08-15 15:12:02 -04:00
Brian Beggs
f451c7602e Enable forums for docker devstack 2017-08-15 15:05:11 -04:00
Jesse Zoldak
7966fb1c30 Merge pull request #15823 from edx/zoldak/LEARNER-2267 
Remove flaky video test test_video_position_save_state  LEARNER-2267
 2017-08-15 14:58:03 -04:00
cahrens
b26b41b9fc Replace deprecated_string methods. 2017-08-15 14:21:45 -04:00
Matthew Piatetsky
129d298d3a Merge pull request #15824 from edx/revert-15744-LEARNER-1510 
Revert "LEARNER-1510 Add unenrollment reason survey"
 2017-08-15 13:40:29 -04:00
Matthew Piatetsky
441bccf4b6 Revert "LEARNER-1510 Add unenrollment reason survey" 2017-08-15 13:35:15 -04:00
Nimisha Asthagiri
4474b20bfc Merge pull request #15815 from edx/neem/course-overviews-memory 
Prevent high mem usage in generate_course_overview
 2017-08-15 13:24:25 -04:00
Jesse Zoldak
fb66af5cac Merge pull request #15820 from edx/zoldak/LEARNER-2265 
Remove flaky test test_multiple_videos_in_sequentials_load_and_work LEARNER-2265
 2017-08-15 13:15:34 -04:00
Jesse Zoldak
3b853126d8 Remove flaky video test test_video_position_save_state LEARNER-2267 2017-08-15 13:10:16 -04:00
Ned Batchelder
fb068fd705 Merge pull request #15818 from edx/nedbat/git-hashes-only 
Use commit hashes on all non-edX GitHub requirements
 2017-08-15 13:07:35 -04:00
Nimisha Asthagiri
987ef9dc9d Prevent high mem usage in generate_course_overview. 2017-08-15 12:11:41 -04:00
Michael Frey
0205720d46 Merge pull request #15816 from edx/mjfrey/enrollment-throttle 
Increase rate-limit staff or superusers for enrollment API.
 2017-08-15 11:52:00 -04:00
Jesse Zoldak
6d94796a2c Remove flaky test test_multiple_videos_in_sequentials_load_and_work 2017-08-15 11:00:00 -04:00
Ned Batchelder
775393a194 Use commit hashes on all non-edX GitHub requirements 2017-08-15 10:28:53 -04:00
Michael Frey
e35b35f6c2 Increase rate-limit staff or superusers for enrollment API. 2017-08-15 10:21:30 -04:00
McKenzie Welter
aae392a5b4 Merge pull request #15786 from edx/McKenzieW/learner-1721 
Send program UUID to ecommerce for program purchase tracking
 2017-08-15 09:16:08 -04:00
Jeremy Bowman
5e2742027b Merge pull request #15712 from edx/jmbowman/PLAT-1676 
PLAT-1676 Use pytest for bok-choy tests
 2017-08-14 17:03:20 -04:00
Andy Armstrong
0df428fe38 Merge pull request #15808 from edx/andya/fix-xsy-message-logo 
Fix the edx.org theme location for Xsy images
 2017-08-14 16:52:35 -04:00
Albert St. Aubin
790c3e5a07 Added Program UUID to the end of purchase button URL when purchasing a program 
[LEARNER-1721]
 2017-08-14 16:23:15 -04:00
Matthew Piatetsky
28a7a3e6bd Merge pull request #15744 from edx/LEARNER-1510 
LEARNER-1510 Add unenrollment reason survey
 2017-08-14 15:39:26 -04:00
Andy Armstrong
d75beaf9cd Fix the edx.org theme location for Xsy images 
LEARNER-2217
 2017-08-14 13:42:38 -04:00
Ned Batchelder
c9e8fc371c Merge pull request #15807 from edx/nedbat/translate-two-strings 
Two labels were untranslated, fixed.
 2017-08-14 13:36:13 -04:00
Stu Young
af9b5b5863 Merge pull request #15775 from edx/estute/remove-flaky-decorator 
remove all occurrences of flaky decorator
 2017-08-14 13:26:40 -04:00
Ned Batchelder
6e9ac07710 Merge pull request #15805 from edx/nedbat/update-translations 
Update translations (autogenerated message)
 2017-08-14 12:52:43 -04:00
Ned Batchelder
c75c742b83 Two labels were untranslated, fixed. 2017-08-14 12:03:40 -04:00
Christina Roberts
1e5e822d62 Merge pull request #15776 from edx/christina/slash-the-slash-2 
Remove usages of deprecated SlashSeparatedCourseKey.
 2017-08-14 11:58:31 -04:00
Jeremy Bowman
9e3f35db22 PLAT-1676 Use pytest for bok-choy tests 2017-08-14 11:49:39 -04:00
McKenzie Welter
6413dcc214 Merge pull request #15804 from edx/McKenzieW/discount-data-retrieval-failure 
Make is_discounted False when failing to retrieve discount data
 2017-08-14 11:48:55 -04:00
Ned Batchelder
408d6b5e0c Update translations (autogenerated message) 2017-08-14 11:32:28 -04:00
Brittney Exline
39cb750499 Merge pull request #15796 from open-craft/uman/bump-enterprise-0.40.1 
[ENT-495] Bump edx-enterprise to 0.40.1.
 2017-08-14 11:31:04 -04:00
cahrens
819a56fee3 Remove usages of deprecated SlashSeparatedCourseKey. 2017-08-14 11:01:00 -04:00
McKenzie Welter
f11a4cf589 updated exception handling 2017-08-14 10:59:00 -04:00
Matthew Piatetsky
12bd5b49b5 Add unenrollment reason survey 
LEARNER-1510
 2017-08-14 09:46:56 -04:00
Uman Shahzad
cc3a63415e Add consent application to installed apps. 2017-08-14 10:41:14 +05:00
Uman Shahzad
bfb5531110 Bump edx-enterprise to 0.40.1. 
This adds a new DataSharingConsent model, but it is unused for now.
 2017-08-14 10:40:36 +05:00
Christina Roberts
0aaea6a080 Merge pull request #15801 from edx/christina/educator-1134 
Log courses with improper end dates.
 2017-08-11 17:58:20 -04:00
cahrens
6446f6111e Log courses with improper end dates. 
EDUCATOR-1134
 2017-08-11 14:37:16 -04:00
edx-pipeline-bot
dc2f808f60 Merge pull request #15797 from edx/release-mergeback-to-master 
Merge release back to master
 2017-08-11 13:20:28 -04:00
Brian Mesick
e14cad4532 Merge pull request #15784 from edx/bmedx/app_label_warnings_PLAT-1642_PLAT-1643 
Reorder INSTALLED_APPS
 2017-08-11 13:10:30 -04:00
Christina Roberts
b7a5e5c90b Merge pull request #15798 from edx/christina/hint-spacing 
Force hint notification to take up entire width.
 2017-08-11 13:01:50 -04:00
Tasawer Nawaz
ec16e43502 Merge pull request #15760 from edx/tasawer/learner-966/remove-local-server-call-on-logistration 
Remove local server call on logistration
 2017-08-11 21:35:32 +05:00
Eric Fischer
064f277b3b Merge pull request #15736 from edx/efischer/ora-2.0.0 
edx-ora2 2.0.0
 2017-08-11 12:32:27 -04:00
cahrens
2135195e17 Force hint notification to take up entire width. 
EDUCATOR-1136
 2017-08-11 11:41:08 -04:00
Brittney Exline
9bf5f84104 Merge pull request #15793 from open-craft/uman/bump-enterprise-0.40.0 
[ENT-341] Bump edx-enterprise to 0.40.0.
 2017-08-11 10:56:13 -04:00
Waheed Ahmed
55b60f5fc7 Merge pull request #15795 from edx/waheed/LEARNER-2125-fix-multiple-donation-boxes 
Fix recent enrollment message and multiple donation boxes.
 2017-08-11 19:17:34 +05:00
Eric Fischer
198b2522df Finalize edx-ora2 2.0.x upgrade 
Includes updated versions of edx-submissions, jsonfield.
 2017-08-11 09:56:04 -04:00
Saleem Latif
0d2af2ae80 Merge pull request #15792 from edx/saleem-latif/ENT-566 
ENT-566: Add more debug info when SAMLProviderData is not found.
 2017-08-11 18:38:47 +05:00
Waheed Ahmed
f98a27ef8b Fix recent enrollment message and multiple donation boxes. 
When purchasing multiple courses (especially with bundled Program purchase) the donation box shows up multiple times. Donation box should only show once regardless of number of courses purchased.

LEARNER-2125
 2017-08-11 17:35:25 +05:00
Uman Shahzad
979825b7fb Bump edx-enterprise to 0.40.0. 
This incorporates the new Programs and Catalogs endpoints.
 2017-08-11 15:27:31 +05:00