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

45864 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
muhammad-ammar
aaaafee2b2 remove video transcript enabled flag 2018-04-30 15:59:32 +05:00
Mushtaq Ali
1ba833f3f7 Merge pull request #17976 from edx/mushtaq/html5_sources_transcript 
Update the get_transcript util with html5_sources
 2018-04-25 21:41:34 +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
d428fa96b8 Merge pull request #17827 from edx/ammar/EDUCATOR-2170-transcripts-field 
transcripts rendering on advanced tab
 2018-04-25 17:14:07 +05:00
Muhammad Ammar
0025c2841c Merge pull request #17848 from edx/mrehan/upload-transcript-advanced-tab 
Mrehan/upload transcript advanced tab
 2018-04-25 16:08:32 +05:00
Muhammad Ammar
64231fd514 Merge pull request #17794 from edx/ammar/EDUCATOR-1759-delete-transcript-from-advance-tab 
delete transcript from advance tab
 2018-04-25 16:07:02 +05:00
muhammad-ammar
d5758bd1f9 delete transcript from advance tab 
EDUCATOR-1759
 2018-04-24 16:49:33 +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
7afd3b6c21 remove sub from editable metadata fields 2018-04-23 17:37:15 +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
a6bfd5f604 Deprecate Contentstore for Mobile Video Outline API 
EDUCATOR-2130
 2018-04-23 17:35:44 +05:00
muhammad-ammar
cda7fe9a29 update available translations retrieval interface 
EDUCATOR-2384
 2018-04-23 17:35:43 +05:00
muhammad-ammar
d0cd247d08 Deprecate Contentstore for Video Component Preview LMS/CMS 
EDUCATOR-1756
 2018-04-23 17:35:43 +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
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