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

15943 Commits

Author SHA1 Message Date
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
Farhanah Sheets
d19ba1b22a Merge pull request #18102 from edx/fsheets/sfe-bump 
Bump studio-frontend to v1.9.4 and fix bokchoy
 2018-05-03 10:12:40 -04:00
Farhanah Sheets
121c47aa4c Bump studio-frontend to v1.9.4 and fix bokchoy 2018-05-02 21:54:15 -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
edx-cache-uploader-bot
82ac53a4de Updating db cache 2018-04-30 16:25:16 -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
Ned Batchelder
6c3bd5d384 Merge pull request #17368 from mitodl/pdpinch/remove-constansts-and-suffixes 
Remove physical constants and suffixes from calc.py
 2018-04-26 16:54:25 -04:00
Cory Lee
a2d33979ce Merge pull request #18068 from edx/release-mergeback-to-master 
Merge release back to master
 2018-04-26 16:02:56 -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
Eric Fischer
8ed427e9f5 cache list of partitions in a course 2018-04-26 13:10:19 -04:00
Matthew Piatetsky
034ad193da Fix refundable status for audit orders 2018-04-26 12:42:44 -04:00
Brittney Exline
51d632531c Merge pull request #18055 from edx/bexline/empty_sso_verification_migration 
ENT-969: Partial revert of "ENT-945 Update IDVerification interfaces to account for SSOVerification"
 2018-04-26 08:54:34 -06: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
Feanil Patel
6df0cdf646 Remove this flaky test. 2018-04-25 16:20:11 -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
Brittney Exline
60f46d5a92 Merge pull request #17930 from edx/bexline/sso_id_verification2 
ENT-945 Apply logic for taking into account SSOVerifications
 2018-04-24 07:40:52 -06:00
bmedx
98742c1c50 Update retirement APIs to match spec 2018-04-23 16:03:29 -04:00
edx-cache-uploader-bot
bdc690af58 Updating migrations 2018-04-23 12:32:43 -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
Stu Young
a0289eaac8 Merge pull request #18007 from edx/testeng/bokchoy_auto_cache_update_4117d52afc17c2ce0b091f8f0e252f42b1904161 
Bokchoy db cache update
 2018-04-20 14:53:44 -04:00
edx-cache-uploader-bot
319dee4faa Updating migrations 2018-04-20 14:19:59 -04: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
bmedx
4390773f4b Clean up some warnings to get enough headroom to pass tests 2018-04-19 15:04:39 -04:00
bmedx
63dcaa4695 Add a model and associated API to help control the user retirement flow 2018-04-19 13:56:42 -04:00
Michael LoTurco
919264f56d Add entitlement unenrollment survey 
Updates behavior post unenrollment, also refactors accessible_modal
to enable the unenrollment survey to remain accessible after the
content in the modal changes (to the survey).

mloturco/learner-3524
 2018-04-19 10:19:11 -04:00
Saleem Latif
7545705c36 Deleted SAML Identity provider appears in the Enterprise customer IdPs list. 2018-04-19 11:40:18 +05:00
Eric Fischer
062b04aee7 Merge pull request #17965 from edx/efischer/lti_take2 
pass context_title and _label to LTI provider
 2018-04-18 16:52:02 -04:00
Jae Bradley
f13a15bc3f Merge pull request #17989 from edx/update-cookie-policy-banner 
Fix Cookie Policy Banner React Renderer Error
 2018-04-18 16:16:04 -04:00