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

14978 Commits

Author SHA1 Message Date
Douglas Hall
3a65cedf23 Merge pull request #15895 from edx/saleem-latif/ENT-605 
ENT-605: On edx.org instances, next URL for login page cannot contain 'edx.org'.
 2017-08-28 10:37:23 -04:00
Alex Dusenbery
9009a5b0d3 may_certify_for_course checks if course is self_paced. 2017-08-25 14:37:53 -04:00
Saleem Latif
f087672d4b On edx.org instances, next URL for login page cannot contain 'edx.org'. 2017-08-25 17:31:35 +05: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
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
Michael Roytman
c27af617ea Merge pull request #15889 from edx/mroytman/EDU-1134 
remove try/catch block and associated test for EDUCATOR-1134 followin…
 2017-08-24 09:51:18 -04:00
Waheed Ahmed
54b50341bd Modified migrations sync test. 2017-08-24 11:58:17 +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
Michael Roytman
21113eb835 remove try/catch block and associated test for EDUCATOR-1134 following verification that no stage or production courses have issues related to dates 2017-08-23 16:00:51 -04:00
Calen Pennington
9d2d98e2c8 Merge pull request #15882 from edx/ret/improve-site-config-factory 
Make SiteConfigurationFactory more useable
 2017-08-23 15:28:24 -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
efcc154ab4 Make SiteConfigurationFactory more useable 2017-08-23 14:18:50 -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
Jesse Zoldak
83dee24410 Merge pull request #15885 from edx/zoldak/EDUCATOR-1233 
Remove flaky test PreRequisiteCourseTest.test_dashboard_message
 2017-08-23 12:53:19 -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
Jesse Zoldak
8cca5d1649 Remove flaky test PreRequisiteCourseTest.test_dashboard_message 2017-08-23 11:50:17 -04:00
Calen Pennington
bfd7241e0c Remove a test that was only valid for XML-backed courses 2017-08-23 10:52:52 -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
Stu Young
7318161760 Merge pull request #15844 from edx/estute/remove-skipped-flaky-tests 
remove or unskip skipped flaky tests
 2017-08-23 09:26:39 -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
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
Ned Batchelder
eeb70ca3e3 Merge pull request #15856 from edx/nedbat/fix-field-i18n 
XBlock fields with formatted-in values can now translate properly
 2017-08-21 11:19:01 -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
Ned Batchelder
fee0c41ce0 XBlock fields with formatted-in values can now translate properly 2017-08-19 15:37:12 -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
Michael Frey
fb7b98da0b increase staff user rate limit 2017-08-17 16:23:10 -04:00
Stuart Young
a6fe9fca0a remove or unskip skipped flaky tests 2017-08-17 15:37:43 -04:00
Jesse Zoldak
f69a3a2d27 Merge pull request #15841 from edx/zoldak/LEARNER-2288 
Remove flaky test CoursewareSearchTest::test_reindex  LEARNER-2288
 2017-08-17 15:21:41 -04:00
Jesse Zoldak
48b115bf79 Merge pull request #15840 from edx/zoldak/EDUCATOR-1178 
Removed flaky test: test_proctored_exam_flow  EDUCATOR-1178
 2017-08-17 15:20:35 -04:00
Jesse Zoldak
b50c5f3710 Remove flaky test CoursewareSearchTest::test_reindex 2017-08-17 10:31:11 -04:00
Jesse Zoldak
b2faa181d9 Removed flaky test: test_proctored_exam_flow 2017-08-17 10:15:13 -04: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
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
Christina Roberts
8e4ae99e8a Merge pull request #15814 from edx/christina/usage-key 
Replace deprecated_string methods.
 2017-08-15 15:12:02 -04:00
Jesse Zoldak
7966fb1c30 Merge pull request #15823 from edx/zoldak/LEARNER-2267 
Remove flaky video test test_video_position_save_state  LEARNER-2267
 2017-08-15 14:58:03 -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
Jesse Zoldak
fb66af5cac Merge pull request #15820 from edx/zoldak/LEARNER-2265 
Remove flaky test test_multiple_videos_in_sequentials_load_and_work LEARNER-2265
 2017-08-15 13:15:34 -04:00
Jesse Zoldak
3b853126d8 Remove flaky video test test_video_position_save_state LEARNER-2267 2017-08-15 13:10:16 -04:00
Jesse Zoldak
6d94796a2c Remove flaky test test_multiple_videos_in_sequentials_load_and_work 2017-08-15 11:00:00 -04:00
Michael Frey
e35b35f6c2 Increase rate-limit staff or superusers for enrollment API. 2017-08-15 10:21:30 -04:00
Jeremy Bowman
5e2742027b Merge pull request #15712 from edx/jmbowman/PLAT-1676 
PLAT-1676 Use pytest for bok-choy tests
 2017-08-14 17:03:20 -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
Jeremy Bowman
9e3f35db22 PLAT-1676 Use pytest for bok-choy tests 2017-08-14 11:49:39 -04:00
cahrens
819a56fee3 Remove usages of deprecated SlashSeparatedCourseKey. 2017-08-14 11:01:00 -04:00
cahrens
6446f6111e Log courses with improper end dates. 
EDUCATOR-1134
 2017-08-11 14:37:16 -04:00
cahrens
2135195e17 Force hint notification to take up entire width. 
EDUCATOR-1136
 2017-08-11 11:41:08 -04:00