Commit Graph

773 Commits

Author SHA1 Message Date
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
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
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
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
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
Calen Pennington
a7d6f84398 Don't use the edx-platform revision as the studio assets base url 2017-12-06 16:12:07 -05:00
Jeremy Bowman
19709cd36f PLAT-1749 Support Django 1.10+ CSRF tokens 2017-12-06 13:18:00 -05:00
Nimisha Asthagiri
7ef443f7ce Update usages to ace_common 2017-12-05 11:38:16 -05:00
Jeremy Bowman
067785dbfd Merge pull request #16710 from edx/jmbowman/PLAT-1419
PLAT-1419 Make edxmako a proper template backend
2017-12-04 11:07:30 -05:00
Michael Roytman
fab7f31a55 Merge pull request #16735 from edx/mroytman/EDU-1826
mroytman/edu 1826/1830
2017-12-01 22:14:59 -05:00
Michael Roytman
eeb6cc7ca3 Add accessibility accomodation request page to studio and link to said page in footer, both behind a Waffle switch. Add tests for the new page. 2017-12-01 19:57:21 -05:00
Jeremy Bowman
fdc50c3aa8 PLAT-1419 Make edxmako a proper template backend 2017-12-01 17:01:52 -05:00
Jeremy Bowman
e0ece33701 PLAT-1762 Remove obsolete mentoring XBlock 2017-11-30 16:30:17 -05:00
Matjaz Gregoric
d403e5f8b1 Introduce LMS_INTERNAL_ROOT_URL.
The LMS and edx-enterprise currently communicate via REST APIs, even
though they are all running within the same service.

Currently API URLs are constructed using LMS_ROOT_URL, but that is
problematic on some systems where the external LMS_ROOT_URL is not
accessible from the private network, or routing internal requests via
the external URL is not desireable.

This patch introduces a new setting variable LMS_INTERNAL_ROOT_URL which
defaults to the value of LMS_ROOT_URL for backwards compatibility.

The LMS and edx-enterprise will use LMS_INTERNAL_ROOT_URL to construct
API URLs instead of LMS_ROOT_URL.
2017-11-23 08:17:38 +01:00
John Eskew
ee36534fde Merge pull request #16574 from edx/jeskew/add_request_limits_for_django110
Add request limits to LMS/CMS Django settings.
2017-11-16 13:13:46 -05:00
Jose Antonio Gonzalez
f38e5ab939 add DEFAULT_MOBILE_AVAILABLE flag 2017-11-16 16:50:37 +02:00
John Eskew
1bf74c7d32 Add disabled request limits implemented in Django 1.11 2017-11-15 14:19:31 -05:00
Muzaffar yousaf
7157ec2e2f Revert "Revert "Transcript secure credentials"" 2017-11-08 21:18:00 +05:00
Feanil Patel
9a35a5439e Revert "Transcript secure credentials" 2017-11-07 13:07:32 -05:00
Jeremy Bowman
1f1ad26137 Merge pull request #16465 from edx/jmbowman/PLAT-1774
PLAT-1774 Move x_module monkey-patching
2017-11-07 10:34:44 -05:00
Qubad786
2310614bb6 Save credentials in edx-video-pipeline
EDUCATOR-1335 - This Adds a dedicated app which is responsible for communication with edx-video-pipeline service. It also adds the backend for saving 3rd party transcription service credentials on edx-video-pipline and cache it in edx-val.
2017-11-07 13:18:58 +05:00
Jeremy Bowman
c24a919856 PLAT-1774 Move x_module monkey-patching 2017-11-06 11:32:55 -05:00
Jeremy Bowman
8b13a8a459 Merge pull request #16442 from edx/jmbowman/oauth_provider_cms_import_fix
Add oauth_provider to Studio INSTALLED_APPS
2017-11-03 15:32:54 -04:00
John Eskew
ee5887956a Merge pull request #16437 from edx/jeskew/datadog_monitoring_to_appconfig
Move datadog/monitoring startup to AppConfig ready.
2017-11-03 14:58:56 -04:00
John Eskew
535d39d571 Merge pull request #16435 from edx/jeskew/bookmarks_course_overviews_startup_move
Move bookmarks/course_overviews startup to AppConfig ready.
2017-11-03 14:06:17 -04:00
John Eskew
d6f8772031 Move course_overviews startup.py over to AppConfig::ready 2017-11-03 12:47:59 -04:00
John Eskew
3f99fe4c1b Move bookmarks startup.py over to AppConfig::ready 2017-11-03 12:47:58 -04:00
Jeremy Bowman
2e2ec0f5d0 Add oauth_provider to Studio INSTALLED_APPS 2017-11-03 12:28:07 -04:00
Troy Sankey
c19eaef075 Move settings validation out of startup.py
This also creates a new app common_initialization in order to provide a
place to run initialization code common to both the LMS and CMS.
2017-11-03 12:23:54 -04:00
John Eskew
d7bab033f7 Move monitoring functionality to util and AppConfig. 2017-11-02 17:44:03 -04:00
John Eskew
65433c9cd4 Move datadog startup.py over to AppConfig::ready 2017-11-02 17:44:03 -04:00
John Eskew
2808bad0c9 Merge pull request #16416 from edx/jeskew/edxmako_startup_py_remove
Move edxmako startup to AppConfig::ready.
2017-11-02 15:08:18 -04:00
Jeremy Bowman
a7b3894274 PLAT-1779 Fix CMS INSTALLED_APPS/model imports mismatch 2017-11-02 10:09:22 -04:00
John Eskew
ba07dec4c5 Move edxmako startup to AppConfig::ready. 2017-11-02 09:40:05 -04:00
John Eskew
e85af5d87b Point to the proper AppConfig in INSTALLED_APPS for course_modes. 2017-11-01 17:08:35 -04:00
Jeremy Bowman
c83811f938 Merge pull request #16404 from edx/jmbowman/PLAT-1775
PLAT-1775 Move help tokens configuration from startup to settings
2017-11-01 15:02:22 -04:00
Jeremy Bowman
2de2e3027d PLAT-1773 Delegate edx-proctoring service registration to app ready methods 2017-11-01 10:30:58 -04:00
Jeremy Bowman
d549194ba3 PLAT-1775 Move help tokens configuration from startup to settings 2017-10-31 17:04:54 -04:00
John Eskew
b866f35620 Remove support for COMPREHENSIVE_THEME_DIR -
all dirs must now go into COMPREHENSIVE_THEME_DIRS.
Move comprehensive theming setup section out of startup.py and into
  settings files using new 'derived' functionality.
Add 'derive_settings' at the end of all top-level Django settings files.
Move validation of comprehensive theming settings into new apps.py
  theming file.
Split theming code into code safe to run before settings are initialized
  -and- after settings are initialized.
2017-10-30 14:36:06 -04:00
Jeremy Bowman
ba06372cac PLAT-1780 Remove dependency on django-extensions 2017-10-27 13:19:12 -04:00
Troy Sankey
36a6a5e584 Specify the full path to the verify_studen app config
This fixes a bug introduced in 3be0fa81
2017-10-27 11:20:37 -04:00
Eric Fischer
3fc342e6e8 Webpack config prod/dev split
EDUCATOR-1448

Modifies paver webpack task to use production configuration in all
non-devstack environments, and a development config in devstack.
2017-10-26 14:03:53 -04:00
John Eskew
fa6d94d144 Remove NoseTestSuiteRunner - now using pytest. 2017-10-25 11:49:12 -04:00
Nimisha Asthagiri
cd1eaf3010 Dynamic Pacing: Waffle switch 2017-10-23 18:30:36 -04:00
Nimisha Asthagiri
53e1dfaa99 Studio support of Section Highlights 2017-10-23 14:31:57 -04:00
bmedx
21791ccb58 Change Django settings from tuples to lists to prep for 1.11 upgrade 2017-10-17 12:53:02 -04:00
Muzaffar yousaf
b34b5d9a12 Merge pull request #15872 from edx/video-transcript-preferences
Video transcript preferences
2017-10-17 14:45:29 +05:00
muzaffaryousaf
a953a844fd Settings for video transcripts bucket w.r.t django storages. 2017-10-16 19:22:41 +05:00