Commit Graph

7759 Commits

Author SHA1 Message Date
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
Tyler Hallada
8809fd86b7 Merge pull request #16420 from edx/thallada/studio-outline-modal-escape
Allow escaping out of Studio CourseOutlineXBlockModals
2017-11-03 09:46:15 -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
564514dd07 Merge pull request #16415 from edx/jmbowman/PLAT-1779
PLAT-1779 Fix CMS INSTALLED_APPS/model imports mismatch
2017-11-02 11:13:42 -04:00
Brian Mesick
6a1d5e6a9d Merge pull request #16410 from edx/bmedx/django111_syncdb_cleanup
syncdb cleanup
2017-11-02 10:47:00 -04:00
Tyler Hallada
b60cefb3d5 Merge pull request #16418 from edx/thallada/ret-section-highlights-button
Make the Section Highlights in outline a button
2017-11-02 10:46:03 -04:00
Tyler Hallada
ff56102d18 Merge pull request #16411 from edx/thallada/ret-section-highlights-copy-edit
Edit highlights modal copy
2017-11-02 10:45:45 -04:00
Tyler Hallada
3665704a9a Allow escaping out of CourseOutlineXBlockModals 2017-11-02 10:45:26 -04:00
Jeremy Bowman
a7b3894274 PLAT-1779 Fix CMS INSTALLED_APPS/model imports mismatch 2017-11-02 10:09:22 -04:00
bmedx
82cb62d26a syncdb cleanup 2017-11-02 09:51:44 -04:00
John Eskew
ba07dec4c5 Move edxmako startup to AppConfig::ready. 2017-11-02 09:40:05 -04:00
John Eskew
4ed71b0234 Merge pull request #16417 from edx/jeskew/course_modes_ready_fix
Point to the proper AppConfig in INSTALLED_APPS for course_modes.
2017-11-02 09:37:54 -04:00
ayub-khan
d922364e21 Update translations 2017-11-02 14:44:29 +05:00
Tyler Hallada
dd087a1e54 Make the Section Highlights in outline a button 2017-11-01 18:59:09 -04:00
Andy Armstrong
268bea9e62 Make the course content page responsive
LEARNER-2754
2017-11-01 17:34:04 -04:00
John Eskew
e85af5d87b Point to the proper AppConfig in INSTALLED_APPS for course_modes. 2017-11-01 17:08:35 -04:00
Tyler Hallada
1ba564c32e Edit highlights modal copy
Make modal intro text darker.

Make intro message dark in the base modal scss
2017-11-01 17:08:29 -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