Commit Graph

43429 Commits

Author SHA1 Message Date
Troy Sankey
d11d7554c3 Move theming settings validation registration into ready method
This avoids premature registration of django checks which could break
django 1.11 startup.
2017-11-03 12:23:54 -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
Gabe Mulley
47e3c68faf Merge pull request #16439 from edx/mulby/monitor-enrollment-perf
set a custom course_id metric on enrollment
2017-11-03 11:09:13 -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
Gabe Mulley
15c2a828b7 set a custom course_id metric on enrollment 2017-11-03 08:46:25 -04:00
Andy Armstrong
42396560f1 Merge pull request #16432 from edx/HarryRein/EDUCATOR-1681-import-error
Import Issue.
2017-11-02 16:56:04 -04:00
Troy Sankey
c866b5261c Merge pull request #16426 from edx/pwnage101/mailing_mgmt_cleanup
Mailing management command cleanup for Django 1.11
2017-11-02 16:08:17 -04:00
John Eskew
a711fb816b Merge pull request #16369 from edx/jeskew/remove_microsites_from_startup
Remove microsite configuration from LMS startup.py.
2017-11-02 15:37:49 -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
Tasawer Nawaz
01f6d69298 Merge pull request #16350 from edx/tasawer/learner-2735/add-success-component
add success component on successful form submission
2017-11-03 00:03:28 +05:00
edx-pipeline-bot
fd027db6ff Merge pull request #16430 from edx/release-mergeback-to-master
Merge release back to master
2017-11-02 15:02:41 -04:00
Harry Rein
8e64b4c252 Import Issue. 2017-11-02 15:01:17 -04:00
Clinton Blackburn
0162b3708b Fixed CourseMode admin search
Searching by course run key no longer raises an exception.
2017-11-02 14:44:38 -04:00
Troy Sankey
e069790501 Mailing management command cleanup for Django 1.11 2017-11-02 13:55:18 -04:00
tasawernawaz
5d97f6a3b0 add success component on successfull form submission LEARNER-2735 2017-11-02 22:41:58 +05:00
Harry Rein
22e05f622e Merge branch 'master' into release-mergeback-to-master 2017-11-02 13:33:03 -04:00
Stu Young
c3ebad65a8 Merge pull request #16401 from edx/estute/disable-capturing-stderr-in-pytest-output
add option to disable capturing stderr in pytest
2017-11-02 11:42:28 -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
Gregory Martin
a285ed0810 Merge pull request #16386 from edx/yro/a11y_audit_1553
A11Y Update to wiki edit field.
2017-11-02 10:58:10 -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
Stuart Young
77ed0ed46c add option to disable capturing stderr in pytest 2017-11-02 10:33:53 -04:00
Jeremy Bowman
a7b3894274 PLAT-1779 Fix CMS INSTALLED_APPS/model imports mismatch 2017-11-02 10:09:22 -04:00
Douglas Hall
e26f0ed0e8 Merge pull request #16425 from edx/zub/bump-enterprise-version-to-0.53.9
bump enterprise version from 0.53.7 to 0.53.9
2017-11-02 09:55:56 -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
025df85a88 Merge pull request #16424 from edx/LEARNER-2653-add-transifex-push-files-to-repo
LEARNER-2653 Added Untranslated strings files to Repo
2017-11-02 17:55:54 +05:00
Ayub khan
9823802413 Merge pull request #16423 from edx/you/update_translations
Update translations
2017-11-02 17:55:10 +05:00
Uzair Rasheed
1ebf9cf821 Merge pull request #16229 from edx/celery-task
celery task to update sailthru purchase record
2017-11-02 17:26:11 +05:00
zubair-arbi
c4d6a7101f bump enterprise version from 0.53.7 to 0.53.9 2017-11-02 17:15:13 +05:00
ayub-khan
faeb0c01f7 Those po files are created and used to push
translations to transifex. This will help edx-platform
automated jenkins translation job understand when to push
translations to transifex.
2017-11-02 16:19:49 +05:00
Gabe Mulley
d4af6ec001 Merge pull request #16294 from edx/thallada/ret-schedule-experience
Support multiple dynamic pacing experiences
2017-11-02 07:00:02 -04:00
Saleem Latif
6614ca8265 Merge pull request #16421 from edx/saleem-latif/ENT-673
ENT-673: Hide braces when ENTERPRISE_TAGLINE is not set.
2017-11-02 15:13:43 +05:00
ayub-khan
d922364e21 Update translations 2017-11-02 14:44:29 +05:00
Saleem Latif
d36153cbb8 Hide braces when ENTERPRISE_TAGLINE is not set. 2017-11-02 12:20:33 +05:00
Harry Rein
9f30bb6dc1 Merge pull request #16408 from edx/HarryRein/remove-header-waffle-flag-to-release-candidate
Removing waffle flag for responsive header.
2017-11-01 22:38:59 -04:00
Harry Rein
63eeca73ce Removing waffle flag for responsive header. 2017-11-01 21:36:32 -04:00
Andy Armstrong
19c2faeee5 Merge pull request #16391 from edx/andya/responsive-course-content
Make the course content page responsive
2017-11-01 20:27:32 -04: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
Andy Armstrong
ea4582abda Merge pull request #16414 from edx/bfiller/fix-dashboard-edx-theme
fix dashboard error on edx.org theme
2017-11-01 17:31:15 -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
Gabe Mulley
7fd643faa4 Add tests for experience types, ensure courses have a verified mode 2017-11-01 16:51:10 -04:00
Tyler Hallada
57bf89c8e2 Create schedule experience on schedule creation 2017-11-01 16:51:00 -04:00
Gabe Mulley
95d1e5c25e use a left outer join for experience types 2017-11-01 16:50:28 -04:00
Tyler Hallada
e5c8acb609 Allow communication experiences to be customized per-learner 2017-11-01 16:50:10 -04:00