1. 13 Mar, 2014 1 commit
  2. 28 Feb, 2014 1 commit
  3. 07 Feb, 2014 1 commit
  4. 16 Jan, 2014 1 commit
  5. 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
  6. 03 Dec, 2013 1 commit
  7. 01 Nov, 2013 1 commit
  8. 16 Oct, 2013 2 commits
  9. 30 Sep, 2013 1 commit
  10. 27 Sep, 2013 1 commit
    • Stanford paid course registration · 667a1ead
      With tests, some settings changes
      (all should default to not breaking anything for edx)
      
      Added styling for shopping cart User Experience
      - Styled shoppingcart list page
      - Styled navigation shopping cart button
      - Styled receipt page
      - Styled course about page for shopping cart courses
      
      Addressed HTML/SCSS issues
      
      Remove offending body class and unnecessary sass changes
      
      Addresses many review comments on stanford shopping cart
      
      * framework for generating order instructions on receipt page
        in shoppingcart.models
      * move user_cart_has_item into shoppingcart.models
      * move min_course_price_for_currency into course_modes.models
      * remove auto activation on purchase
      * 2-space indents in templates
      * etc
      
      revert indentation on navigation.html for ease of review
      
      pep8 pylint
      
      move logging/error handling from shoppingcart view to model
      
      Addressing @dave changes
      Jason Bau committed
  11. 23 Sep, 2013 1 commit
  12. 20 Sep, 2013 1 commit
  13. 19 Sep, 2013 1 commit
  14. 13 Sep, 2013 1 commit
  15. 02 Aug, 2013 2 commits
  16. 31 Jul, 2013 2 commits
  17. 19 Jun, 2013 1 commit
    • The bulk of Shibboleth authentication for Stanford · 824fb9a3
      Highlights:
      * The url '/shib-login/' interfaces with apache/mod_shib via
        request.META to handle shibboleth login and registrations
      * Courses can designate 'enrollment_domains' to limit enrollment
        to users with a linked ExternalAuthMap verified by a particular
        identity provider
      * Tests
      * Logging
      
       Changes to be committed:
      
      	new file:   common/djangoapps/external_auth/migrations/0001_initial.py
      	new file:   common/djangoapps/external_auth/migrations/__init__.py
      	new file:   common/djangoapps/external_auth/tests/test_shib.py
      	modified:   common/djangoapps/external_auth/views.py
      	modified:   common/djangoapps/student/views.py
      	modified:   common/lib/xmodule/xmodule/course_module.py
      	modified:   lms/djangoapps/courseware/access.py
      	modified:   lms/djangoapps/courseware/tests/test_access.py
      	modified:   lms/envs/common.py
      	modified:   lms/envs/dev.py
      	modified:   lms/envs/test.py
      	modified:   lms/templates/courseware/course_about.html
      	modified:   lms/templates/dashboard.html
      	modified:   lms/templates/extauth_failure.html
      	modified:   lms/templates/navigation.html
      	modified:   lms/templates/register.html
      	modified:   lms/templates/signup_modal.html
      	modified:   lms/urls.py
      	renamed:    lms/wsgi_apache.py -> lms/wsgi_apache_lms.py
      Jason Bau committed
  18. 10 Jun, 2013 2 commits
  19. 05 Jun, 2013 1 commit
    • Inject theming hooks into navigation bar · f055c6f9
      Allow themes to inherit from the default navigation bar and override
      pieces of it, including the main logo, the links that display to the
      right of the logo, and the links inside the dropdown menu (with the
      exception of the `Log Out` link.
      
      In addition, this adds an empty block at the very top so that themes
      can place a branding bar at the top of the page. (Stanford identity
      guidelines require this: see https://identity.stanford.edu.)
      Nate Hardison committed
  20. 04 Jun, 2013 1 commit
  21. 10 May, 2013 1 commit
    • Make login link button in header work with course enrollment flow · 6f06a3d9
      When an unauthenticated user clicks the registration button for a course, they
      are redirected to the registration page with query params that are ultimately
      included in the form that gets submitted so they can be enrolled in the course
      upon successful registration. The header login button is fixed to pass the same
      query parameters to the login page so the user can be enrolled in the course
      upon successful login.
      Greg Price committed
  22. 07 May, 2013 1 commit
  23. 06 May, 2013 2 commits
  24. 03 May, 2013 3 commits
  25. 10 Apr, 2013 1 commit
  26. 12 Mar, 2013 1 commit
  27. 08 Mar, 2013 1 commit
  28. 06 Mar, 2013 1 commit
  29. 23 Jan, 2013 4 commits
  30. 09 Nov, 2012 1 commit