Commit Graph

19 Commits

Author SHA1 Message Date
Matjaz Gregoric
a9d8678ed0 Fix staticfiles import in microsite.py.
django-staticfiles was replaced with django.contrib.staticfiles
in dbcd1bf430.

The common/djangoapps/microsite_configuration/templatetags/microsite.py
file was still trying to import the old staticfiles package,
breaking the app on fresh installations.
2015-10-13 11:20:49 +02:00
Saleem Latif
4725f7f579 favicon display bug corrected 2015-10-02 18:15:49 +05:00
Ned Batchelder
9f92054ca7 Fix tests to work with Django 1.4.22
The 1.4.22 security fix makes it so that empty sessions are not written.
To keep the tests working, we now log in the user, so that some data is
saved to the session.
2015-08-19 11:05:41 -04:00
Sarina Canelake
47b99720fa Clean up old style class definitions 2015-07-13 17:33:27 -04:00
asadiqbal
302d7a0152 SOL-971
Allow microsites to override content

more test checks

Fix pylint error (duplicate import)

SOL-971 Changes
2015-06-10 19:26:30 +05:00
Ned Batchelder
78e9445aa1 Add super() calls to setUp/tearDown that are missing them
Also, I replaced a number of tearDown methods with addCleanup instead.
And also remove some unneeded patch.stopall() calls.
2015-05-14 18:14:21 -04:00
Chris Dodge
b80b347ed0 Make SessionMiddleware Microsite aware 2014-12-29 12:06:24 -05:00
stv
500499b678 Fix PEP8: E231 missing whitespace after '[:,]' 2014-11-10 19:31:05 -08:00
stv
cf9308144d Fix PEP8: E302 expected 2 blank lines, found 1 2014-11-10 11:00:11 -08:00
Chris Dodge
6fcfb2a6a3 allow for a customized region on the receipt page that is microsite brand specific 2014-10-30 22:17:02 -04:00
Sarina Canelake
46051ef212 Merge pull request #3495 from eduNEXT/feature/fmo/theme-microsite-support
Microsites alongside Theme
2014-08-19 12:39:21 -04:00
Felipe Montoya
8fd3ab07ba If microsites are enabled and it is a microsite request, then take the microsite path for theming 2014-06-27 23:01:29 -05:00
Felipe Montoya
a66f557a57 Adding template tag to render microsite css_overrides_file 2014-06-04 09:09:56 -05:00
Felipe Montoya
e64d09fdd8 Adding template tag to render the microsite favicon 2014-06-03 22:31:46 -05:00
Chris Dodge
aa43689a93 This PR addresses the open feedback on the Microsites feature 2014-02-28 16:27:12 -05:00
Dave St.Germain
cb7882e0c8 Added test for template tag and breadcrumb function. 2014-02-03 12:01:28 -05:00
Sarina Canelake
7718608741 Fix unicode error in subsection 2014-02-03 12:01:28 -05:00
Dave St.Germain
636eab8b9e Added more descriptive page titles. 2014-01-30 17:32:03 -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