Skip to content

E
edx-platform
Switch branch/tag
  1. 08 Aug, 2014 1 commit
  3. 10 Jul, 2014 1 commit
  5. 09 Jul, 2014 1 commit
  7. 29 May, 2014 1 commit
  9. 13 May, 2014 1 commit
  11. 07 May, 2014 1 commit
    • Make course ids and usage ids opaque to LMS and Studio [partial commit] · e2bfcf2a 
      This commit updates common/djangoapps.

These keys are now objects with a limited interface, and the particular
internal representation is managed by the data storage layer (the
modulestore).

For the LMS, there should be no outward-facing changes to the system.
The keys are, for now, a change to internal representation only. For
Studio, the new serialized form of the keys is used in urls, to allow
for further migration in the future.

Co-Author: Andy Armstrong <andya@edx.org>
Co-Author: Christina Roberts <christina@edx.org>
Co-Author: David Baumgold <db@edx.org>
Co-Author: Diana Huang <dkh@edx.org>
Co-Author: Don Mitchell <dmitchell@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Nimisha Asthagiri <nasthagiri@edx.org>
Co-Author: Sarina Canelake <sarina@edx.org>

[LMS-2370]
      Calen Pennington committed
  13. 25 Mar, 2014 1 commit
  15. 17 Mar, 2014 1 commit
  17. 28 Feb, 2014 1 commit
  19. 27 Feb, 2014 3 commits
  21. 26 Feb, 2014 1 commit
  23. 24 Feb, 2014 1 commit
  25. 18 Feb, 2014 3 commits
  27. 31 Jan, 2014 1 commit
  29. 30 Jan, 2014 1 commit
  31. 16 Jan, 2014 1 commit
  33. 15 Jan, 2014 1 commit
  35. 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
  37. 06 Jan, 2014 1 commit
  39. 18 Dec, 2013 1 commit
    • Fixing email link injection bug · f351b050 
      Several templates used a variable set by the user (the request host header).  This led to a vulnerability where an attacker could inject their domain name into these templates (i.e., activation emails).  This patch fixes this vulnerability.

LMS-532
      Julia Hansbrough committed
  41. 03 Dec, 2013 2 commits
  43. 26 Nov, 2013 1 commit
  45. 14 Nov, 2013 2 commits
  47. 06 Nov, 2013 1 commit
  49. 29 Oct, 2013 1 commit
  51. 11 Jul, 2013 2 commits
  53. 09 Jul, 2013 3 commits
  55. 03 Jul, 2013 4 commits