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

7743 Commits

Author SHA1 Message Date
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
Brian Mesick
7cd3e72323 Merge pull request #16366 from edx/bmedx/django111_cms_mgmt_cmds 
CMS management command cleanup for Django 1.11
 2017-11-01 12:34:13 -04:00
Jeremy Bowman
2de2e3027d PLAT-1773 Delegate edx-proctoring service registration to app ready methods 2017-11-01 10:30:58 -04:00
bmedx
d5b3db8934 Fix up tests to support updated management commands 2017-11-01 10:13:47 -04:00
bmedx
79fe2e6260 CMS management command cleanup for Django 1.11 2017-11-01 10:13:46 -04:00
Robert Raposa
b57f144724 Merge pull request #16402 from edx/robrap/remove-pragma 
Remove pragmas to disable mako-missing-default
 2017-11-01 08:52:12 -04:00
noraiz-anwar
5ffe588abe add logs to time frame course listing 2017-11-01 10:50:38 +05:00
Eric Fischer
783dba1c75 Merge pull request #16358 from edx/dahlia/EDU-1529 
Pass contextual data to studio-frontend
 2017-10-31 17:31:59 -04:00
Jeremy Bowman
d549194ba3 PLAT-1775 Move help tokens configuration from startup to settings 2017-10-31 17:04:54 -04:00
Eric Fischer
27258425d2 Send contextual data through to studio-frontend 
EDUCATOR-1529
 2017-10-31 16:04:02 -04:00
Nimisha Asthagiri
30dfa98bf0 Section Highlights Studio UI: Encircle number of highlights 2017-10-31 15:41:07 -04:00
Robert Raposa
fcfb40cf52 Remove pragmas to disable mako-missing-default 2017-10-31 14:42:55 -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
Andy Armstrong
ae1c760ea4 Use Bootstrap theme colors and fonts in old stylesheets 
LEARNER-2977

Fixes
 2017-10-29 22:22:08 -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
Ayub khan
b85b793c18 Merge pull request #16363 from edx/you/update_translations 
Update translations
 2017-10-27 17:50:05 +05:00
ayub-khan
8ba42a3355 Update translations 2017-10-27 15:19:08 +05:00
noraiz-anwar
6cda1b2e0a add logs to better understand course listing response time 2017-10-27 12:49:15 +05: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
917c3d62bd FileWrapper indirection has been removed from Django. 2017-10-25 11:49:13 -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
2211ae335b Merge pull request #16304 from edx/pacing/studio-updates 
Dynamic pacing: Studio support of Section Highlights
 2017-10-23 17:08:20 -04:00
Nimisha Asthagiri
ee1a003c45 Tests for Studio support for Section Highlights 2017-10-23 15:16:57 -04:00
Nimisha Asthagiri
53e1dfaa99 Studio support of Section Highlights 2017-10-23 14:31:57 -04:00
Eric Fischer
45a5e7853f Correctly install and load webpacked studio-frontend 2017-10-23 11:50:36 -04:00
John Eskew
ce37e6d77e Merge pull request #16286 from edx/jeskew/move_third_party_auth_startup_code 
Move third_party_auth settings code to ready method.
 2017-10-20 11:45:37 -04:00
John Eskew
54441488dc Add comments to docstring forbidding additional code. 2017-10-20 07:59:32 -04:00
ayub-khan
3032de0251 Update translations (autogenerated message) 2017-10-19 23:18:25 +05:00
noraiz-anwar
cb3f858464 use CourseSummary for course listing on studio for non-global staff users 2017-10-19 12:14:35 +05:00
Jeremy Bowman
bda84d526b PLAT-1555 Stop using deprecated TEST_* DB setting keys 2017-10-18 14:17:09 -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
muzaffaryousaf
ef8b2994cc Fix quality issues to get green build for master. 2017-10-17 16:33:58 +05:00
Muzaffar yousaf
b34b5d9a12 Merge pull request #15872 from edx/video-transcript-preferences 
Video transcript preferences
 2017-10-17 14:45:29 +05:00
Qubad786
d6acfa679f Add video source language support for Cielo24 - EDUCATOR-1491 2017-10-16 19:23:19 +05:00
Mushtaq Ali
c0b5932d72 Source video language UI - EDUCATOR-1314 2017-10-16 19:23:19 +05:00
Qubad786
5900b349bc Backend changes for video source language in transcript preferences. 2017-10-16 19:23:19 +05:00
Qubad786
9c06bb65b1 Use edx-val transcripts and translations collectively with contentstore. 
Adds val trancripts in outcome of get_transcripts_info and rest of flow remains the same and also add fallback  to edx-val rtanscripts for mobile accessible video endpoints.
 2017-10-16 19:23:18 +05:00
Qubad786
ec7b78d60e Use edx-val transcripts as a fallback on the video component 
Purpose of this, is to serve transcripts from edx-val if the requested transcripts are not found in the contentstore i.e. that's where all the transcripts are living to date.
 2017-10-16 19:23:18 +05:00
Mushtaq Ali
538a3d7801 Add video transcript config model flags - EDUCATOR-1224 2017-10-16 19:23:18 +05:00
muhammad-ammar
2203de4a85 video ids info 2017-10-16 19:23:17 +05:00
Mushtaq Ali
17e87f87ec Change transcript status text - EDUCATOR-1324 2017-10-16 19:23:17 +05:00
Mushtaq Ali
9d156c042c Remove course wide transcript settings (N/A provider selected) - EDUCATOR-1311 2017-10-16 19:23:15 +05:00
Mushtaq Ali
ec399645f3 Course video settings UI - EDUCATOR-1063 2017-10-16 19:22:41 +05:00
Qubad786
9009669cc7 Add trasncript preferences backend for studio and new transcription statuses to video. 
EDU-1092
 2017-10-16 19:22:41 +05:00
muzaffaryousaf
a953a844fd Settings for video transcripts bucket w.r.t django storages. 2017-10-16 19:22:41 +05:00
John Eskew
1f36bf0876 Add django-simple-history back to edx-platform as a requirement. 
The module is still used by (at least) edx-enterprise.
 2017-10-16 09:42:22 -04:00
Alex Dusenbery
b89e6419a5 Prevent compute_all_grades_for_course() task from being executed more than once every hour. 2017-10-13 15:13:53 -04:00