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

16738 Commits

Author SHA1 Message Date
George Song
0c204e3520 Merge pull request #15641 from jspayd/toggle-timer-upstream 
Toggle timer visibility on timed exams
 2017-08-28 18:39:41 -04:00
uzairr
1aea33cefc Fix email will not sent to white-label users 
White label partners reported that the users are receiving edX
welcome emails at the time of signup.To solve it, a check is added
that will assure, only edX users will receive the welcome email.

LEARNER-1466

changes requested

update

update

updated
 2017-08-28 14:55:24 +00:00
Ibrahim Ahmed
47311e1942 Merge pull request #15902 from edx/ibrahimahmed443/WL-1186-program-dashboard-layout 
fix layout issues in Program dashboard page
 2017-08-28 19:23:59 +05:00
Ibrahim
165954b12c fix layout issues in Program dashboard page 
WL-1186
 2017-08-28 17:39:45 +05:00
Ned Batchelder
92c406e46a Update translations (autogenerated message) 2017-08-25 17:21:52 -04:00
Alex Dusenbery
9009a5b0d3 may_certify_for_course checks if course is self_paced. 2017-08-25 14:37:53 -04:00
Robert Raposa
c32d8a62d0 Merge pull request #15866 from edx/diana/update-events 
LEARNER-2025: Update event naming for course sock.
 2017-08-25 09:14:24 -04:00
Waheed Ahmed
100b5aa5dd Merge pull request #15863 from edx/waheed/LEARNER-2201-remove-deprecated-field 
Remove deprecated field 'sailthru_activation_template'.
 2017-08-25 12:28:23 +05:00
Diana Huang
086e15c9b6 Update event naming for course sock. 
Only show course sock to English readers.
 2017-08-24 16:36:28 -04:00
Matthew Piatetsky
dc576c6c2a Merge pull request #15888 from edx/LEARNER-1510 
Add back expression filter
 2017-08-24 16:32:38 -04:00
Albert (AJ) St. Aubin
eff07af1c1 Merge pull request #15891 from edx/aj/LEARNER-2352 
Corrected issue with missing Certificated on Program Dashboard View
 2017-08-24 13:42:35 -04:00
Albert St. Aubin
eab62e786f Corrected issue with missing Certificated on Program Dashboard View 
LEARNER-2352
 2017-08-24 11:17:43 -04:00
Tyler Hallada
2298bd2553 Merge pull request #15791 from edx/EDUCATOR-926 
EDUCATOR-1127 Override grade to zero when exam attempt is rejected Final
 2017-08-24 10:50:56 -04:00
Sofiya Semenova
65ee2ebbaf Merge pull request #15833 from edx/ssemenova/ed-801 
EDUCATOR-801 Certificate issued date should be the certificate availability date for instructor-paced courses
 2017-08-24 10:22:29 -04:00
Waheed Ahmed
b069020710 Remove deprecated field 'sailthru_activation_template'. 
LEARNER-2201
 2017-08-24 11:58:16 +05:00
Sofiya Semenova
c7fc1929f2 ED-801 Certificate issued date should display the certificate availability date for instructor paced coursest 2017-08-23 17:07:43 -04:00
sanfordstudent
fdfd577a61 Merge pull request #15884 from edx/sstudent/hide_cert_available_self_paced 
cert available date hidden in self paced
 2017-08-23 15:28:15 -04:00
Matthew Piatetsky
5f91b72780 Add back expression filter 2017-08-23 15:14:36 -04:00
Calen Pennington
3aa02f2913 Merge pull request #15880 from edx/ret/remove-extraneous-request-argument 
Remove extraneous request argument to experiments.utils.check_and_get…
 2017-08-23 14:53:26 -04:00
Calen Pennington
6c9b38dcfd Merge pull request #15877 from edx/ret/course-mode-factory 
Use a consistent CourseModeFactory from the course_modes module, rath…
 2017-08-23 14:16:54 -04:00
Sanford Student
d0b2787f24 TNL-1230: cert available date hidden in self paced 2017-08-23 13:58:48 -04:00
Calen Pennington
63244b514d Use a consistent CourseModeFactory from the course_modes module, rather than using one from student 2017-08-23 12:15:46 -04:00
Calen Pennington
127e90e3a3 Remove extraneous request argument to experiments.utils.check_and_get_upgrade_link 2017-08-23 10:38:39 -04:00
Matthew Piatetsky
dcee785543 Fix selectors so that unenrollment survey works with multiple courses 2017-08-22 17:31:50 -04:00
Matthew Piatetsky
7c0423ff03 Revert revert of unenrollment survey. 
This reverts commit e2ee48c3c9.
 2017-08-22 16:33:05 -04:00
Diana Huang
40a5b066dc Merge pull request #15843 from edx/robrap/LEARNER-1858-show-join-date-2 
Support for joined date to profile.
 2017-08-22 15:43:49 -04:00
ayub-khan
e737728cde Updated Country Label and help text 
Country Label was causing confusions for learners if it was country of origin or in which they
are living so changed it to a more appropriate message.
LEARNER-174
Also updated some other error messages to some more appropriate error messages.
 2017-08-22 23:20:35 +05: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
Robert Raposa
7cc9400b91 Support for joined date to profile. 
LEARNER-1858
 2017-08-22 12:52:37 -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
25ffb3568c Update unenrollment survey to only be included for edx.org and rebase with master 2017-08-22 10:12:01 -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
Diana Huang
cb381a7cff Use an X icon instead of text. 2017-08-22 09:13:48 -04:00
McKenzie Welter
3e4d20e0d4 bundle purchase tracking 2017-08-21 11:22:52 -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
ayub-khan
558490e71b Fix for dialog rendering 2017-08-18 18:10:09 +05:00
Joshua Spayd
ab8717edbf Fix timer accessibility problems 2017-08-17 14:42:04 -07:00
Simon Chen
442bcae46e Merge pull request #15207 from teltek/teltek/bugfix/cookie-consent-navigation 
Cookie consent page loaded from navigation template instead of footer…
 2017-08-17 13:37:33 -04:00
mrey
e54c83fc8d Fix cookie consent page loaded from navigation template instead of footer template after rebasing master 2017-08-17 17:48:16 +02:00
mrey
86852206bc Cookie consent page loaded from navigation template instead of footer template. 
Following the commit ae9c686912, we can see the cookie consent template was loaded from footer template.
The login and registration templates do not load footer, so the cookie consent template is not being loader either.
With this fix, the cookie consent template is being loaded from navigation template, so it is shown in login and registration pages as well.
 2017-08-17 17:39:48 +02:00
Adeel Khan
e966188ba6 Improve ECOM connection on student dashboard via on demand ajax calls. 
Fix course unenroll dialog's incorrect message rendering. LEARNER-2033
 2017-08-17 18:18:04 +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
Feanil Patel
b649d5a259 Merge pull request #15830 from edx/jibsheet/remove-unused-settings 
BOOK_URL hasn't been used since the 6.00 courses
 2017-08-16 20:05:09 -04:00