Commit Graph

16 Commits

Author SHA1 Message Date
Chris Dodge
b6a333f323 do the ORG filtering as part of the mongo query. Also, don't trigger metadata inheritence calculations when just trying to load 'about' information, which is not tied into the course tree anyhow (i.e. no parent/child relationship) 2015-03-23 12:28:20 -04:00
Sarina Canelake
cae70d9966 Move default Open edX branding into default-theme directory
OPEN-307
2015-01-09 10:49:17 -05:00
Sarina Canelake
6f5134f711 Move edx branding into edx-theme directory
OPEN-307
2015-01-09 10:48:20 -05:00
Sarina Canelake
314c935369 Remove edX branding from default Open edX LMS
OPEN-307
2015-01-09 10:48:20 -05:00
Sarina Canelake
725e4908e3 Remove more pep8 violations 2014-11-04 07:37:41 -05:00
Stephen Sanchez
033551416b Updating the platform header styles to match new site styles.
Putting the new edx header behind a feature flag.
2014-08-22 18:25:45 +00:00
marcore
a3d52557a5 Fix filter with new opaque key, allowing user to set COURSE_LISTING as old way path 2014-08-04 23:52:07 +02:00
Chris Dodge
aa43689a93 This PR addresses the open feedback on the Microsites feature 2014-02-28 16:27:12 -05:00
Jason Bau
f3a969a9fc fix non-microsite SUBDOMAIN_BRANDING defaults 2014-02-11 12:41:16 -08: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
David Baumgold
f3f4af8087 settings.MITX_FEATURES => settings.FEATURES 2013-12-03 15:34:55 -05:00
David Baumgold
15b65fbecc Fix static links for footer images 2013-10-08 11:39:22 -04:00
Chris Dodge
cff93d324b WIP 2013-08-15 22:58:02 -04:00
Calen Pennington
096d6853eb Allow for branding subdomains that are longer than a single . 2012-10-11 13:18:27 -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
Calen Pennington
82bab71ccf First pass at branding the header logo on subdomains 2012-08-22 14:05:19 -04:00