1. 17 Mar, 2015 1 commit
  2. 04 Feb, 2015 2 commits
    • Better support specifying of modulestore configuration in test cases · b353ed2e
      The existing pattern of using `override_settings(MODULESTORE=...)` prevented
      us from having more than one layer of subclassing in modulestore tests.
      
      In a structure like:
      
          @override_settings(MODULESTORE=store_a)
          class BaseTestCase(ModuleStoreTestCase):
              def setUp(self):
                  # use store
      
          @override_settings(MODULESTORE=store_b)
          class ChildTestCase(BaseTestCase):
              def setUp(self):
                  # use store
      
      In this case, the store actions performed in `BaseTestCase` on behalf of
      `ChildTestCase` would still use `store_a`, even though the `ChildTestCase`
      had specified to use `store_b`. This is because the `override_settings`
      decorator would be the innermost wrapper around the `BaseTestCase.setUp` method,
      no matter what `ChildTestCase` does.
      
      To remedy this, we move the call to `override_settings` into the
      `ModuleStoreTestCase.setUp` method, and use a cleanup to remove the override.
      Subclasses can just defined the `MODULESTORE` class attribute to specify which
      modulestore to use _for the entire `setUp` chain_.
      
      [PLAT-419]
      Calen Pennington committed
  3. 02 Dec, 2014 1 commit
  4. 30 Nov, 2014 1 commit
  5. 12 Nov, 2014 1 commit
  6. 10 Nov, 2014 1 commit
  7. 09 Nov, 2014 1 commit
  8. 24 Sep, 2014 2 commits
  9. 23 Sep, 2014 1 commit
  10. 16 Sep, 2014 1 commit
  11. 10 Jul, 2014 1 commit
    • Separate edX / Open edX footer. · 3cb87802
      We need to use an Open edX footer by default (and that's what all non-edx.org
      instances should base their footer off) and only use the edX footer on
      edx.org.
      
      This commit uses `SITE_NAME` to determine which footer to use.
      
      Sites using theming or micro-sites with a `SITE_NAME` not ending in `edx.org`
      should not be affected.
      James Tauber committed
  12. 28 Feb, 2014 1 commit
  13. 10 Feb, 2014 1 commit
  14. 30 Jan, 2014 2 commits
  15. 23 Jan, 2014 1 commit
  16. 14 Jan, 2014 1 commit
    • Introduction of the Microsite feature which allows for limited multi-tenant… · a3211a74
      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
      Chris Dodge committed