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

15920 Commits

Author SHA1 Message Date
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
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
jaebradley
4de5691982 update cookie policy banner 2018-04-18 15:22:02 -04:00
Jeremy Bowman
28d291dce7 TE-2527 Move test and dev dependencies out of base.in 2018-04-18 14:44:31 -04:00
Eric Fischer
38f5358541 Revert "pass title/label to LTI consumers" 
This reverts commit f1fa7b8e06.
 2018-04-18 12:59:15 -04:00
Awais Jibran
bef0eb1135 updated correct map when new score is calculated 2018-04-18 15:13:25 +05:00
Jae Bradley
769ca45f42 Merge pull request #17941 from edx/LEARNER-4864-cookie-policy-banner-component 
LEARNER-4864: Add Cookie Policy Banner
 2018-04-17 17:50:25 -04:00
jaebradley
fab388ad6b add cookie policy banner with feature flag 2018-04-17 16:48:52 -04:00
Feanil Patel
139ac68ad3 Merge pull request #17981 from edx/release-mergeback-to-master 
Merge release back to master
 2018-04-17 16:31:04 -04:00
Feanil Patel
aa46a245b0 Merge pull request #17967 from edx/gbabey/revert-ENT-924 
Revert "Show Enterprise display name if we should hide sensitive user…
 2018-04-17 12:58:57 -04:00
Attiya Ishaque
90b1b40ae9 Merge pull request #17972 from edx/ai/EDUCATOR-2692-discussion 
Discussion moderators, TA's ,admins see the posts according to cohorts.
 2018-04-17 19:57:38 +05:00
George Babey
a155aad01c Revert "Show Enterprise display name if we should hide sensitive username." 
This reverts commit d58bd06928.

This commit caused performance issues due to increased API load from checking the
enterprise association on each page load
 2018-04-17 09:07:17 -04:00
attiyaishaque
9abdd0af3d Discussion moderators, TA's and admins see the posts according to cohorts. 2018-04-17 15:05:26 +05:00
Mushtaq Ali
5a9477af30 Import video transcripts - EDUCATOR-2173 2018-04-16 12:05:44 +05:00
Simon Chen
c02c1d5177 Merge pull request #17902 from edx/rm-new-course-outline-waffle 
EDUCATOR 2283 - Removes the new course outline waffle flag.
 2018-04-14 15:07:00 -04:00
Bill DeRusha
f7dd174873 Merge pull request #17954 from edx/bderusha/generated-pw-complexity 
Update and refactor random password generator
 2018-04-13 17:13:55 -04:00
Simon Chen
2a3a828157 Remove the flaky bokchoy test 
We want to unblock this PR from merging.
Created EDUCATOR-2728 to track
 2018-04-13 16:06:25 -04:00
Jeremy Bowman
07c13c9167 Merge pull request #17966 from edx/jmbowman/TE-2515 
TE-2515 Fix occasional help link test failures
 2018-04-13 15:23:04 -04:00
J Eskew
0269d4a536 Merge pull request #17868 from edx/jeskew/check_for_retired_username 
Reject acct creation when using a retired username.
 2018-04-13 15:15:10 -04:00
Jeremy Bowman
9afa92b075 TE-2515 Fix occasional help link test failures 2018-04-13 14:45:41 -04:00
John Eskew
3f0665b6d6 Fix existing quality errors. 2018-04-13 14:27:42 -04:00
John Eskew
338d4551ab Reject acct creation when using a retired username. 
Change from specifying a retired username/email format to specifying
  a retired username prefix and a retired email prefix/domain,
  preventing possible config errors due to unexpected/bad formats.
 2018-04-13 14:27:21 -04:00
Bill DeRusha
d1ed33ac23 Update and refactor random password generator 2018-04-13 14:17:21 -04:00
Michael Terry
a34c8c8233 Drop remaining coffee use 
This basically commits the transpiled CoffeeScript JS (with minor
cleanup) and removes coffee build support.

A tiny amount of support for xblocks exists, because external users
may have xblocks with coffee. But no coffee in our tree anyway.
 2018-04-13 14:10:40 -04:00