Commit Graph

7773 Commits

Author SHA1 Message Date
sandroroux
82aa1654f8 Added Google Analytics tracking to the Highlights Modal's save and cancel buttons
Added tracking to 'Enter Section Highlights' link.
2017-11-06 15:32:02 -05:00
noraiz-anwar
1f99e28f57 remove logs added under EDUCATOR-1652 2017-11-06 20:07:28 +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
Troy Sankey
d8293f962c Merge pull request #16412 from edx/pwnage101/settings_validation_refactor_PLAT-1776
move settings validation out of startup.py
2017-11-03 13:44:11 -04:00
Brian Mesick
e12ce751d7 Merge pull request #16413 from edx/bmedx/django111_urls_cms
CMS urls cleanup for Django 1.11
2017-11-03 12:53:48 -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
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
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
a2cc679b25 Remove usage of default_app_label from ccxcon. 2017-11-02 16:52:09 -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
bmedx
9099f0dc23 CMS urls cleanup for Django 1.11
- Remove usage of django.urls.patterns
- Change urls tuples to lists
- Make all string view names callables
2017-11-02 14:29:48 -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