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

45846 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
irfanuddinahmad
0195e9720d added admin site settings 2018-04-23 19:47:40 +05:00
edX Transifex Bot
07dc831459 Update translations 2018-04-22 17:17:49 -04:00
Nimisha Asthagiri
022850d293 Merge pull request #17983 from edx/arch/remove-course-structure-api 
Remove Course Structure API
 2018-04-21 09:04:39 -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
Nimisha Asthagiri
3d8bce9dc8 Remove Course Structure API 2018-04-20 22:19:57 -04:00
Michael Roytman
ecab1286a6 Merge pull request #18006 from edx/mroytman/add-accessibility-image-best-practice-doc-link 
add image accessibility best practice documentation URL and pass thro…
 2018-04-20 16:08:59 -04:00
mduboseedx
935a9653d9 Merge pull request #17986 from open-craft/afzaledx/course_highlights_discovery 
Changed the author info.
 2018-04-20 16:00:24 -04:00
Rabia Iftikhar
a25bd5d474 Merge pull request #18008 from edx/ri/edx-proctoring-version-1.4.0 
update edx-proctoring version from 1.3.9 to 1.4.0.
 2018-04-20 23:54:53 +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
Alessandro Roux
28f09c3834 Merge pull request #17988 from edx/unlink-courseenrollment-allowed 
EDUCATOR-2688: Retire users in CourseEnrollmentAllowed model.
 2018-04-20 14:36:25 -04:00
Michael Roytman
e50fc86c79 Merge pull request #18004 from edx/mroytman/in-context-image-selection-css-fix 
prevent loading both production and development CSS from the studio-f…
 2018-04-20 14:23:00 -04:00
edx-cache-uploader-bot
319dee4faa Updating migrations 2018-04-20 14:19:59 -04:00
rabiaiftikhar
847e0694ac update edx-proctoring version from 1.3.9 to 1.4.0. 2018-04-20 23:19:14 +05:00
Uzair Rasheed
faef86636d Merge pull request #18002 from edx/LEARNER-1488/send_email_on_failed_verification 
Send email for the failed verification status
 2018-04-20 22:44:14 +05:00
sandroroux
5b9d347317 Adds DeletableByUserValue to CourseEnrollmentAllowed model. 2018-04-20 13:40:10 -04:00
Michael Roytman
b6e90f4dff prevent loading both production and development CSS from the studio-frontend container 2018-04-20 13:39:03 -04:00
Michael Roytman
03a9e85272 add image accessibility best practice documentation URL and pass through to studio-frontend edit image modal 2018-04-20 13:38:15 -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
uzairr
c6a951796a Send email for the failed verification status 
Support Team need to handle bulk of tickets every month
about the verification status of learners.To avoid it,
suitable changes have done to send verification email
to the learner.

LEARNER-1488
 2018-04-20 13:12:56 +05: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
afzaledx
6856f9bb19 Changed the author info. 2018-04-18 19:17:40 +05: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