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

14998 Commits

Author SHA1 Message Date
Harry Rein
f42e6f1c5d Merge pull request #15826 from edx/HarryRein/LEANER-1859-social-profile-links 
LEARNER-1859: social profile links
 2017-08-29 14:43:30 -04:00
Harry Rein
9f88427f9b Add social links to learner profile. 
LEARNER-1859

Added fields to add social links to the user account settings file.
Added icons to the user profile when these links are set, only shown
when users show their entire profile. Added jasmine tests for account
settings and learner profile pages. Added python unit tests to test
validation on the user account.
 2017-08-29 13:53:08 -04:00
Noraiz Anwar
03abf94a80 Merge pull request #15916 from edx/revert-15889-mroytman/EDU-1134 
Revert "remove try/catch block and associated test for EDUCATOR-1134"
 2017-08-29 22:47:16 +05:00
Jeremy Bowman
565ec7a541 Merge pull request #15918 from edx/jmbowman/test_reliability_fixes 
Fix tests that depend on execution order
 2017-08-29 13:46:59 -04:00
Jeremy Bowman
00c4ede8ee Merge pull request #15831 from edx/jmbowman/PLAT-1710 
PLAT-1710 Support lettuce tests in Docker Devstack
 2017-08-29 13:25:58 -04:00
Omar Al-Ithawi
d0c7a532ad Make the platform name translatable 2017-08-29 12:43:36 -04:00
Alex Dusenbery
167e4d582f Remove flaky DragAndDropTest class. 2017-08-29 12:37:08 -04:00
Douglas Hall
42d462a957 Merge pull request #15913 from edx/zub/ENT-600-update-sap-odata-log-message 
add error message in odata api log
 2017-08-29 11:15:03 -04:00
Jeremy Bowman
0d7806e0cd Fix tests that depend on execution order 2017-08-29 11:08:47 -04:00
Noraiz Anwar
d13928559a Revert "remove try/catch block and associated test for EDUCATOR-1134 followin…" 2017-08-29 19:43:01 +05:00
zubair-arbi
64152e6841 add error message in odata api log 
ENT-600
 2017-08-29 19:10:22 +05:00
Michael Frey
508aa7f3a3 Merge pull request #15914 from edx/mjfrey/increase-rate-limit 
increase staff rate limit on enrollment API.
 2017-08-29 10:00:43 -04:00
Waheed Ahmed
dd95861177 Merge pull request #15911 from edx/waheed/LEARNER-2201-create-delete-migration 
Create migration to remove field 'sailthru_activation_template' from DB table.
 2017-08-29 18:36:49 +05:00
Nimisha Asthagiri
d23ed5e2e4 Merge pull request #15878 from edx/ret/foreign-key-course-key 
Ret/foreign key course key
 2017-08-29 09:00:51 -04:00
Michael Frey
8604a11c1f increase staff rate limit on enrollment API. 2017-08-29 08:52:27 -04:00
Waheed Ahmed
7d5446125d Create migration to remove 'sailthru_activation_template' from DB. 
Follow up PR for PR-15863 to remove the field from database table.

LEARNER-2201
 2017-08-29 13:07:28 +05:00
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
Calen Pennington
ceb0814fff Force the CourseKey alter tables to be noops from the SQL perspective 2017-08-24 11:38:05 -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
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
0faa683776 Update access to deprecated enrollment.course (which now doesn't create the CourseOverview transparently) 2017-08-23 15:24:44 -04:00
Calen Pennington
84075efc81 Convert CourseKeyField to ForeignKey(CourseOverview) on enrollments and course modes 2017-08-23 15:24:43 -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