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

8138 Commits

Author SHA1 Message Date
Feanil Patel
82a7106e60 Merge pull request #18259 from edx/feanil/update_rfc6266_parser 
Feanil/update rfc6266 parser
 2018-05-23 13:53:04 -04:00
Feanil Patel
0872d2b591 Move off of our fork onto a published fork of the rfc6266. 
The published fork seems to be getting updates more regularly than the original project
and has the bugfix we forked for.
 2018-05-23 09:28:03 -04:00
Farhanah Sheets
9f0e99d549 Fix test 2018-05-22 09:44:24 -04:00
Farhanah Sheets
577bd1ec0d Move pacing above schedule dates and remove invalid help text 2018-05-21 16:51:39 -04:00
sanfordstudent
d4a338d4af Merge pull request #18113 from edx/sofiya/ed-2802-2 
EDUCATOR-2802 Different LMS api endpoint to finish GDPR retirement for the user
 2018-05-21 15:26:10 -04:00
Sofiya Semenova
cd18206167 EDUCATOR-2802: P2 gdpr endpoint 2018-05-21 11:12:54 -04:00
Omar Al-Ithawi
73af914cfc Use edx-ace for password reset email 2018-05-21 09:49:14 -04:00
Tyler Hallada
e9a04939d9 Upgrade SFE, unscrollable body when modal is open. 2018-05-15 14:49:08 -04:00
Gabe Mulley
5fa6c51368 Revert "Use edx-ace for the password reset email" 2018-05-10 13:06:52 -04:00
Gabe Mulley
7a5cecf3e9 Merge pull request #16545 from appsembler/omar/fmo/multipart-email 
Use edx-ace for the password reset email
 2018-05-10 11:31:43 -04:00
Douglas Hall
c6ec5edbf7 Add API documentation with django-rest-swagger. 2018-05-08 14:38:33 -04:00
Omar Al-Ithawi
556c8b86d0 Use edx-ace for password reset email 2018-05-08 18:53:31 +03:00
Jeremy Bowman
dd0180a33d TE-2545 Restrict AutoAuth for load tests 2018-05-07 15:00:48 -04:00
Mushtaq Ali
70dc0eed1c Merge pull request #18118 from edx/mushtaq/rerun-exclude-video-uploads-token 
Exclude video upload token
 2018-05-07 15:55:09 +05:00
Mushtaq Ali
dd8a9b018e Exclude video upload token - EDUCATOR-2532 2018-05-07 15:53:12 +05:00
Mushtaq Ali
f4b1da1f42 Merge pull request #17718 from edx/transcripts-phase-2 
Transcripts phase 2
 2018-05-07 12:42:50 +05:00
Anthony Mangano
07609e7d75 Add password_policy checks to login views 
LEARNER-4869
 2018-05-04 11:55:57 -04:00
Michael Roytman
085817f487 Merge pull request #18085 from edx/mroytman/pass-course-details-to-image-modal 
pass courseDetails to editImageModal
 2018-05-03 14:15:59 -04:00
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
Ari Rizzitano
7489753638 add base factory into textbooks factory 2018-05-02 15:15:16 -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
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
muhammad-ammar
84ab9cab11 address review and add test 
EDUCATOR-2752
 2018-05-02 18:25:43 +05:00
muhammad-ammar
1c53360206 basic tab attach uploads with edx_video_id 
EDUCATOR-2761
 2018-05-02 18:25:43 +05:00
muhammad-ammar
c02955d025 add check transcript ajax for edx_video_id 2018-05-02 18:23:46 +05:00
Brian Mesick
2be587d32d Merge pull request #18014 from edx/bmedx/retirement_state_mgmt 
Add a management command and settings to populate RetirementState models
 2018-04-30 09:28:21 -04:00
Muhammad Ammar
16b0070982 Merge pull request #17923 from edx/ammar/remove-video-transcript-enabled-flag 
remove video transcript enabled flag
 2018-04-30 17:35:14 +05:00
muhammad-ammar
aaaafee2b2 remove video transcript enabled flag 2018-04-30 15:59:32 +05:00
Feanil Patel
49a2a5d1b7 Merge pull request #18072 from stvstnfrd/clean/virtual-universities 
Remove unused VIRTUAL_UNIVERSITIES setting
 2018-04-27 15:22:04 -04:00
Feanil Patel
ae8e525ba2 Merge pull request #18080 from edx/feanil/remove_flaky_handout_tests 
Remove these tests because they are flaky.
 2018-04-27 15:18:58 -04:00
sanfordstudent
965c462418 Merge pull request #18061 from edx/sstudent/grading-policy-stuff 
rate limit
 2018-04-27 15:12:21 -04:00
Michael Roytman
8e9e3dac2f pass courseDetails to editImageModal 2018-04-27 13:29:39 -04:00
Feanil Patel
2c7dd7b97c Remove these tests because they are flaky. 
They all rely on modifying the handout which can sometimes fail.
 2018-04-27 10:48:04 -04:00
stv
3cc9d78ca8 Remove unused VIRTUAL_UNIVERSITIES setting 
It looks like this was part of the original rollout of the microsites
feature back in December 2013 [1], but was quickly removed in February
2014 [2]. These references have been orphaned ever since.
I can find no other references to it in the platform, save these.

[1] a3211a7405
[2] aa43689a93
 2018-04-26 20:03:14 -07:00
Giulio Gratta
1a7110f0e0 Get MKTG_URL_LINK_MAP from ENV_TOKENS in CMS 2018-04-26 16:57:07 -07:00
Ned Batchelder
c346b6423e Merge pull request #17748 from open-craft/jill/swift_content_length_from_fd_master 
Set SWIFT_CONTENT_LENGTH_FROM_FD=False
 2018-04-26 17:03:31 -04:00
Sanford Student
3f91238564 rate limit 2018-04-26 15:06:29 -04:00
irfanuddinahmad
bfbeeb1d84 added exception decorator 2018-04-26 16:02:09 +05:00
Mushtaq Ali
b181e6bb45 Update the get_transcript util with html5_sources - EDUCATOR-2651 2018-04-25 17:42:36 +05:00
muhammad-ammar
d5758bd1f9 delete transcript from advance tab 
EDUCATOR-1759
 2018-04-24 16:49:33 +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
irfanuddinahmad
0195e9720d added admin site settings 2018-04-23 19:47:40 +05:00
Qubad786
cadd4378c7 updload/download/replace transcripts 
EDUCATOR-2167
EDUCATOR-2168
EDUCATOR-2169
 2018-04-23 18:28:35 +05:00
muhammad-ammar
26a1f4506f transcripts rendering on advanced tab 
EDUCATOR-2170
 2018-04-23 18:26:09 +05:00
Qubad786
d850fb2078 Refactor download, update, choose, rename and replace handlers to use DS as primary storage. Add/refactor relevent unit/acceptance/jasmine tests. 2018-04-23 17:37:13 +05:00
muhammad-ammar
9d7ed19b64 disable subs field syncying 2018-04-23 17:35:45 +05:00
Qubad786
597566a34f Upload transcript to basic tab, add/fix unit and acceptance tests 2018-04-23 17:35:44 +05:00
muhammad-ammar
c5a30f8eb5 update check_transcripts handler 
EDUCATOR-2129
 2018-04-23 17:35:44 +05:00