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

45865 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gabe Mulley
aa261ba9d9 add tests 2018-04-25 13:04:09 -04:00
Gabe Mulley
5b89c2f5b8 support cross domain ajax requests to the experiments APIs 2018-04-24 08:30:58 -04:00
Asad Iqbal
6cc13f7f2e Merge pull request #17935 from edx/asadiqbal08/ENT-645 
[ENT-645]- Updated the messages when a learner leave an organization.
 2018-04-24 15:59:55 +05:00
hamzamunir7300
2c3ff72bf1 Merge pull request #17922 from edx/LEARNER-4873/fix-contact-us-link 
Changing the contact-us link
 2018-04-24 14:59:14 +05:00
Hamza Munir
0fc0f82256 Changing the contact-us link 
Redirection to the newly created support form. If the server is production
it will take to production support form otherwise it will be forwarded to
Stage server support form.

LEARNER-4873
 2018-04-24 14:13:23 +05:00
Uman Shahzad
db5042f084 Merge pull request #18018 from edx/revert-17967-gbabey/revert-ENT-924 
[ENT-924] Revert "Revert "Show Enterprise display name if we should hide sensit…
 2018-04-24 05:43:49 +05:00
Ned Batchelder
a8e0d81f0f Merge pull request #18001 from edx/nedbat/release-line-meta-tag 
Report the RELEASE_LINE in a meta tag
 2018-04-23 17:43:06 -04:00
Michael Youngstrom
c46a62ead9 Merge pull request #18022 from edx/testeng/bokchoy_auto_cache_update_d9252d990137c43d4aba1ea98d513f728cc1b735 
Bokchoy db cache update
 2018-04-23 13:08:38 -04:00
edx-cache-uploader-bot
bdc690af58 Updating migrations 2018-04-23 12:32:43 -04:00
Noraiz Anwar
8515cdf463 Merge pull request #18017 from edx/noraiz/EDUCATOR-2759 
fix outline progress
 2018-04-23 20:38:47 +05:00
irfanuddinahmad
3c40cd39f5 Merge pull request #18021 from edx/iahmad/migrate_video_transcripts 
added admin site settings
 2018-04-23 20:37:46 +05:00
irfanuddinahmad
0195e9720d added admin site settings 2018-04-23 19:47:40 +05:00
Brittney Exline
4a016e017d Merge pull request #17908 from edx/bexline/sso_id_verification 
ENT-944 Create SSOVerifications for users in tpa pipeline based on provider's settings
 2018-04-23 08:46:26 -06: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
noraiz-anwar
1c2de3d177 fix outline progress 2018-04-23 18:56:51 +05:00
Uman Shahzad
5746729895 Revert "Revert "Show Enterprise display name if we should hide sensitive user…" 2018-04-23 18:27:36 +05:00
Zubair Afzal
8c66d86704 Merge pull request #18003 from edx/zub/ENT-960-fix-catalogs-creation-bug 
ENT-960 Fix catalogs creation bug due to request data format
 2018-04-23 15:08:47 +05:00
zubair-arbi
46960ef358 ENT-960 Fix catalogs creation bug due to request data format 2018-04-23 14:29:06 +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
asadiqbal
2e8444e674 Updated the messages when a learner leave an organization. 2018-04-20 15:36:54 +05: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
55d823da15 Report the RELEASE_LINE in a meta tag 2018-04-19 17:36:42 -04: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