Introduction of the Microsite feature which allows for limited multi-tenant...
Introduction of the Microsite feature which allows for limited multi-tenant branding on a subdomain basis, e.g. foo.edx.org and bar.edx.org fix errorenous logic when running a microsite that could reside in a hosting environment with a marketing site in front of it pep8/pylint fixes address PR feedback, remove underscore from test hostname more pep8/pylint cleanup. Skip test_microsites test, it works on localdev, not on Jenkins. Need to talk with QA team manually add Ned's single-to-double quote fix change aws.py runtimes so that the microsite_dir that is read from configuration is changed to a python path Conflicts: lms/templates/help_modal.html
Showing
- cms/djangoapps/contentstore/views/course.py 11 additions, 3 deletionscms/djangoapps/contentstore/views/course.py
- cms/djangoapps/contentstore/views/public.py 10 additions, 4 deletionscms/djangoapps/contentstore/views/public.py
- cms/envs/aws.py 14 additions, 1 deletioncms/envs/aws.py
- cms/envs/common.py 1 addition, 1 deletioncms/envs/common.py
- cms/envs/microsite_test.py 15 additions, 0 deletionscms/envs/microsite_test.py
- common/djangoapps/edxmako/shortcuts.py 10 additions, 0 deletionscommon/djangoapps/edxmako/shortcuts.py
- common/djangoapps/microsite_configuration/__init__.py 0 additions, 0 deletionscommon/djangoapps/microsite_configuration/__init__.py
- common/djangoapps/microsite_configuration/middleware.py 183 additions, 0 deletionscommon/djangoapps/microsite_configuration/middleware.py
- common/djangoapps/student/views.py 67 additions, 17 deletionscommon/djangoapps/student/views.py
- common/djangoapps/util/request.py 2 additions, 1 deletioncommon/djangoapps/util/request.py
- lms/djangoapps/branding/__init__.py 36 additions, 20 deletionslms/djangoapps/branding/__init__.py
- lms/djangoapps/branding/views.py 16 additions, 4 deletionslms/djangoapps/branding/views.py
- lms/djangoapps/courseware/courses.py 1 addition, 1 deletionlms/djangoapps/courseware/courses.py
- lms/djangoapps/courseware/tests/test_microsites.py 145 additions, 0 deletionslms/djangoapps/courseware/tests/test_microsites.py
- lms/djangoapps/instructor/enrollment.py 44 additions, 6 deletionslms/djangoapps/instructor/enrollment.py
- lms/djangoapps/instructor/views/legacy.py 38 additions, 9 deletionslms/djangoapps/instructor/views/legacy.py
- lms/djangoapps/shoppingcart/models.py 20 additions, 7 deletionslms/djangoapps/shoppingcart/models.py
- lms/envs/aws.py 10 additions, 0 deletionslms/envs/aws.py
- lms/envs/cms/microsite_test.py 38 additions, 0 deletionslms/envs/cms/microsite_test.py
- lms/envs/common.py 61 additions, 1 deletionlms/envs/common.py
Please register or sign in to comment