Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,130 Commits 1 Branch 0 Tags
2d4dd3750bf62d37282524db3aa91d4a4e4ed285
Commit Graph

4311 Commits

Author SHA1 Message Date
Gabe Mulley
5fa6c51368 Revert "Use edx-ace for the password reset email" 2018-05-10 13:06:52 -04:00
christopher lee
3d27ff8d66 Fix incorrect rate limit settings 2018-05-10 12:04:34 -04:00
christopher lee
3a15df4e77 Revert "Clean up enrollment rate limit waffles" 
This reverts commit 813d59d091.
 2018-05-10 12:01:04 -04:00
Gabe Mulley
7a5cecf3e9 Merge pull request #16545 from appsembler/omar/fmo/multipart-email 
Use edx-ace for the password reset email
 2018-05-10 11:31:43 -04:00
Christopher Lee
b272a2b588 Merge pull request #18163 from edx/clee/LEARNER-5038-cleanup 
Clean up enrollment rate limit waffles
 2018-05-09 15:47:51 -04:00
Brian Mesick
091cf1cdc8 Merge pull request #18162 from edx/bmedx/retirement_bugfixes 
Fix issues with retirement state population and unenrollment
 2018-05-09 14:41:25 -04:00
christopher lee
813d59d091 Clean up enrollment rate limit waffles 
LEARNER-5038
 2018-05-09 11:38:50 -04:00
bmedx
01ebe1e26e Fix issues with retirement state population and unenrollment 
- Prevent RetirementState state_execution_order collisions when updating
- Add slash to end of unenroll API endpoint to match other retirement endpoints
 2018-05-09 10:40:00 -04:00
J Eskew
edbdae9fb8 Merge pull request #18124 from edx/jeskew/fix_some_django20_deprecation_warnings 
Fix more Django 2.0 deprecation warnings around URLconfs.
 2018-05-08 16:29:12 -04:00
Douglas Hall
c6ec5edbf7 Add API documentation with django-rest-swagger. 2018-05-08 14:38:33 -04:00
Omar Al-Ithawi
556c8b86d0 Use edx-ace for password reset email 2018-05-08 18:53:31 +03:00
John Eskew
e5ee0fc91f Remove more unneeded 'namespace=' params. 2018-05-07 18:25:36 -04:00
Jeremy Bowman
dd0180a33d TE-2545 Restrict AutoAuth for load tests 2018-05-07 15:00:48 -04:00
Anthony Mangano
07609e7d75 Add password_policy checks to login views 
LEARNER-4869
 2018-05-04 11:55:57 -04:00
Douglas Hall
554f609ddf Merge pull request #18128 from edx/douglashall/update_course_discussion_settings 
Store Discussions ID Map on CourseDiscussionSettings model when course publish signal is fired.
 2018-05-03 18:09:56 -04:00
Douglas Hall
695b036282 Store Discussions ID Map on CourseDiscussionSettings model when course publish signal is fired. 2018-05-03 17:23:30 -04:00
John Eskew
ffb1f9fe2a Fix more Django 2.0 deprecation warnings around URLconfs. 2018-05-03 13:50:08 -04:00
Kabir Khan
c0f353467e V1 Grades API with added support for bulk read of all user grades in a course. 
URL patterns changed to follow edx API conventions
 2018-05-03 10:23:33 -07:00
Stu Young
7b76ab8a4d Merge pull request #18023 from edx/estute/TE-2427-reshard-lms4 
Reshard python unittests
 2018-05-03 11:53:32 -04:00
Stuart Young
1fd2167144 rebalance python unittests onto new shards 2018-05-03 11:16:05 -04:00
sanfordstudent
2a367b5075 Merge pull request #18111 from edx/sstudent/EDUCATOR-2689 
EDUCATOR-2689: retire ManualEnrollmentAudit
 2018-05-02 16:30:50 -04:00
Sanford Student
264cec0cea EDUCATOR-2689: retire ManualEnrollmentAudit 2018-05-02 15:56:00 -04:00
Eric Fischer
2556864bfb Merge pull request #18106 from edx/efischer/is_it_this_easy 
Silence deprecation warnings
 2018-05-02 14:17:05 -04:00
Alex Dusenbery
2b48649a9e EDUCATOR-2771 | Adds an LMS API endpoint to retire a user account. 2018-05-02 13:10:03 -04:00
Eric Fischer
4147b72f18 fix is_authenticated mocks 2018-05-02 11:26:27 -04:00
sanfordstudent
a615f2e227 Merge pull request #18103 from edx/sstudent/EDUCATOR-2690 
EDUCATOR-2690 bugfix
 2018-05-02 11:14:01 -04:00
Sanford Student
ea67a49041 EDUCATOR-2690 bugfix 2018-05-02 10:21:57 -04:00
Eric Fischer
e18448e27d Silence deprecation warnings 
https://docs.djangoproject.com/en/1.11/releases/1.10/#using-user-is-authenticated-and-user-is-anonymous-as-methods
 2018-05-02 10:03:50 -04:00
Robert Raposa
c516955a79 Merge pull request #18096 from edx/clee/ratelimit 
Reduce rate limit for enrollment api
 2018-05-01 17:22:59 -04:00
christopher lee
ce47e1f547 Update rate limit for enrollment api 
LEARNER-5101: The current rate limit was adjusted to be
very high for staff users to account for excessive calls
from the ecommerce service. The ecommerce service has
been updated to not make these calls. This commit intends
to adjust the rate limit to it's original state before the
excessive calls.
 2018-05-01 16:01:02 -04:00
sanfordstudent
41b1f03c78 Merge pull request #18097 from edx/sstudent/EDUCATOR-2690 
make password history retirable
 2018-05-01 15:20:02 -04:00
Simon chen
803a396e11 Create deletion method for the PendingNameChange model to comply with GDPR 2018-05-01 14:21:41 -04:00
Sanford Student
b752752f4c make password history retirable 2018-05-01 13:14:46 -04:00
Brittney Exline
91e63ed8e0 ENT-945 Using SSOVerifications in ID Verification flow 
This reworks what was done #17930, since it had to be reverted from the IDVerificationAggregate migration.
We decided to abandon that model and directly read from both id verification models.
 2018-04-30 11:57:59 -04:00
Matthew Piatetsky
b41275774f Merge pull request #18039 from edx/fix_refundable_status_for_audit 
Fix refundable status for audit orders
 2018-04-26 15:58:21 -04:00
Jeremy Bowman
3851a645bb Merge pull request #18041 from edx/jmbowman/TE-2528 
TE-2528 Upgrade testing dependencies
 2018-04-26 15:34:16 -04:00
edx-pipeline-bot
d294c3f729 Merge pull request #18062 from edx/release-mergeback-to-master 
Merge release back to master
 2018-04-26 13:18:20 -04:00
Matthew Piatetsky
034ad193da Fix refundable status for audit orders 2018-04-26 12:42:44 -04:00
Adeel Khan
cd2f6592c3 Catch HttpError thrown by Python Social Auth. 
This patch enables catching HttpError exception raised
by PSA because of any issue caused at client/server.
Further it redirects user to login page with a
message about the error.

LEARNER-4344
 2018-04-26 13:02:38 +05:00
Jeremy Bowman
9477ad23d1 TE-2528 Upgrade testing dependencies 2018-04-25 16:37:29 -04:00
Brittney Exline
292f9ca831 Partial revert of "ENT-945 Update IDVerification interfaces to accountfor SSOVerification" 
This partially reverts commit ee1c3a4548.
The migration files introduced by the commit have been kept since they have been run
already on several enviornments.
 2018-04-25 16:01:15 -04:00
Brian Mesick
1828bf7d6b Merge pull request #17920 from edx/bmedx/fix_retirement_apis 
Update retirement APIs to match spec
 2018-04-25 10:39:26 -04:00
bmedx
98742c1c50 Update retirement APIs to match spec 2018-04-23 16:03:29 -04:00
Brittney Exline
ee1c3a4548 ENT-945 Update IDVerification interfaces to accountfor SSOVerification 2018-04-23 10:48:12 -04:00
Brittney Exline
f41bf2f409 ENT-944 Create SSOVerifications for users in tpa pipeline based on provider's settings 2018-04-23 10:10:26 -04:00
Uman Shahzad
7d34099c09 Merge pull request #17969 from edx/uman/enterprise-middleware 
[ENT-962] Add Enterprise middleware that injects customer data.
 2018-04-21 09:55:46 +05:00
Uman Shahzad
87919f4d53 Add Enterprise middleware that injects customer data. 2018-04-21 08:14:52 +05:00
sandroroux
5b9d347317 Adds DeletableByUserValue to CourseEnrollmentAllowed model. 2018-04-20 13:40:10 -04:00
Alex Dusenbery
1974b9a449 EDUCATOR-2693 | Delete PendingEmailChanges for retired users. 2018-04-20 13:33:31 -04:00
Brian Mesick
fc1f18aa14 Merge pull request #17919 from edx/bmedx/retirement_status 
Add a model and associated API to help control the user retirement flow
 2018-04-20 12:35:16 -04:00