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

42297 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
bmedx
f538aafe98 Upgrade of django-model-utils to 3.0.0 for Django 1.11 support 2017-08-15 11:19:45 -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
Saleem Latif
9e3f7ed69b Add more debug info when SAMLProviderData is not found. 2017-08-11 15:21:19 +05:00
tasawernawaz
e6d552941d Remove Local Server Call on Logistration 
LEARNER-966
 2017-08-11 14:41:46 +05:00
sanfordstudent
7c535f5fb9 Merge pull request #15735 from edx/sstudent/lms_cert_date 
add cert available date to lms
 2017-08-10 16:37:57 -04:00
sarahkf
505face32c Merge pull request #15787 from edx/sarahkf/bump-proctoring-version 
bump proctoring version to 1.1.0
 2017-08-10 14:50:53 -04:00
Christina Roberts
d91f9f9415 Merge pull request #15788 from edx/christina/disable-archived-courses 
Disable ENABLE_SEPARATE_ARCHIVED_COURSES due to server error.
 2017-08-10 14:47:56 -04:00
McKenzie Welter
bf955d451b Merge pull request #15711 from edx/aj/LEARNER-1899 
Added Program Purchase button to Programs dashboard with optional Program Completion
 2017-08-10 14:32:37 -04:00
cahrens
b22f35b71d Disable ENABLE_SEPARATE_ARCHIVED_COURSES due to server error. 
EDUCATOR-1134
 2017-08-10 13:58:41 -04:00
bmedx
62f1790999 Fix several RemovedInDjango19Warning by re-ordering INSTALLED_APPS 
- PLAT-1642
- PLAT-1643
 2017-08-10 13:54:28 -04:00
Sanford Student
4cda804410 add cert available date to lms 
for EDUCATOR-525
 2017-08-10 13:40:47 -04:00
Sarah Fischmann
0a8fc51f96 bump proctoring version to 1.1.0 2017-08-10 13:07:13 -04:00
Tyler Hallada
4e183b41c6 Merge pull request #15726 from edx/EDUCATOR-926 
EDUCATOR-926 Override grade to zero when exam attempt is rejected Part 2
 2017-08-10 12:37:55 -04:00
Muhammad Ammar
ac78d4d802 Merge pull request #15688 from edx/ammar/update-video-uploads-page 
update video uploads page
 2017-08-10 11:35:56 +05:00
muhammad-ammar
712e63bb08 update video uploads page 
EDUCATOR-1037
 2017-08-10 10:22:55 +05:00
Tyler Hallada
842ce8365f Fix python tests and use proctoring 1.0.0 2017-08-09 18:08:37 -04:00
Tyler Hallada
1ab1880337 Remove override behavior and log instead 
This will break tests.
 2017-08-09 17:27:58 -04:00