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

2344 Commits

Author SHA1 Message Date
Robert Raposa
0d60d85e2f Merge pull request #17688 from edx/robrap/update-waffle-docs 
Add docs for handling default values.
 2018-03-15 17:26:02 -04:00
Michael Roytman
7ae119562e Merge pull request #17695 from edx/mroytman/bump-studio-frontend-1.5.0 
bump studio-frontend package version to 1.5.0
 2018-03-15 12:51:17 -04:00
Robert Raposa
a814c8d44c Removing flaky test test_can_add_remove_allowance. 
EDUCATOR-2514
 2018-03-15 11:46:55 -04:00
Michael Roytman
ad90e60759 bump studio-frontend package version to 1.5.0 2018-03-15 10:08:43 -04:00
edx-cache-uploader-bot
917bb7d20c Updating migrations 2018-03-14 12:50:06 -04:00
Stuart Young
53fe34615e Test fixes to prepare for firefox upgrade on jenkins 2018-03-12 15:40:25 -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
Tyler Hallada
395cdcceb5 Fix bok-choy tests 2018-03-08 12:49:14 -05:00
Farhanah Sheets
8dd967448f Remove old assets page from mako template, tests, & config model references 2018-03-08 12:05:08 -05:00
edx-cache-uploader-bot
0e529264e7 Updating migrations 2018-03-07 12:16:18 -05: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
b9d6ead3a3 Merge pull request #17522 from edx/dsjen/rename-accessibility-switch 
Renamed contentstore waffle namespace to "studio"
 2018-02-22 11:10:57 -05:00
Matthew Piatetsky
518ab054b3 Merge pull request #17475 from edx/default_unified_course_tab_to_on 
LEARNER-3605: make unified_course_tab on by default
 2018-02-22 10:30:12 -05:00
Matthew Piatetsky
92c94008a2 Fix tests that expected unified_course_tab to be off 2018-02-22 08:45:25 -05:00
Dennis Jen
354abd09c8 Renamed contentstore waffle namespace to "studio" 2018-02-21 17:26:05 -05:00
Diana Huang
a634c076ba Remove flaky studio test. 2018-02-21 14:59:52 -05:00
edx-cache-uploader-bot
98defce09d Updating migrations 2018-02-14 15:45:39 -05:00
Tomasz Gargas
605f080b9a Simplify the content enrollment tab in the CCX Dashboard. 
Signed-off-by: Tomasz Gargas <tomasz@opencraft.com>
 2018-02-12 21:47:49 +01:00
edx-cache-uploader-bot
41926a99e0 Updating migrations 2018-02-12 14:24:58 -05:00
Jeremy Bowman
b15882e277 PLAT-1948 Update the cached lettuce test databases 2018-02-09 16:07:35 -05:00
edx-cache-uploader-bot
691e35f673 Updating migrations 2018-02-09 12:26:21 -05:00
attiyaishaque
9704146e40 EDUCATOR-2224 Discussion Topic with no posts have message. 2018-02-08 14:47:04 +05:00
Jeremy Bowman
4c40f106e8 PLAT-1947 Fix bok-choy test that failed under Django 1.11 2018-02-07 09:57:10 -05:00
Jeremy Bowman
11e134c552 PLAT-1916 Ignore existing usage of deprecated field_data 2018-02-02 16:12:00 -05:00
Calen Pennington
f2c3aed8e7 Merge pull request #17316 from cpennington/switch-cms-login-to-webpack 
Migrate login.js to webpack
 2018-01-30 14:24:08 -05:00
Calen Pennington
b701ad77c8 Rename require_page to invoke_page_bundle 2018-01-30 10:32:31 -05:00
Calen Pennington
5772042199 Migrate login.js to webpack 2018-01-30 10:32:31 -05:00
edx-cache-uploader-bot
6284a48cd7 Updating migrations 2018-01-30 10:23:40 -05:00
edx-cache-uploader-bot
8b420c1221 Updating migrations 2018-01-29 10:56:36 -05:00
edx-cache-uploader-bot
2b90998715 Updating migrations 2018-01-26 09:55:51 -05:00
sanfordstudent
fda773721c Merge pull request #17285 from edx/sstudent/hide_cert_setting 
deprecate html setting for web certs and set to true by default
 2018-01-24 16:27:40 -05:00
Sanford Student
e2becea8cb deprecate html setting for web certs and set to true by default 2018-01-24 15:02:44 -05:00
Calen Pennington
69348d06d7 Merge pull request #17009 from cpennington/cms-login-factory-page 
Convert cms login.html to the require_page pattern in preparation for…
 2018-01-24 10:19:27 -05:00
Calen Pennington
974f099835 Teach the xss_linter about the require_page tag 2018-01-23 15:58:12 -05:00
Jesse Zoldak
459bf63ee0 Merge pull request #17239 from edx/testeng/bokchoy_auto_cache_update_88834860015445be6b1c5d3affbd5afca7e1b59a 
Bokchoy db cache update
 2018-01-19 14:43:12 -05:00
edx-cache-uploader-bot
f9ac6f1e2f Updating migrations 2018-01-19 11:39:24 -05:00
Calen Pennington
58bb7167c1 Convert cms login.html to the require_page pattern in preparation for webpack 2018-01-18 13:49:44 -05:00
Bill Filler
4fe5f3457d Conditionally display gated content in courseware 
Display gated sections in course outline, navigation and in the course
when user has met prerequiste condition.

WL-1273, WL-1317
 2018-01-18 12:34:19 -05:00
Jeremy Bowman
7d436a18ee PLAT-1858 Better capture of deprecation warnings 2018-01-12 18:04:32 -05:00
Michael Terry
57ba9b2ac6 Remove deprecated enabled field 
The CertificateGenerationCourseSetting.enabled column is
deprecated. It is no longer referenced anywhere in the code, and
it's time to remove it.

Original code by Michael LoTurco.

LEARNER-2549
 2018-01-09 10:04:26 -05:00
noraiz-anwar
9d2fad7144 fix course staff ability to perform operations on instructor dashboard 2018-01-02 14:34:38 +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
Jillian Vogel
097c0665fc Hides Video Auto Advance from Advanced Settings if disabled 
and fixes affected tests.
 2017-12-27 13:27:36 +10:30
Matt Tuchfarber
486f9578b7 Merge pull request #16856 from open-craft/mtyaka/template-block-overrides 
Allow theme template block overrides.
 2017-12-22 09:14:02 -05:00
Chandrakant Gopalan
f6f29ca49e Allow theme template block overrides. 
This allows an overridding template from a theme to inherit from the
same corresponding standard template.

This is useful when you only want to override one or more named blocks,
but otherwise make no modifications to the standard template.
 2017-12-22 09:41:35 +01: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
Jose Antonio Gonzalez
623c945bb2 change default article name to be course name instead of slug 2017-12-21 10:14:32 -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
Jeremy Bowman
1dbdee9c54 Revert "PLAT-1858 Better capture of deprecation warnings" 2017-12-18 21:18:02 -05:00
Jeremy Bowman
b26fe5fd24 PLAT-1858 Better capture of deprecation warnings 2017-12-18 14:59:05 -05:00