Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,462 Commits 1 Branch 0 Tags
95e76dcafe945b62dc7bbaebde1a32434002464a
Commit Graph

7897 Commits

Author SHA1 Message Date
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
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
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
Jeremy Bowman
d44e6297ae PLAT-1847 Fix cms tests under Django 1.9 2017-12-13 15:29:02 -05:00
David Ormsbee
7f3a55af74 Remove dealer.git (startup optimization). 
In the absence of an EDX_PLATFORM_VERSION OS env variable, we used to
calculate the current version by looking at the current git revision of
the edx-platform repo. This was an expensive calculation (~7% of startup
costs). It also turns out that at some point we stopped setting that env
variable anywhere, so it always fell back to recalculating it.

With this commit, we'll start reading the code version from the env JSON
files, and fall back to "unknown" rather than doing the dealer.git call.
 2017-12-13 11:35:43 -05:00
Brian Mesick
e4648bff79 Merge pull request #16860 from edx/bmedx/django111_fix_cms_errors 
Changes to fix various Django 1.11 errors
 2017-12-13 10:07:43 -05:00
Ned Batchelder
3d49d80b58 Fix safe_lxml. SEC-338 
The imports were sorted in May, which broke the monkeypatching in
safe_lxml.  I added two tests that the XML parsers are properly patched,
but they didn't pass until I added the monkeypatching to the start of
the test runs.  Once that was done, some tests failed because they
relied on specific details of how empty elements are represented.  Those
tests are now fixed.
 2017-12-12 16:13:47 -05:00
Ned Batchelder
e6a8ab21c8 Merge pull request #16780 from mreyk/teltek/feature/all-languages 
Allow to overwrite ALL_LANGUAGES parameter in aws configuration
 2017-12-11 16:40:29 -05:00
Eric Fischer
320fc3e5c9 Merge pull request #16863 from edx/efischer/library_creator_setting 
Add DISABLE_LIBRARY_CREATION setting to library creator logic
 2017-12-11 15:55:32 -05:00
Brian Mesick
98456e11a1 Merge pull request #16840 from edx/bmedx/django111_conditional_birdcage 
Make all uses of birdcage conditional, should fix 1.11 errors
 2017-12-11 14:51:48 -05:00
Eric Fischer
76d19dbe15 Add DISABLE_LIBRARY_CREATION setting to library creator logic 
EDUCATOR-1924
 2017-12-11 14:31:02 -05:00
bmedx
2579785a54 Make all uses of birdcage conditional, should fix 1.11 errors 2017-12-11 13:21:06 -05:00
bmedx
0f0b8048b4 Changes to fix various Django 1.11 errors 2017-12-11 13:15:42 -05:00
Eric Fischer
5bc6b31e29 eslint --fix 2017-12-08 14:38:41 -05:00
Eric Fischer
25498df8e3 remove placeholder heading 2017-12-08 10:41:21 -05:00
John Eskew
254aa84f9d Merge pull request #16815 from edx/jeskew/fix_model_import_for_video_transcripts 
Fix video transcript model import before Django initialization occurs.
 2017-12-07 13:58:06 -05:00
Calen Pennington
4ff39cf51f Merge pull request #16819 from edx/cale/remove-studio-dynamic-asset-dir 
Don't use the edx-platform revision as the studio assets base url
 2017-12-07 10:49:34 -05:00
John Eskew
b14d2e9cf7 Fix video transcript model import before Django initialization occurs. 2017-12-07 09:56:44 -05:00
ayub-khan
96984aa3a4 updated translations 7 dec 2017-12-07 17:17:16 +05:00
mrey
033645758d Use single quotes on aws.py 2017-12-07 08:54:55 +01:00
Calen Pennington
a7d6f84398 Don't use the edx-platform revision as the studio assets base url 2017-12-06 16:12:07 -05:00
Eric Fischer
35611e81ec Merge pull request #16769 from edx/dahlia/zendesk_proxy_client 
Zendesk proxy client
 2017-12-06 15:47:01 -05:00
Eric Fischer
8743cda0d6 Zendesk Proxy 
This change creates a new lms/cms endpoint which accepts unauthenticated
requests to securely create zendesk tickets. This allows javascript code to
create tickets without exposing ZENDESK_OAUTH_ACCESS_TOKEN

EDUCATOR-1889
 2017-12-06 13:32:44 -05:00
Jeremy Bowman
19709cd36f PLAT-1749 Support Django 1.10+ CSRF tokens 2017-12-06 13:18:00 -05:00
Ari Rizzitano
8b59c6d596 Merge pull request #16639 from edx/ari/react-renderer 
mako/react bridge code
 2017-12-06 11:12:24 -05:00
Sylvia Pearce
e40b00eda6 Merge pull request #16788 from edx/sylvia/DOC-3826 
On Import Course page, clarify content that's imported per course tea…
 2017-12-06 09:59:50 -05:00
Ari Rizzitano
8ca0fe9dfc introduce ReactRenderer module and renderReact mako def 
[FEDX-453]

[extreme wip] mako/react bridge code [FEDX-453]

more attempts

split out entry points into separate file

this works!

kill dynamic import

error handling

didn't need webpack_static

handle passing props

cleanup django-template-rendering defs

pytest monkeypatch fix

cleanup

add id arg to renderReact def

more cleanup

oops

quality xss fixes

unittest fix

kill HelloWorld
 2017-12-05 17:53:46 -05:00
John Eskew
f5a83d5d6c Fix URLs that generate warnings in Django 1.10. 2017-12-05 16:46:33 -05:00
Jeremy Bowman
62f91dd7e9 Merge pull request #16795 from edx/jmbowman/PLAT-1418 
PLAT-1418 Remove obsolete can_import_settings attribute
 2017-12-05 16:45:32 -05:00
Jeremy Bowman
df008438a8 PLAT-1418 Remove obsolete can_import_settings attribute 2017-12-05 15:42:15 -05:00