Commit Graph

65 Commits

Author SHA1 Message Date
Chris Dodge
c9718380ea catch additional FEATURE['ENABLE_MKTG_SITE'] checks and make sure MicrositeConfigurations will override the global setting
one more faulty login regarding ENABLE_MKTG_SITE=true situations
2014-01-16 17:04:17 -05:00
Chris Dodge
a3211a7405 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
2014-01-14 14:36:01 -05:00
Usman Khalid
a336ae7df6 edge.html inherits from main.html
LMS-1584
2014-01-10 17:29:24 +05:00
David Baumgold
f3f4af8087 settings.MITX_FEATURES => settings.FEATURES 2013-12-03 15:34:55 -05:00
David Baumgold
8eff442752 mitxmako => edxmako 2013-12-03 14:15:09 -05:00
Usman Khalid
231b130911 Removed hardcoded case for edge for /courses 2013-09-23 15:30:00 +00:00
Usman Khalid
b2af990d3c If setting COURSES_ARE_BROWSABLE is off return 404 on /courses 2013-09-23 15:19:32 +00:00
Adam Palay
5d0328aa3e creates "edge" case 2013-08-05 18:08:32 -04:00
Adam Palay
cac6a3195d add university_profile/edge.html for edge landing page 2013-08-05 17:26:47 -04:00
Adam Palay
f85cfc11fa redirects lms landing page to student.views.index if there is no marketing site
resets the cms edge redirect to '/'
2013-08-05 16:05:12 -04:00
Calen Pennington
e8ee29786f Remove news carousel and other unused pages
Remove unused course_filter page

removes university_profile urls and templates

removes all university_profile views

remove news from templates/index
2013-07-31 19:39:15 -04:00
Greg Price
93cbb2e422 Redirect from LMS courses page to marketing courses page
(Only if marketing site is enabled)
2013-05-07 13:06:38 -04:00
John Jarvis
54e5e3d31f Adding the EDX_MKTG feature flag and links back to the marketing site 2013-04-10 14:29:55 -04:00
Carlos Andrés Rocha
902a887e79 [34078525] pep8 renaming of some extern_auth functions 2012-08-29 18:46:35 -04:00
Calen Pennington
5ca636e606 Use the university profile page for courses and index if we are in a branded subdomain. N.B. THIS DOESN'T WORK WITH MIT_SSL_AUTH 2012-08-22 14:43:49 -04:00