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

3612 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
Douglas Hall
c6ec5edbf7 Add API documentation with django-rest-swagger. 2018-05-08 14:38:33 -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
Stuart Young
1fd2167144 rebalance python unittests onto new shards 2018-05-03 11:16:05 -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
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
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
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
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
irfanuddinahmad
0195e9720d added admin site settings 2018-04-23 19:47:40 +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
muhammad-ammar
d0cd247d08 Deprecate Contentstore for Video Component Preview LMS/CMS 
EDUCATOR-1756
 2018-04-23 17:35:43 +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
Jeremy Bowman
28d291dce7 TE-2527 Move test and dev dependencies out of base.in 2018-04-18 14:44:31 -04:00
Mushtaq Ali
5a9477af30 Import video transcripts - EDUCATOR-2173 2018-04-16 12:05:44 +05:00
Ibrahim
a7e1ddf729 catch duplicate course error 2018-04-13 17:34:27 +05:00
Farhanah Sheets
b613494a0a Merge pull request #17907 from edx/fsheets/tinymce-align 
Add alignment options to the TinyMCE platform plugin
 2018-04-12 13:16:15 -04:00
irfanuddinahmad
3e426aca91 New command to migrate transcripts to S3 2018-04-12 16:57:23 +05:00
Farhanah Sheets
d8d7e33879 Merge pull request #17905 from edx/fsheets/sfe-search-cleanup 
Remove Studio Assets Search Waffle & Add test
 2018-04-10 17:14:21 -04:00
Farhanah Sheets
752cf12938 Add align buttons to test check 2018-04-10 17:10:05 -04:00
Farhanah Sheets
facb03ebd3 Remove search settings and add test to validate search visibility 2018-04-09 14:38:35 -04:00
Douglas Hall
fb5904f776 Remove uses of the course_structure API. 2018-04-09 12:39:13 -04:00
Tyler Hallada
71e74949e9 Change in-context waffle switch to a flag 
Also update studio-frontend to version 1.7.1
 2018-04-05 16:47:42 -04:00
Tyler Hallada
d31249ba20 Studio-frontend in-context image selection modal 
Open edit image modal via a custom signal

Send img tag attributes in open signal

Send natural image dimensions if no attr specified

Add new modal button in addition to old button

Also load built CSS when waffle switch on

Swap out TinyMCE toolbar button on waffle switch

Pass LANGUAGE_CODE from Django to template to studio-frontend

Define request.LANGUAGE_CODE in test_container_page.py
 2018-04-04 15:48:36 -04:00
Alex Dusenbery
924dd18f2b Remove flaky page re-ordering lettuce tests. 
Remove the right thing.
 2018-03-16 10:11:44 -04:00
muhammad-ammar
f6315483cd update get_transcript util 2018-03-15 15:15:20 +05:00
Farhanah Sheets
34a96fb58d Remove NewAssets config model & create migration file 2018-03-12 13:21:16 -04:00
Farhanah Sheets
b6469642fd Merge pull request #17599 from edx/fsheets/EDUCATOR-2324 
Clean up old Studio Assets Page
 2018-03-08 14:06:02 -05:00
Farhanah Sheets
8dd967448f Remove old assets page from mako template, tests, & config model references 2018-03-08 12:05:08 -05:00
muhammad-ammar
a01ba7621e transcript util 
EDUCATOR-2131
 2018-03-07 23:02:15 +05:00
rabia23
f65195c0ed EDUCATOR-2231 remove course run enrollment dates references from studio 2018-03-05 11:27:22 +00:00
Michael Roytman
90bcd273a0 add ConfigurationModelFixture for Studio Frontend Assets Page and add Bok Choy tests for Studio Frontend Assets Page 2018-02-28 10:48:27 -05:00
Dennis Jen
6da648899f Merge pull request #17530 from edx/dsjen/assets-search-waffle 
Added waffle switch for files & uploads search UI
 2018-02-27 14:56:10 -05:00
Bill DeRusha
9abec119fc Merge pull request #17503 from edx/bderusha/sp-cleanup 
Removed self-paced feature flag from code
 2018-02-26 14:42:53 -05:00
Bill DeRusha
d4b57bc218 Removed self-paced feature flag from code 2018-02-26 13:44:53 -05:00
Gavin Sidebottom
67442c2641 Fixed unthemed error pages in Studio and LMS 2018-02-22 16:49:06 -05:00
Dennis Jen
bcb8cfeffd Added waffle switch for files & uploads search UI 2018-02-22 11:54:53 -05:00
John Eskew
99f66a40b7 Merge pull request #17507 from open-craft/jill/studio-redirect-middleware 
Adds redirect middleware to Studio
 2018-02-22 11:29:52 -05:00
Dennis Jen
354abd09c8 Renamed contentstore waffle namespace to "studio" 2018-02-21 17:26:05 -05:00
Jillian Vogel
d10eb500b7 Updates tests: adding middleware increased the number of CMS database queries by 1 2018-02-21 11:44:39 +10:30