1. 10 Mar, 2015 1 commit
  2. 06 Mar, 2015 1 commit
  3. 04 Mar, 2015 1 commit
    • backend changes based on feedback · e21ff203
      Conflicts:
      	lms/djangoapps/courseware/courses.py
      	lms/djangoapps/instructor_task/api.py
      
      refined entrance exam student attempts reset
      
      Quality improvements 1/16
      
      added rescore, delete state and task history functionality
      
      added unit tests for entrance exam reset attempts
      
      added unit tests for re scoring of entrance exam and task history
      
      improved test coverage
      
      Got rid of pep violation
      
      feedback changes and added jasmine test
      
      added more jasmine tests for Javascript changes
      
      added bok-choy tests for UI changes
      
      replaced input containing <p> tags with <label>
      
      Removed ee element assertions to avoid js error
      
      Added call to super.setUp()
      
      changes based on feedback on 2/18
      
      Writing tests in JS instead of coffee script
      
      commit related to skip entrance exam 2/13
      
      fixed bad-continuation quality error
      
      fixed broken bok-choy test
      
      changes based on feedback on 2/18
      
      added js tests and removed coffee script tests
      
      fixed broken bok-choy and unit tests
      
      changes left while rebasing
      
      rephrase test titles
      
      do not need these libs
      
      changes based on feedback on 2/24
      
      changes text which was left
      
      Changes based on feedback on 3/3
      Zia Fazal committed
  4. 27 Feb, 2015 1 commit
  5. 23 Feb, 2015 1 commit
  6. 04 Feb, 2015 5 commits
  7. 03 Feb, 2015 2 commits
  8. 30 Jan, 2015 1 commit
    • Make logistration generally available if feature flag is active · a8bed5ce
      Makes logistration available at /login and /register as well as /accounts/login/ and /accounts/register/. In addition:
      
      - Adds support for redirect URLs in third party auth for combined login/registration page
      - Adds support for external auth on the combined login/registration page
      - Removes old login and registration acceptance tests
      - Adds deprecation warnings to old login and register views
      - Moves third party auth util to student_account
      - Adds exception for microsites (theming)
      Renzo Lucioni committed
  9. 27 Jan, 2015 1 commit
  10. 22 Jan, 2015 1 commit
  11. 20 Jan, 2015 3 commits
  12. 15 Jan, 2015 2 commits
    • make block.get_parent() work. · 17d892c5
      Co-Authored-By: Christina Roberts <christina@edx.org>
      Co-Authored-By: Daniel Friedman <dfriedman@edx.org>
      Co-Authored-By: Don Mitchell <dmitchell@edx.org>
      jsa committed
    • Added the reportlab requirement to base.txt · a8ebf6da
      Added receipts_pdf.py
      
      Used Paragraph for displaying a large body of text.
      
      added the table
      
      Line breaks in the para text. font size adjusted.
      
      Improved the main table (alignments) and totals (converted to a table as well)
      
      Converted the footer into a table, and allowed for pagination.
      
      Added pagination to item data table.
      
      Handled wrapping of long descriptions into multiple lines.
      
      email attachment for both invoice and receipt
      
      added the currency from the settings
      
      Removed magic numeric literals and added meaningful variables.
      
      Added initial set of substitutions from configuration
      
      add defining logo paths via configuration
      
      Removed font dependencies. Will use the system default fonts which appear good enough to me.
      
      Alignment adjustments as per suggestions.
      
      Fixed the pep8 violations. Added comments to styling
      
      added the decimal points to the price values
      
      Cleanup. Docstrings.
      
      i18n the text in the pdf file
      
      fix pep8/pylint issues
      
      Changed the amounts from string to float.
      
      Overrode the 'pdf_receipt_display_name' property in the OrderItem subclass Donation.
      
      used the PaidCourseRegistration instead of the parent OrderItem to avoid course_id related exceptions.
      
      quality fixes
      
      added  the test cases for the pdf
      
      made the changes in the pdf suggested by griff
      
      updated the pdf tests to assert the pdf content
      
      used the pdfminor library
      
      fix quality issues
      
      made the changes suggested by Will
      
      added the text file that says "pdf file not available. please contact support"
       in case pdf fails to attach in the email
      Afzal Wali committed
  13. 13 Jan, 2015 1 commit
    • Enable redeem codes. · b1884306
      Update the redeem code schema
      
      Updating the redeem code schema.
      
      Adding migration file.
      
      Adding course mode support when redeeming a code.
      
      Conflicts:
      	lms/djangoapps/shoppingcart/views.py
      
      Add sales admin privileges for redeem code generation.
      
      Making sure redeem code URLs work for verified courses.
      
      pep8 violations
      
      Code Review and Test Cleanup changes
      
      Added tests, fixed tests.
      
      Updating the boolean checks in ecommerce template
      stephensanchez committed
  14. 09 Jan, 2015 1 commit
    • WL-135 added the migration for the expiration_date field in the coupons model · 10f8d8c0
      added the functionality of adding the expiration date, and also handled in the shopping cart when the user try to add the expired coupon code in the shopping cart
      
      added expiration date in the coupons list in the ecommerce page
      
      added the unit tests and jasmine tests
      
      fix the quality issues and rebased with master
      
      regenerated the migration file with a different number
      
      i18n and verified te course mode
      
      changes suggested by  stephan
      Muhammad Shoaib committed
  15. 05 Jan, 2015 1 commit
  16. 31 Dec, 2014 1 commit
  17. 22 Dec, 2014 1 commit
  18. 17 Dec, 2014 2 commits
  19. 15 Dec, 2014 1 commit
  20. 13 Dec, 2014 2 commits
  21. 12 Dec, 2014 1 commit
  22. 11 Dec, 2014 1 commit
  23. 10 Dec, 2014 1 commit
  24. 09 Dec, 2014 7 commits