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

16684 Commits

Author SHA1 Message Date
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
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
537966ab1e Merge branch 'master' into EDUCATOR-926 2017-08-09 16:22:09 -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
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
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
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
Ahsan Ulhaq
cc65dff728 Host poisoning vulnerability fix 
LEARNER-2172
 2017-08-08 16:27:48 -04:00