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

42260 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Saleem Latif
9e3f7ed69b Add more debug info when SAMLProviderData is not found. 2017-08-11 15:21:19 +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
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
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
Albert St. Aubin
de6d48a698 Added Program Purchase button to the Programs dashboard 
Learners can upgrade or enroll as verified in all remaining courses in a program from their programs dashboard

[LEARNER-1899]
 2017-08-09 16:52:51 -04:00
Christina Roberts
5e81eb5bf0 Merge pull request #15390 from edx/christina/first-react 
Convert Studio course and library dashboard lists to React.
 2017-08-09 16:49:19 -04:00
Tyler Hallada
537966ab1e Merge branch 'master' into EDUCATOR-926 2017-08-09 16:22:09 -04:00
cahrens
e1e57b5d09 Convert course list to React. 
EDUCATOR-625, AC-620
 2017-08-09 15:09:37 -04:00
sarahkf
679bd2c6a6 Merge pull request #15743 from edx/sarahkf/proctor-review-rules 
Adding link to proctor review rules in Studio
 2017-08-09 15:06:57 -04:00
Harry Rein
a04af07d71 Merge pull request #15774 from edx/HarryRein/LEARNER-2027-resume-course-eventing 
Eventing on Resume Course click on home page
 2017-08-09 15:05:59 -04:00
Harry Rein
8415d766ee Merge pull request #15676 from edx/HarryRein/LEARNER-1857-new-profile-styling 
LEARNER-1857: New profile styling
 2017-08-09 15:04:58 -04:00
Harry Rein
8f6aa79c1a Adds eventing to Resume/Start course on Home Page. 
LEARNER-2027

Adding eventing on resume and start course button clicks as well as a single jasmine test to assure Logging is occuring as expected.
 2017-08-09 14:17:12 -04:00
Harry Rein
e8bae62f04 UX improvements on learner profile. 
LEARNER-1857

This story constitutes a large change to the UX of the learner profile.

Some specific changes include adding a flexible learner profile card, limiting the bio entry to only 300 characters and assuring that the page is responsive.
 2017-08-09 13:57:42 -04:00
Jesse Shapiro
f0c685307c Merge pull request #15739 from open-craft/haikuginger/configure-sap-sf-sso-user-fields 
[ENT-538] Configure country field for SAP SuccessFactors IdP
 2017-08-09 13:57:01 -04:00
Tyler Hallada
1b2fec2129 Fix tests 2017-08-09 13:51:20 -04:00
Jesse Shapiro
700e8053db Generalize support for user fields from SAP SuccessFactors SSO providers 2017-08-09 13:07:00 -04:00
Sarah Fischmann
2511c9fad6 Adding link to proctor review rules in Studio 
Allows instructors to see a link to the online proctoring review rules documentation while configuring and exam to be a proctored exam. Also updates the GitHub requirements to point to the newest 0.19.0 release of edx-proctoring.

EDUCATOR-757
 2017-08-09 12:48:02 -04:00
Feanil Patel
1be6698d3c Merge pull request #15783 from edx/revert-15768-bradmerlin/problem-builder-version-bump 
Revert "Update problem-builder xblock install version (PLAT-1644)"
 2017-08-09 12:26:30 -04:00
Braden MacDonald
b58579526c Revert "Update problem-builder xblock install version (PLAT-1644)" 2017-08-09 09:05:05 -07:00
Tyler Hallada
623ea5eb40 Merge branch 'master' into EDUCATOR-926 2017-08-09 11:22:05 -04:00
Tyler Hallada
4953cf30d9 Comment out actual override and log instead 2017-08-09 11:19:31 -04:00
Brian Mesick
7f32e03dd2 Merge pull request #15766 from edx/bmedx/ratelimit_upgrade_PLAT-1633 
Upgrade django-ratelimit-backend to Django 1.11
 2017-08-09 10:59:24 -04:00
Brian Mesick
1d47211245 Merge pull request #15768 from open-craft/bradmerlin/problem-builder-version-bump 
Update problem-builder xblock install version (PLAT-1644)
 2017-08-09 10:58:32 -04:00
Alex Dusenbery
e17e9979d1 EDUCATOR-1117 | Call celery task with kwargs in the correct fashion. 2017-08-09 10:54:46 -04:00
Waheed Ahmed
4f25d1aa2c Merge pull request #15779 from edx/waheed/LEARNER-2039-send-welcome-email-on-registration 
Send welcome email to inactive learners on registration.
 2017-08-09 19:22:50 +05:00
Waheed Ahmed
f780b02b03 Send welcome email to inactive learners on registration. 
LEARNER-2039
 2017-08-09 16:39:14 +05:00
Zubair Afzal
ed4a831f57 Merge pull request #15778 from edx/zub/ENT-557-enterprise-version-bump-to-0.39.9 
bump enterprise version from 0.39.8 to 0.39.9
 2017-08-09 14:34:22 +05:00
zubair-arbi
e5925c3f2a bump enterprise version from 0.39.8 to 0.39.9 
ENT-557
 2017-08-09 12:47:13 +05:00
Aamish Baloch
941605cc7e Merge pull request #15728 from edx/aamishbaloch/YONK-725 
YONK-725: PARENTAL_CONSENT_AGE_LIMIT set to be configurable
 2017-08-09 11:57:52 +05:00
edx-pipeline-bot
09c76a7b0f Merge pull request #15773 from edx/private_to_public_d28b140 
Mergeback PR from private to public.
 2017-08-08 17:19:12 -04:00
Christina Roberts
98dd14f21d Merge pull request #15770 from edx/christina/slash-the-slash 
Remove usages of deprecated SlashSeparatedCourseKey.
 2017-08-08 16:36:49 -04:00
Ahsan Ulhaq
0ad7084df8 fix python test 2017-08-08 16:27:48 -04:00
Ahsan Ulhaq
cc65dff728 Host poisoning vulnerability fix 
LEARNER-2172
 2017-08-08 16:27:48 -04:00
John Eskew
27557a0d92 Merge pull request #15746 from edx/jeskew/celery_modules_to_django1.11_compat 
Upgrade celery modules to Django 1.11-compatible versions.
 2017-08-08 14:07:41 -04:00
Alex Dusenbery
272da1e528 EDUCATOR-1043 | ZeroSubsectionGrade's graded/all_total should have a non-zero possible score where appropriate. 2017-08-08 12:40:26 -04:00
cahrens
fd62164563 Remove usages of deprecated SlashSeparatedCourseKey. 2017-08-08 12:32:58 -04:00
Tasawer Nawaz
9b9995e8bf Merge pull request #15769 from edx/revert-15731-waheed/LEARNER-2039-send-welcome-email-on-new-user-creation 
Revert "Send welcome email to inactive learners on registration."
 2017-08-08 21:04:52 +05:00
bmedx
973d26f4b6 Make autodiscover the same across CMS/LMS 2017-08-08 11:21:51 -04:00
bmedx
45d6f97e63 Clean up autodiscover 2017-08-08 10:28:27 -04:00
Waheed Ahmed
853c9cd8df Revert "Send welcome email to inactive learners on registration." 2017-08-08 19:00:09 +05:00