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

22621 Commits

Author SHA1 Message Date
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
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
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
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
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
Diana Huang
b839253168 Merge pull request #15713 from edx/diana/in-place-enrollment 
Allow in-course enrollment
 2017-08-08 09:47:10 -04:00
Ahsan Ulhaq
e298004287 Accessibility issues on LMS Dashboard Social links 
LEARNER-2105
 2017-08-08 15:24:27 +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
bmedx
48e6e552f2 PLAT-1633: Upgrade django-ratelimit-backend to 1.1.1 2017-08-07 15:34:21 -04:00
cahrens
6f71706b17 Remove SlashSeparatedCourseKey from tests. 2017-08-07 14:49:30 -04:00
pepeportela
2bea8be06e Added spaces between arguments 2017-08-07 16:57:17 +02:00
pepeportela
e4003559de Add i18n month with strftime_localized in certificate views 2017-08-07 11:09:02 +02:00
Waheed Ahmed
f073a11475 Send welcome email to inactive learners on registration. 
LEARNER-2039
 2017-08-07 12:44:50 +05:00
Clinton Blackburn
986afbfa38 Powering courseware deadline with schedules 2017-08-05 22:06:17 -04:00
Clinton Blackburn
85e4274a05 Refactored tests for date summary blocks 2017-08-05 22:06:17 -04:00
Clinton Blackburn
7274a20f38 Created Schedule model 
This model will be used to control dynamic upgrade deadlines for
learners.
 2017-08-05 22:06:17 -04:00