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

16696 Commits

Author SHA1 Message Date
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
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
Diana Huang
24d6d377ba Merge pull request #15789 from edx/diana/new-updates-behavior 
Add new latest-update fragment and waffle flag.
 2017-08-16 17:15:49 -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
Kevin Falcone
c2175423fe BOOK_URL hasn't been used since the 6.00 courses 
RSS_TIMEOUT was removed in e8ee29786f
but missed in lms/envs
 2017-08-16 15:04:02 -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
Diana Huang
dcf528a597 Add new latest-update fragment and waffle flag. 2017-08-16 13:58:56 -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
66fe1c9ad6 Merge pull request #15812 from edx/HarryRein/LEARNER-2238-profile-tweaks 
Applying styling changes.
 2017-08-16 12:49:05 -04:00
Harry Rein
23640ad20d Minor Styling Fixed for Learner Profile 
LEARNER-2238

- Assure change image only shows on hover
- Better UX for delete image, only shows on hover
- Fixing issue with bottom border when user does not have a country set
- Issues with location of pencil icon in dropdown edit modeApplying styling changes.
 2017-08-16 10:18:45 -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
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
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
Brian Beggs
f451c7602e Enable forums for docker devstack 2017-08-15 15:05:11 -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
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
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
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
Ned Batchelder
408d6b5e0c Update translations (autogenerated message) 2017-08-14 11:32:28 -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
Uman Shahzad
cc3a63415e Add consent application to installed apps. 2017-08-14 10:41:14 +05: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
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
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
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
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
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