1. 16 Jan, 2014 36 commits
  2. 15 Jan, 2014 2 commits
  3. 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
  4. 13 Jan, 2014 1 commit