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

45827 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
edx-cache-uploader-bot
319dee4faa Updating migrations 2018-04-20 14:19:59 -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
Michael Youngstrom
2016df03eb Merge pull request #17997 from edx/youngstrom/enable-s3-cache-devstack 
Use s3 db cache on devstack
 2018-04-20 11:42:00 -04:00
Michael Youngstrom
0e3b4bade5 Use s3 db cache on devstack 2018-04-20 09:52:57 -04:00
Brian Beggs
5b1a262548 Merge pull request #17698 from open-craft/clemente/implement-djangouserstateclient-iter-all 
Implement iter_all_for_block and iter_all_for_course for DjangoUserStateClient
 2018-04-20 08:44:40 -04:00
Ibrahim Ahmed
5e1cc755d5 Merge pull request #17936 from edx/ibrahimahmed443/WL-1519-duplicate-course-fix 
catch duplicate course error
 2018-04-20 14:03:59 +05:00
Daniel Clemente Laboreo
00c339d091 Implement iter_all_for_block and iter_all_for_course for DjangoUserStateClient 2018-04-20 11:26:16 +03:00
Ned Batchelder
1642eeabaa Merge pull request #14128 from edx/jbarciauskas/PLAT-1109-ignore-integrity-error 
[PLAT-1109] Suppress IntegrityErrors caused by race condition
 2018-04-19 16:22:05 -04:00
bmedx
4390773f4b Clean up some warnings to get enough headroom to pass tests 2018-04-19 15:04:39 -04:00
Jeremy Bowman
96d0adf74b Merge pull request #17993 from edx/jmbowman/TE-2547 
TE-2547 Add dependency analysis scripts
 2018-04-19 14:53:03 -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
Alessandro Roux
73f775f529 Merge pull request #17990 from edx/retireuserbyemailMixin 
Adds DeletableByUserValue mixin.
 2018-04-19 13:55:43 -04:00
Jeremy Bowman
1f3f0e2fb9 TE-2547 Add dependency analysis scripts 2018-04-19 13:48:08 -04:00
sandroroux
6e5add47b6 Adds retire_user mixin. 2018-04-19 13:15:21 -04:00
Farhanah Sheets
e0078abefd Merge pull request #17994 from edx/fsheets/sfe-bump 
Bump studio-frontend version to 1.7.3
 2018-04-19 12:30:29 -04:00
Farhanah Sheets
0d5eea0b24 bump studio-frontend version to 1.7.3 2018-04-19 11:54:42 -04:00
Michael LoTurco
877f705776 Merge pull request #17897 from edx/mloturco/learner-3524-accessible-modal 
Add entitlement unenrollment survey, update accessible-modal
 2018-04-19 10:54:08 -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
7a9e098b73 Merge pull request #17956 from edx/saleem-latif/ENT-959 
ENT-959: Deleted SAML Identity provider appears in the Enterprise customer IdPs list.
 2018-04-19 15:22:36 +05: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
Jeremy Bowman
4eea62ab35 Merge pull request #17977 from edx/jmbowman/TE-2527 
TE-2527 Move test and dev dependencies out of base.in
 2018-04-18 15:50:49 -04:00
jaebradley
4de5691982 update cookie policy banner 2018-04-18 15:22:02 -04:00
sanfordstudent
dfe08245de Merge pull request #17960 from edx/sstudent/educator-2628 
EDUCATOR-2628: deactivate and logout user
 2018-04-18 15:20:53 -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
9b093ff17f Add passthrough for context_title and context_label LTI parameters 2018-04-18 13:39:53 -04:00
Eric Fischer
38f5358541 Revert "pass title/label to LTI consumers" 
This reverts commit f1fa7b8e06.
 2018-04-18 12:59:15 -04:00
Sanford Student
9e482553c1 EDUCATOR-2628: deactivate and logout user 2018-04-18 11:32:31 -04:00
Rabia Iftikhar
648b13dc47 Merge pull request #17490 from edx/aj/updated-and-rescored-problem-still-shows-red-X 
updated correct map when new score is calculated
 2018-04-18 19:07:33 +05:00
Attiya Ishaque
44ccd84c7a Merge pull request #17975 from edx/ai/EDUCATOR-2719-button-styling 
Fix styling of button on certificate & membership page.
 2018-04-18 17:32:59 +05:00
Nimisha Asthagiri
0f29ca2620 Merge pull request #17968 from edx/arch/remove-course-structure-usage-in-completion 
Remove Completion's usage of Course Structures API
 2018-04-18 08:03:25 -04:00
Zia Fazal
a9693f4ad6 Merge pull request #17815 from edx/hasnain-naveed/WL-1518 
WL-1518 | Get decline notification context from enterprise.
 2018-04-18 15:54:57 +05:00
Awais Jibran
bef0eb1135 updated correct map when new score is calculated 2018-04-18 15:13:25 +05:00
Hasnain
3fca1af171 WL-1518 | Get decline notification context from enterprise. 2018-04-18 15:00:47 +05:00
Uzair Rasheed
e0d20be11d Merge pull request #17912 from edx/LEARNER-1487/send_successfull_verification_email 
Send verification email status
 2018-04-18 12:09:42 +05:00
Nimisha Asthagiri
fd078ae1f5 Remove Completion's usage of Course Structures API 2018-04-17 21:13:39 -04: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
Michael Youngstrom
a6f77926f5 Merge pull request #17980 from edx/youngstrom/remove-failing-js-test 
Remove failing js test on ff59
 2018-04-17 14:36:23 -04:00
Michael Youngstrom
2e108357b5 Remove failing js test 2018-04-17 14:17:33 -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
Alex Dusenbery
f6997f2842 Remove unused imports in user_api.models 2018-04-17 10:03:05 -04: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
03c9d45b3b Merge pull request #17589 from edx/mushtaq/import-transcripts 
Import video transcripts
 2018-04-17 13:42:05 +05:00
Mushtaq Ali
d6e3474ad7 VAL version bump 2018-04-17 12:52:31 +05:00