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

5589 Commits

Author SHA1 Message Date
Sofiya Semenova
b40ba4437b Merge pull request #16042 from edx/ssemenova/ed-1233 
Replace flakey PreRequisiteCourseTest.test_dashboard_message with Python unit test
 2017-09-20 10:22:11 -04:00
Douglas Hall
610a4100af Revert "Initialize enterprise api client with provided user" 2017-09-20 09:55:02 -04:00
Sofiya Semenova
19e7d1e0cf Ed-1233 replace flaky bokchoy test with python test 2017-09-19 16:12:40 -04:00
Alex Dusenbery
ab71318104 EDUCATOR-1316 | Refactor courseware.views.views._get_cert_data and related functions. 2017-09-19 11:11:37 -04:00
zubair-arbi
16120efaeb Initialize enterprise api client with provided user 
ENT-624
 2017-09-19 14:56:43 +05:00
Nico van Niekerk
f2d51639ba FIX: course enrollment search, FIX: hidden tabs on instructor dashboard 2017-09-18 09:34:46 +02:00
tasawernawaz
6263a5743f Fix attribute error while reseting password 
LEARNER-388
 2017-09-14 22:55:29 +05:00
ayub-khan
79b199bce9 Updated set_user_attribute method 2017-09-14 17:09:09 +05:00
asadiqbal
a3a105cb2c ENT-604 Fix SAML Error on UI 2017-09-12 14:50:52 +05:00
Chandrakant Gopalan
96e704e47c Allow theme template block override 2017-09-11 21:42:25 -04:00
Jeremy Bowman
97f5fe035b Fixes for pytest database usage 2017-09-06 13:15:34 -04:00
Jeremy Bowman
6fb7d63c9e Fixes for test order dependence 2017-09-06 11:31:37 -04:00
Jeremy Bowman
ae44f1840c Merge pull request #15951 from edx/jmbowman/ddt_cleanup 
ddt usage cleanup
 2017-09-06 11:19:39 -04:00
Jeremy Bowman
fd6af6b05e ddt usage cleanup 2017-09-05 17:25:51 -04:00
Brittney Exline
ba597331d7 ENT-496 Set consent_granted to None when calling enterprise-course-enrollment endpoint 
Since we have a separate call to grant consent, we shouldn't try to set that value on
the enterprise course enrollment anymore, because it causes errors.
 2017-09-05 13:32:24 -04:00
Andy Armstrong
ff5c6f0c30 Merge pull request #15868 from edx/andya/profile-certificates 
LEARNER-1860: Course certificates on the learner profile
 2017-09-01 07:12:03 -04:00
Andy Armstrong
6f888d6995 Add course certificates on the learner profile 
LEARNER-1860
 2017-08-31 20:58:35 -04:00
Gabe Mulley
6a36eb0183 Use ACE to 'send' Recurring Nudge emails 2017-08-31 16:58:08 -04:00
Uman Shahzad
b31287e264 Merge pull request #15897 from open-craft/uman/bump-ent-0.41.0 
[ENT-496] Bump edx-enterprise to 0.41.0.
 2017-09-01 00:21:54 +05:00
Brittney Exline
c79be5bbc1 Merge pull request #15929 from edx/bexline/clean_saml_usernames 
ENT-619 Clean usernames coming from identity providers
 2017-08-31 13:09:42 -04:00
Uman Shahzad
197c06a1e4 Bump edx-enterprise to 0.41.0. 
This incorporates a migration that copies data
from certain models to another.
 2017-08-31 10:41:45 -04:00
Clinton Blackburn
0a6029f7a7 Added verified upgrade hero to course run homepage 
Audit learners are now shown a prompt to upgrade to the verified track
of the course run. This message goes away after the learner upgrades.
 2017-08-30 17:01:27 -04:00
Brittney Exline
f844510b71 ENT-619 Clean usernames coming from identity providers 
Since we have started integrating with more clients, we have found that the usernames
that get passed are not compatible with our username restrictions. This PR introduces
a function to clean usernames to make them compatible, particularly in the auto registration
case.
 2017-08-30 13:36:57 -04:00
Hasnain Naveed
e4deef9dd6 Merge pull request #15451 from edx/mjevtic/remove-waffle-switches 
LEARNER-1146 | Remove populate-multitenant-programs waffle switch
 2017-08-30 15:06:46 +05:00
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
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
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
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
Saleem Latif
f087672d4b On edx.org instances, next URL for login page cannot contain 'edx.org'. 2017-08-25 17:31:35 +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
Waheed Ahmed
54b50341bd Modified migrations sync test. 2017-08-24 11:58:17 +05: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
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
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
Hasnain
bb33a3aa25 LEARNER-1146 | Removed the flag and their corresponding code. 2017-08-23 14:58:47 +05: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
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