Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

12296 Commits

Author SHA1 Message Date
Matthew Piatetsky
7c0423ff03 Revert revert of unenrollment survey. 
This reverts commit e2ee48c3c9.
 2017-08-22 16:33:05 -04:00
Matthew Piatetsky
e2ee48c3c9 Revert "Un-revert unenrollment survey and only show it for edx.org users" 2017-08-22 13:40:25 -04:00
Alex Dusenbery
2cc87952e3 EDUCATOR-1204 | can always view certs when ready for self-paced courses; don't hide cert buttons; update messaging. 2017-08-22 13:27:26 -04:00
Gregory Martin
b8aa3052ae Merge pull request #15813 from edx/yro/update_cert 
Update Certificate Task Call
 2017-08-22 12:42:43 -04:00
Matthew Piatetsky
98cf69bac5 Revert "Revert "LEARNER-1510 Add unenrollment reason survey"" 
This reverts commit 441bccf4b6.
 2017-08-22 10:12:01 -04:00
Gregory Martin
b19d80597c Update Task 2017-08-22 09:57:29 -04:00
Waheed Ahmed
6c74cf48e4 Merge pull request #15837 from edx/waheed/LEARNER-2110-add-activation-key-var-in-sailthru 
Add activation_key var to user profile in SailThru.
 2017-08-21 11:32:02 +05:00
Gregory Martin
147405df76 Update Flag handling 2017-08-19 08:37:21 -04:00
Andy Armstrong
82f7d6ee64 Convert /update_lang/ page to use Bootstrap 
LEARNER-1922
 2017-08-18 16:15:38 -04:00
George Song
98ee25fbab Merge pull request #15587 from open-craft/jill/tpa-hint-setting 
Adds settings.FEATURES['THIRD_PARTY_AUTH_HINT']
 2017-08-18 13:28:18 -04:00
Waheed Ahmed
33e077d4e2 Add activation_key var to user profile in SailThru. 
As an email marketer, I would like to send an account activation reminder to learners who haven't activated
their accounts to increase their chances of coming back and engaging with our platform. Each user profile in
SailThru will have a var with the correct activation_key originally assigned to the user.

LEARNER-2110
 2017-08-18 19:34:52 +05:00
Jillian Vogel
84c6c5ac27 Adds THIRD_PARTY_AUTH_HINT to SiteConfiguration and to site-wide setting.FEATURES 
When provided, this setting appends tpa_hint=<value> to the `next` URL provided for /login and /register page URLs, which bypasses the Open edX Login/Register page with an an automatic redirection to the TPA login/register URL.

This allows the already implemented tpa_hint feature to be automatically added to login, registration, and enrolment URLs generated throughout the platform.

Avoids auto-appending the tpa_hint parameter when the request is already in the TPA pipeline, to prevent infinite redirect loops, and adds tests to verify this behaviour.
 2017-08-17 14:01:00 +09:30
Jesse Shapiro
7a31441ebc Move to new consent API 2017-08-16 22:58:09 -04:00
Jeremy Bowman
1f06604694 PLAT-1710 Support lettuce tests in Docker Devstack 2017-08-16 17:30:18 -04:00
Sofiya Semenova
ffd72c1051 Merge pull request #15705 from edx/ssemenova/ed-526 
EDUCATOR-526 Update view certificate button
 2017-08-16 15:52:54 -04:00
Simon Chen
b8e4814634 Merge pull request #15811 from edx/schen/LEARNER-2222 
Stop audit and honor mode creating basket and order
 2017-08-16 15:03:30 -04:00
George Song
e1ad295a0f Merge pull request #15764 from pepeportela/teltek/i18n_certificate_date_utils 
Teltek/i18n certificate date utils
 2017-08-16 13:57:07 -04:00
Harry Rein
6f81e38291 Merge pull request #15810 from edx/HarryRein/LEARNER-2249-show-update-banner-to-staff 
Show Enroll Now banner to staff.
 2017-08-16 09:42:33 -04:00
Simon Chen
893b7a0060 Stop audit and honor mode creating basket and order 
LEARNER-2222
 2017-08-15 16:08:08 -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
Sofiya Semenova
76f1df6b0e EDUCATOR-526 Update view cert button to only appear after availability 
date has passed
 2017-08-15 11:57:28 -07:00
cahrens
b26b41b9fc Replace deprecated_string methods. 2017-08-15 14:21:45 -04:00
Matthew Piatetsky
441bccf4b6 Revert "LEARNER-1510 Add unenrollment reason survey" 2017-08-15 13:35:15 -04:00
Harry Rein
48d77676c2 Show Enroll Now banner to staff. 
LEARNER-2249

Allow staff to see the Enroll Now banner, matching the functionality of
the in course home messaging and showing the actual page that the
students can see before being enrolled.
 2017-08-15 11:13:35 -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
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
cahrens
819a56fee3 Remove usages of deprecated SlashSeparatedCourseKey. 2017-08-14 11:01:00 -04:00
Matthew Piatetsky
12bd5b49b5 Add unenrollment reason survey 
LEARNER-1510
 2017-08-14 09:46:56 -04:00
Tyler Hallada
a9c1e1cf43 Squashed commit of the following: 
commit 12880fa21eac0c2e69b2d832d42829f00484561d
Author: Tyler Hallada <thallada@edx.org>
Date:   Fri Aug 11 11:17:22 2017 -0400

    Tweak exam override messaging in progress.html

commit 6f90352dc27b3a199eea7efaf84b72df50f570a9
Merge: e0e9f83789 7c535f5fb9
Author: Tyler Hallada <thallada@edx.org>
Date:   Thu Aug 10 17:38:13 2017 -0400

    Merge remote-tracking branch 'origin/master' into EDUCATOR-926

commit e0e9f83789efa837577cedbcd5807c6fdba249e4
Author: Tyler Hallada <thallada@edx.org>
Date:   Thu Aug 10 17:35:26 2017 -0400

    Revert "Comment out actual override and log instead"

    This reverts commit 4953cf30d9.

commit 27d6b537c8915ecd1af8af51c8f9509db6ea0a26
Author: Tyler Hallada <thallada@edx.org>
Date:   Thu Aug 10 17:34:56 2017 -0400

    Revert "Fix tests"

    This reverts commit 1b2fec2129.

commit cabddd504ddcb4f92aeed8b5fec4bff0d64a8de3
Author: Tyler Hallada <thallada@edx.org>
Date:   Thu Aug 10 17:34:36 2017 -0400

    Revert "Remove override behavior and log instead"

    This reverts commit 1ab1880337.

commit dc9407f4606804e00d5aee4e80d309c7d7f9c437
Author: Tyler Hallada <thallada@edx.org>
Date:   Thu Aug 10 17:34:15 2017 -0400

    Revert "Fix python tests and use proctoring 1.0.0"

    This reverts commit 842ce8365f.
 2017-08-11 13:53:34 -04: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
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
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
Tyler Hallada
1b2fec2129 Fix tests 2017-08-09 13:51:20 -04: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
Alex Dusenbery
e17e9979d1 EDUCATOR-1117 | Call celery task with kwargs in the correct fashion. 2017-08-09 10:54:46 -04:00
Waheed Ahmed
f780b02b03 Send welcome email to inactive learners on registration. 
LEARNER-2039
 2017-08-09 16:39:14 +05:00
Ahsan Ulhaq
cc65dff728 Host poisoning vulnerability fix 
LEARNER-2172
 2017-08-08 16:27:48 -04:00
Stuart Young
806bbc13ab remove all occurrences of flaky decorator 2017-08-08 16:23:51 -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
Waheed Ahmed
853c9cd8df Revert "Send welcome email to inactive learners on registration." 2017-08-08 19:00:09 +05:00
Tyler Hallada
410cc166e7 Fix python unit tests 2017-08-07 16:43:27 -04:00
Diana Huang
8d3fa5432a Add in-place enrollment to course home page. 2017-08-07 16:33:20 -04:00
Christina Roberts
4f5b033c27 Merge pull request #15750 from edx/christina/slash-the-slash 
Remove SlashSeparatedCourseKey from tests
 2017-08-07 15:53:08 -04:00
Tyler Hallada
01a4f9af25 Set override to None on init_from_structure 2017-08-07 15:37:10 -04:00