1. 01 Dec, 2014 1 commit
  2. 10 Nov, 2014 2 commits
  3. 20 Oct, 2014 1 commit
  4. 02 Oct, 2014 1 commit
    • Add new enrollment message to the dashboard · bf112f7e
      The body of the enrollment message template
      
      Tokenize platform name in message.
      
      Changing to a datetime enrollment approach
      
      Adding sorting. A little refactoring.
      
      Adding confguration model for time delta
      
      Adding admin registration and basic form for new config model.
      
      Fixing docstring typo
      
      Updating default time delta to 0, adding test to show it disabled functionality.
      
      Removing the form from configuration and tweaking the enrollment message html
      Stephen Sanchez committed
  5. 05 Aug, 2014 1 commit
  6. 16 Jul, 2014 1 commit
  7. 14 Jul, 2014 1 commit
  8. 10 Jul, 2014 1 commit
    • asadiqbal08:[EX-6] Set up data models and shopping cart enhancements in the LMS · 5734d2a8
      Added username into Authors file
      
      [Ex-12] Add user to input coupon code in the Shopping Cart
      
      [Ex-13] Discount should be reflected in the Payment confirmation page and email
      
      added E-commerce Tab in Instructor Dashboard
      
      added name/email in authors file
      
      removed the is_active column, change the colors scheme, fixed bugs
      
      wip
      
      wip
      
      test github account
      
      STORE_BILLING_INFO set to True
      
      cybersource api update, reference number updated, merchant_data removed from params
      
      View Course buttons on receipt
      
      link for course added to receipt
      
      receipt.html view course button - func update
      
      receipt.html course link update
      
      move new CyberSource implementation to a separate file so that we can keep the original
      
      remove config changes
      
      remove config changes
      
      remove coupon redemption during clear cart and update test cases
      
      [Ex-11]added test cases(E-commerce Tab Instuctor Dashboard)
      
      update data model max_length to 255
      
      remove array paid_course_ids init in views.py
      
      removed the is_active filter=false, added styling to the inactive coupon codes
      
      remove coupon redemption during clear cart and update test cases
      
      [Ex-11]added test cases(E-commerce Tab Instuctor Dashboard)
      
      update data model max_length to 255
      
      Add column to the list of coupons in the E-Commerce tab
      
      Add ability for microsites to specify custom CyberSource secret configuration, i.e. run under different accounts
      
      make the new CyberSource2 also microsite aware
      
      updating migration for student and shopping cart apps
      
      added user signup functionality that orignated from the Microsites
      
      added non-microsite user signup tests
      
      fix the hard coded callback URL to localhost
      
      add comment
      
      Modify e-commerce instructor tab to show a total amount above the coupon listings for admin finance user
      
      made changes as suggested by diana khuang
      
      add the CourseAccessRoles table to the Django Admin website
      
      shopping cart coupon checkout changes as suggested by Jason Bau
      
      changes are made according to the suggesstions on PR#4172
      
      changes made in the coupons file
      
      changes in the coupons get_coupon_info view
      
      fix merge conflict resolution error
      
      changes in the remove_coupon view json response
      
      changes as suggested by David Baumgold
      
      pep8/pylint fixes
      
      Changes as suggested by jasonBau
      
      don't assume item in shopping cart is a PaidCourseRegistration
      
      fix up some logging
      
      changed the urls of the coupon views and use the post to get the values from the request
      asadiqbal08 committed
  9. 27 Jun, 2014 1 commit
  10. 26 Jun, 2014 1 commit
  11. 29 May, 2014 1 commit
  12. 21 May, 2014 1 commit
  13. 19 May, 2014 1 commit
  14. 12 May, 2014 3 commits
  15. 08 May, 2014 1 commit
    • Make course ids and usage ids opaque to LMS and Studio [partial commit] · 79cf4c72
      This commit migrates roles from named groups to a relational table.
      
      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
  16. 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
  17. 31 Mar, 2014 1 commit
  18. 29 Jan, 2014 2 commits
    • Add optional feature to lock out accounts after N failed login attempts.… · 8c60f293
      Add optional feature to lock out accounts after N failed login attempts. Lockouts will last M seconds.
      
      add DB migration and fix earlier mistakes in student migration history
      
      add tests and fix bugs that came out of those unit tests
      
      remove unused import
      
      pep8/pylint
      
      address some PR feedback
      
      fix tests
      
      fix broken test
      
      try to mock time
      
      use freeze-gun to overload the system time to simulate the future
      Chris Dodge committed
    • Selectively require/hide registration fields & add country/city fields · 386115ae
      Extend the capabilities of the REGISTRATION_OPTIONAL_FIELDS
      configuration variable, to allow to select, for each individual field,
      if it should be 'hidden', 'optional' or 'required'.
      
      Rename the configuration variable to REGISTRATION_EXTRA_FIELDS to reflect
      the additional capabilities, and updates the defaults.
      
      As extra fields, configurable through the REGISTRATION_EXTRA_FIELDS
      variable. Hidden by default.
      
      Tickets: MCKIN-168 MCKIN-184
      
      Note: Studio also has a registration page, which uses the same account
      creation page. It should be possible to use it without requiring the
      variable from the LMS, as the fields are different.
      Xavier Antoviaque committed
  19. 05 Dec, 2013 1 commit
  20. 04 Dec, 2013 2 commits
  21. 26 Nov, 2013 2 commits
  22. 16 Oct, 2013 1 commit
  23. 14 Aug, 2013 1 commit
    • Shift enroll/unenroll logic to CourseEnrollment model, add is_active and mode. · 3ce87583
      Features coming down the pipe will want to be able to:
      * Refer to enrollments before they are actually activated (approval step).
      * See what courses a user used to be enrolled in for when they re-enroll in
        the same course, or a different run of that course.
      * Have different "modes" of enrolling in a course, representing things like
        honor certificate enrollment, auditing (no certs), etc.
      
      This change adds an is_active flag and mode (with default being "honor").
      The commit is only as large as it is because many parts of the codebase were
      manipulating enrollments by adding and removing CourseEnrollment objects
      directly. It was necessary to create classmethods on CourseEnrollment to
      encapsulate this functionality and then port everything over to using them.
      
      The migration to add columns has been tested on a prod replica, and seems to be
      fine for running on a live system with single digit millions of rows of
      enrollments.
      David Ormsbee committed
  24. 08 Aug, 2013 2 commits
  25. 29 Apr, 2013 1 commit
  26. 06 Feb, 2013 1 commit
  27. 29 Jan, 2013 1 commit
  28. 16 Jan, 2013 1 commit
  29. 11 Jan, 2013 2 commits
  30. 08 Jan, 2013 1 commit
  31. 04 Jan, 2013 1 commit
  32. 20 Dec, 2012 1 commit