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

3819 Commits

Author SHA1 Message Date
Calen Pennington
8468357ac4 Separate the date and link logic out of VerifiedUpgradeDeadlineBlock, so that it can be called directly with prefetched data for check_and_get_upgrade_link_and_date 2017-10-13 10:01:34 -04:00
Calen Pennington
dd53edc6e0 Cache upgrade_deadline on CourseEnrollment objects 2017-10-06 15:23:42 -04:00
Sofiya Semenova
3fcd7c69de Merge pull request #16183 from edx/ssemenova/ed-1315-part3 
Checking if CAD exists before using it in dashboard
 2017-10-06 14:50:05 -04:00
Troy Sankey
f44f304559 Merge pull request #16176 from edx/pwnage101/remove-1.4-shims_PLAT-1424 
[WIP] cleanup django 1.4 shims and mentions
 2017-10-06 14:27:31 -04:00
Sofiya Semenova
dbfdff090d Checking if CAD exists before using it 2017-10-06 13:24:56 -04:00
Troy Sankey
e94d265fa7 Remove our copy of the slugify() implementation 2017-10-05 15:37:01 -04:00
Jesse Shapiro
f160980008 Remove unused generic Enterprise-related enrollment logic 2017-10-05 14:47:21 -04:00
John Eskew
b07826cbc0 Merge pull request #16148 from edx/jeskew/initial_django_1.11_startup_changes 
Initial Django 1.11 startup changes
 2017-10-05 12:48:26 -04:00
John Eskew
0890193d6b PLAT-1408: Import csrf from new path. 2017-10-05 11:12:53 -04:00
John Eskew
7dfb6cc681 Change all UTC timezones to import from pytz instead of Django. 2017-10-05 11:12:52 -04:00
John Eskew
02f26f55ce Remove unused imports. Push model imports down into relevant methods. 
Mock out the static_replace modules in the proper location.
 2017-10-05 11:12:52 -04:00
John Eskew
6294766c24 Split emitted signals from the student models file. 2017-10-05 11:12:50 -04:00
Sofiya Semenova
34e3ec6afe Ed-1315 part 2, removing progress message entirely and replacing with another 2017-10-05 11:06:22 -04:00
Matthew Piatetsky
1aff33dcdd Merge pull request #16044 from edx/LEARNER-2546 
LEARNER-2546 Take users from track selection to course home instead of dashboard
 2017-10-02 17:03:56 -04:00
Matt Tuchfarber
9de5cbea12 Bump enterprise to 0.48.2 2017-10-02 13:40:31 -04:00
Matthew Piatetsky
d394c05236 Take users from track selection to course home instead of dashboard 
LEARNER-2546
 2017-10-02 12:15:12 -04:00
Michael Frey
3e24572664 increase staff user rate limit 2017-10-02 09:03:46 -04:00
Nimisha Asthagiri
8721dad500 Merge pull request #16083 from edx/naa/grades-remove-read-only 
Grades: remove read_only param and create method
 2017-09-29 14:50:43 -04:00
Nimisha Asthagiri
1febdbfac9 Grades cleanup: remove read_only param and create method 
EDUCATOR-171
 2017-09-28 07:48:25 -04:00
zubair-arbi
4040c45f06 update enterprise api support for request users and enterprise service user 
ENT-624
 2017-09-27 18:04:44 +05:00
McKenzie Welter
190b2c36fe Changed lookup logic to consider language learner-1995 2017-09-27 07:53:39 -04:00
Uman Shahzad
f94558f464 Merge pull request #16094 from open-craft/uman/ent-0.48.1 
[WL-1240] [ENT-640] [ENT-628] [ENT-629] [ENT-630] [ENT-631] [ENT-634] [ENT-644] Bump to edx-enterprise to 0.48.1
 2017-09-27 00:16:34 +05:00
Diana Huang
1cfefe2457 Modify the header to show the learner profile. 
Remove the profile from the user dropdown.

LEARNER-2318
 2017-09-25 17:06:08 -04:00
Uman Shahzad
a27688afd0 Bump to edx-enterprise to 0.48.1 2017-09-26 00:43:09 +05:00
Nimisha Asthagiri
56676d821d Merge pull request #16077 from edx/naa/grades-refactor 
Grades: move out of temporary new folder
 2017-09-22 14:03:05 -04:00
Gabe Mulley
3088c70f25 only override the upgrade deadline in self-paced courses 2017-09-22 12:48:38 -04:00
Nimisha Asthagiri
22edaf7d24 Grades: move out of temporary new folder 
EDUCATOR-1400
 2017-09-22 11:49:46 -04:00
Douglas Hall
10a065990b Merge pull request #16064 from open-craft/uman/ent-0.46.5 
[ENT-644] Bump edx-enterprise to 0.46.7.
 2017-09-22 05:47:16 -04:00
Uman Shahzad
6355604b51 Ignore pending migrations for edx-enterprise temporarily. 2017-09-22 05:17:18 +05:00
sanfordstudent
5c88600fbf Merge pull request #16048 from edx/sstudent/EDUCATOR-1288 
Sstudent/educator 1288
 2017-09-21 16:48:46 -04:00
Sanford Student
d0e68f2d24 recalculate course grade on user partition change 2017-09-21 15:32:07 -04:00
Douglas Hall
247f2835c1 Merge pull request #16060 from edx/revert-16001-zub/ENT-624-access-enterprise-api-with-request-user 
Revert "Initialize enterprise api client with provided user"
 2017-09-20 11:04:10 -04:00
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
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
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