Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

9424 Commits

Author SHA1 Message Date
Nimisha Asthagiri
c5afde2d76 Quiet quality 2018-01-11 14:35:08 -05:00
Nimisha Asthagiri
24d6c314ef Enable Django App Plugins in CMS 2018-01-11 14:35:06 -05:00
Jeremy Bowman
f8e5e38cc4 PLAT-1884 Replace deprecated xblock.fragment usage 2018-01-11 14:20:12 -05:00
Qubad786
55001ca81a Transcript delete on Video Upload Page - EDUCATOR-1961 2018-01-11 13:08:07 +05:00
Mushtaq Ali
9dcedaf82b Merge pull request #17138 from edx/mushtaq/improve-transcript-sorting 
Sort transcript languages
 2018-01-11 12:57:00 +05:00
Jeremy Bowman
4026c25f7a Merge pull request #17133 from edx/jmbowman/PLAT-1873_2 
PLAT-1873 to_deprecated_string() cleanup part 2
 2018-01-10 13:45:15 -05:00
Mushtaq Ali
c0d86360f0 Improve trancript sorting - EDUCATOR-2030 2018-01-10 17:02:21 +05:00
ayub-khan
9650c324bc updated-translations 2018-01-10 15:53:41 +05:00
Calen Pennington
fea4eef359 Merge pull request #17006 from cpennington/synchro-cms-static-base 
Make module loading for cms/static/js/base.js sychronous to ease tran…
 2018-01-09 22:55:08 -05:00
Mushtaq Ali
70fe33fc1e Change upload button text 2018-01-09 17:03:48 +05:00
Mushtaq Ali
f76d419bc7 Fix download transcript bug - EDUCATOR-2071 2018-01-09 17:03:48 +05:00
Mushtaq Ali
10d79b0047 Update user strings 2018-01-09 17:03:46 +05:00
Mushtaq Ali
00a86ccef8 Transcript file upload - EDUCATOR-2029 2018-01-09 17:03:46 +05:00
Qubad786
4f422e37d9 Refactor transcript upload handler to add language-overwrite support - EDUCATOR-2022 2018-01-09 17:03:45 +05:00
Qubad786
090e5dc534 Transcript upload backend for Video Upload Page – EDUCATOR-1854 2018-01-09 17:03:44 +05:00
Qubad786
c760c6a01b Download transcript on video upload page - EDUCATOR-1853 2018-01-09 17:03:44 +05:00
Mushtaq Ali
e601767329 Show transcripts on video uploads page - EDUCATOR-1662 2018-01-09 17:03:43 +05:00
Jeremy Bowman
669aa13ad6 PLAT-1873 to_deprecated_string() cleanup part 2 2018-01-08 17:26:55 -05:00
Jeremy Bowman
7a69d2f771 Merge pull request #17116 from edx/jmbowman/PLAT-1873_1 
PLAT-1873 to_deprecated_string() cleanup part 1
 2018-01-08 17:02:44 -05:00
Jeremy Bowman
d3d6272d8f PLAT-1873 to_deprecated_string() cleanup part 1 2018-01-08 13:51:42 -05:00
Ari Rizzitano
a5ab620e3e convert course/library listing to use reactrenderer 2018-01-08 13:43:06 -05:00
Nimisha Asthagiri
57f09e987f Delete unneeded Django Settings files 2018-01-05 15:04:10 -05:00
Nimisha Asthagiri
faecaf3316 Merge pull request #17088 from edx/arch/delete-dev-files 
Delete old development config files
 2018-01-04 09:23:57 -05:00
Nimisha Asthagiri
ddfeb61b08 Delete old development config files 2018-01-03 17:26:09 -05:00
Tyler Hallada
5728ce49cc Pass max_file_size_in_mbs to studio frontend 2018-01-03 13:53:57 -05:00
AsadAzam
18530c31ba Merge pull request #16994 from edx/asad/educator-1958-publish-courserun-multiple-courseaccesrole 
Fixed multiple CourseAccessRole error on publish
 2017-12-28 17:41:42 +05:00
Asad Azam
1f5134b5ef Fixed multiple CourseAccessRole error on publish 2017-12-28 15:42:41 +05:00
M. Rehan
584dee107e Merge pull request #17019 from open-craft/jill/hide-auto-advance-if-disabled 
Hides Video Auto Advance from Advanced Settings if disabled
 2017-12-28 15:34:03 +05:00
Farhanah Sheets
3fb4ff346e Merge pull request #17034 from edx/fsheets/EDUCATOR-1995 
Pass ReadTheDocs path to studio-frontend
 2017-12-27 12:47:27 -05:00
Farhanah Sheets
cfdfec1d20 Add mako js filter 2017-12-27 11:25:36 -05:00
Farhanah Sheets
425e3208bb Pass readthedocs course_author files path to studio-frontend assets page 2017-12-27 09:39:40 -05:00
ayub-khan
f50af67f15 updated translations 2017-12-27 16:38:58 +05:00
Jillian Vogel
097c0665fc Hides Video Auto Advance from Advanced Settings if disabled 
and fixes affected tests.
 2017-12-27 13:27:36 +10:30
David Ormsbee
c0d0acd335 Merge pull request #17012 from edx/ormsbee/symlink_purge_cms_coffee_fixtures 
Remove cms/static/coffee/fixtures symlink.
 2017-12-23 21:09:00 -05:00
Jeremy Bowman
e98420dd8d Merge pull request #16979 from edx/jmbowman/PLAT-1861 
PLAT-1861 Upgrade to pyfilesystem2
 2017-12-22 15:48:48 -05:00
Jeremy Bowman
65472399df PLAT-1861 Upgrade to pyfilesystem2 2017-12-22 14:44:24 -05:00
Calen Pennington
5e56c0a105 Make module loading for cms/static/js/base.js sychronous to ease transition to webpack 2017-12-22 14:05:09 -05:00
bmedx
bc72c28a03 Remove unnecessary patches to User::is_authenticated 2017-12-22 11:33:35 -05:00
David Ormsbee
4e7fffa70f Remove cms/static/coffee/fixtures symlink. 
FEDX-458. Part of the static files symlink cleanup.
 2017-12-21 16:40:18 -05:00
Muhammad Ammar
b6f45955f5 Merge pull request #15803 from open-craft/replaceafill/OC-2594 
Auto-advance video toggle
 2017-12-22 01:29:24 +05:00
Daniel Clemente
ecf01d1b52 Adds a course option to auto-advance videos. 
If enabled for a course, as soon as the video ends, the next unit or subsection
will be loaded, and if it contains a single video, that video will be played.

Course authors can enable the setting for a course, but learners can toggle the
setting on or off once it's enabled on the course.
 2017-12-21 21:06:05 +10:30
Ayub khan
5406e14e17 Merge pull request #16975 from edx/update-translations-18-DEC 
updated translations
 2017-12-20 21:23:31 +05:00
ayub-khan
fcac9ad1e9 updated translations 2017-12-20 17:03:51 +05:00
Robert Raposa
a0bf63a1da Merge pull request #16967 from edx/robrap/remove-flaky-timing-assertions 
PLAT-1864: Fix test_course_listing_performance flaky test.
 2017-12-19 16:12:16 -05:00
Robert Raposa
d2b0d0cd0e Fix test_course_listing_performance flaky test. 
Fix test by removing timers and leaving other assertions.
 2017-12-19 14:40:09 -05:00
J. Cliff Dyer
1fc43bf60d Define custom completion for VideoModule 
Update the VideoModule to publish a completion event when the player
reaches 95% complete, and submit a BlockCompletion when that event
occurs.

OC-3091
MCKIN-5897
 2017-12-19 14:12:28 -05:00
Michael Roytman
d98e7d4f24 add sort direction and asset types as part of the assets JSON response 2017-12-18 19:23:49 -05:00
Brandon DeRosier
c7c3ef694c Add optional password reset failure emails 
This change allows Open edX operators to enable password reset
failure email notifications. This is mainly useful for
explicitly informing users that there's no account associated
with their email, so that users can be sure that there wasn't
a problem with the email system.

OSPR-1832
 2017-12-18 11:05:15 -05:00
Tyler Hallada
dbd4801e84 Add missing aria-label to footer policies <nav> 2017-12-14 16:15:42 -05:00
David Ormsbee
6db93fc791 Merge pull request #16901 from edx/ormsbee/remove_git_lms 
Remove dealer.git (startup optimization).
 2017-12-14 15:15:06 -05:00