Commit Graph

42 Commits

Author SHA1 Message Date
Jeremy Bowman
d44e6297ae PLAT-1847 Fix cms tests under Django 1.9 2017-12-13 15:29:02 -05:00
Ned Batchelder
e23e3a0486 Fix a number of unused-import pylint violations 2017-11-21 19:57:06 -05:00
John Eskew
1a1c93e5e8 Remove orphaned pre-startup code and tests. 2017-11-01 14:04:31 -04:00
John Eskew
a36eb51a64 Move microsite config from startup.py to settings and AppConfig.ready. 2017-11-01 14:04:31 -04:00
John Eskew
41aaaab584 Fixes to mgmt cmds which delete django-simple-history data. 2017-10-18 09:15:37 -04:00
John Eskew
eb99657770 Merge pull request #16220 from edx/jeskew/delete_historical_data
Mgmt commands to clear data from historical tables.
2017-10-18 09:00:21 -04:00
John Eskew
f3e089bd3f Mgmt commands to clear data from historical tables. 2017-10-17 15:27:59 -04:00
John Eskew
194413cdf9 Add migrations which remove HistoricalRecord tables. 2017-10-12 11:20:25 -04:00
John Eskew
737ebccb74 Remove django-simple-history and all HistoricalRecords. 2017-10-11 11:36:06 -04:00
Andy Armstrong
93235d118d Reorder imports using isort (except lms and cms) 2017-05-30 16:04:54 -04:00
Ned Batchelder
4a568476fd Remove a number of unneeded super()-delegation methods 2017-04-27 14:12:56 -04:00
Douglas Hall
ac390e13f6 Refactored middleware that supports SESSION_COOKIE_DOMAIN overrides. 2016-10-18 09:07:03 -04:00
Matjaz Gregoric
344c72b3e2 Use non-ascii PLATFORM_NAME in tests.
It should help catch unicode encoding problems earlier.

This also updates python-saml dependency to a version that includes a
patch for unicode strings.
2016-09-23 15:38:23 +02:00
Saleem Latif
8ae92901ef 1. Merge microsites into Comprehensive Theming
2. Add site configuration overrides to theming/helpers.py
3. Move microsite.get_value from theming/helpers to site_configuration/helpers
4. Move microsite_configuration.microsite.get_value usages to site_configuration.helpers.values
2016-07-27 13:55:14 +05:00
Matt Drayer
68312bdd2d Revert "Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming""
2. Update COMPREHNSIVE_THEME_DIR to COMPREHENSIVE_THEME_DIRS
3. Update paver commands to support multi theme dirs
4. Updating template loaders
5. Add ENABLE_COMPREHENSIVE_THEMING flag to enable or disable theming via settings
6. Update tests
7. Add backward compatibility for COMPREHEHNSIVE_THEME_DIR
2016-06-30 15:19:51 +05:00
Clinton Blackburn
3f19cc0265 Updated logout view
In addition to logging the user out of LMS, the logout view also logs users out of the IDAs to which they previously authenticated.

ECOM-4610
2016-06-15 11:11:49 -04:00
Clinton Blackburn
77f605b30a Corrected usage of the title block for the main_django template
ECOM-4610
2016-06-13 19:11:36 -04:00
Felipe Montoya
2c7ddb1d15 Delegating the conditional to the has_configuration_Set method, which is overriden by the database backend, so the enable_pre_startup works well for both backends.
Adding tests

Fix quality issues
2016-02-26 12:11:44 -05:00
Zia Fazal
6cd265751a fixed get_template_path to work with absolute path also
fixed quality violation

skipped test in CMS

changes after feedback from mattd
2016-02-16 11:52:19 +05:00
Zia Fazal
9aa6718b25 removed constraints on MicrositeHistory model to allow Updates on Microsite model
fixed quality violations
2016-02-02 19:01:09 +05:00
Felipe Montoya
4742e661f4 Creating a settings object that is aware of the microsite settings.
Adding the declaration of the settings object to openedx.conf to be able to import it from a nicer location

Resolving quality violations

Merging dicts with the settings definition when they exist in the microsite configuration

Using a cache to improve the perfomance of quering any dictionary in the microsite definition

Ignoring the invalid-name pylint warning since the names must be kept thsi way to stay the same as the ones in django.
Removing the default dict argument as per https://docs.python.org/2/tutorial/controlflow.html#default-argument-values

Extracting the implementation of the microsite to a selectable backend.

Leaving the function startup.enable_microsites for backwards compatibilityy

Adding a database backend

Using a cache to improve the perfomance of quering any dictionary in the microsite definition.
Changed the database backend so that it extends the settings file backend and removed all the unnecessary methods.

Using the backend provider for the get_dict function

some tweeks and some initial unit tests

Using getattr as a function insteal of calling the underlying __getattr__ directly

Adding an ModelAdmin object for the microsite model in the django-admin panel

refactor enable_microsites()

consolidate/refactor some shared code

add config to aws.py and add migration files

fix tests

Changes to get the backends to run after the refactor

add archiving capabilities to microsites. Also make a few notes about performance improvements to make

fix tests

Making the query to find if microsites exist in the database faster

add ORG to microsite mapping tables and some performance improvements

allow for Mako templates to be pulled from the database

fix tests

For the database template backend the uri of the template does not use the filesystem relative path

Fixing pylint violations

Added caching of the templates stored in the database

Fixing pylint errors

fix pylint

Clearing the cache on model save

Fixing pylint errors

rebased and added test coverage

rebased cdodge/microsite-improvements branch with master and added test
coverage

added missing migration

fix quality violations

add more test coverage

mattdrayer: Add microsite_configuration to cms.INSTALLED_APPS

added microsite settings to cms/envs/test.py

run session cookie tests only in LMS

fixed broken tests

putting middleware changes back

Preventing the template_backend to be called on requests which have no microsite

changes to address feedback from mjfrey

changed BaseMicrositeBackend to AbstractBaseMicrositeBackend

changes after feedback from mattdrayer

fixed broken tests and quality violations

Allowing the backend to handle the enable_pre_startup routine

Typos and docstrings

Adressing feedback

Fixing python tests

add comment to explain why we need enable_microsites_pre_startup()
2016-01-15 14:52:36 +05:00
Felipe Montoya
f2a6a27ec9 Adding support for microsite template_paths on django templates
Stripping the leading / for the django_templates finder

Enabling the microsite configurations before running django.setup()

Adding only the templates directory before startup

Adding the missing overrides file at the django templates main

Using the comp_theming way of overriding css

Adding test for the microsite_template_path filter
2016-01-12 10:34:00 -05:00
Ned Batchelder
0872732cf0 Fix pylint C7630 (literal used as attribute) violations
There's no need to use a string literal in setattr, delattr, or the
two-argument form of getattr.
2015-11-23 15:32:54 -05:00
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