Skip to content

E
edx-platform
Switch branch/tag
  1. 08 Dec, 2017 1 commit
  3. 03 Aug, 2017 1 commit
  5. 20 Oct, 2016 1 commit
  7. 18 Oct, 2016 1 commit
  9. 10 Jun, 2016 1 commit
  11. 24 May, 2016 2 commits
    • Fix unit and acceptance tests broken in upgrade (squashed) · 4f0aee3f 
      Fix syntax error in selectors

.attr() now returns a string (though it can still be passed an integer)

Fixes checkbox test failures

Remove remaining references to jquery.min (in wrong folder)

$.ajax now returns 422 if type is json and body is not JSON, e.g. ''

Substitute prop for attr

Remove references to jquery.min, add jquery.migrate (again)

"Fix" jquery karma config

This wasn't suppoed to survive the merge

This throws an error when called with an 'undefined' error

Fix Karma warning about [re|un]loading the window

Fix path for jquery in cms-squire tests

Move jasmine.clock.uninstall() to afterEach so it runs even on failure

Fix test failing due to timezone issues

Do the timeout before the window scrolling (so handler will not be _.throttled)

Fix an alert() triggered by window.onBeforeUnload while testing in Chrome
      Brian Jacobel committed
    • Upgrade jQuery 1.7.2 to 2.2.0 · 15f14814 
      FEDX-25
      Daniel Friedman committed
  13. 10 Mar, 2016 1 commit
    • Asynchronous download button for ORA2 data · 2b1a7eec 
      Conflicts:
	lms/djangoapps/instructor/tests/test_api.py
	lms/djangoapps/instructor/utils.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/api_urls.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor_task/api.py
	lms/djangoapps/instructor_task/tasks.py
	lms/djangoapps/instructor_task/tasks_helper.py
	lms/djangoapps/instructor_task/tests/test_api.py
	lms/djangoapps/instructor_task/tests/test_tasks.py
	lms/djangoapps/instructor_task/tests/test_tasks_helper.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/coffee/src/instructor_dashboard/data_download.coffee
	lms/templates/instructor/instructor_dashboard_2/data_download.html
      dylanrhodes committed
  15. 29 Oct, 2015 1 commit
  17. 19 Oct, 2015 1 commit
  19. 17 Aug, 2015 1 commit
  21. 13 Aug, 2015 1 commit
  23. 17 Jul, 2015 1 commit
  25. 16 Jul, 2015 1 commit
  27. 04 Jun, 2015 1 commit
  29. 22 May, 2015 1 commit
    • SOL-794 Detailed Enrollment Report · b555c869 
      - added the abstract and concrete layers of enrollment report provider
- created a celery task.
-added the button in the e-commerce reports section

added the enrollment data backend

added the payment data and start writing the test cases.

updated the code with the feedback suggestions and wrote some test cases.
- all the downloadable reports are now visible in the ecommerce download section.
Pending instructor tasks is also visible in the ecommerce section

added the fields in the user profile information
changed the report store configuration key
added the new http endpoint for financial reports to add more permissions for finance_admin to access.

fix quality issues

added test cases to check csv content data

rebased with master and resolved conflicts

changed the log messages

added the changes as per code clintonb suggestions during code review

updated the test cases for the finance_admin decorator

changes suggested by clinton.

Created and moved Table level filters to the Custom Manager for the CourseEnrollment model.

ecommerce.js file was loaded twice in the instructor_dashboard.js fixed the issues

added the registration code column in the csv

added the full gender in the csv file

Update data sources and add display name translations for the report columns

fix meta name

Make sure the reports section does not appear on non whitelabel courses

pylint fixes

expand out enumerated values
      Muhammad Shoaib committed
  31. 12 May, 2015 3 commits
  33. 15 Jan, 2015 1 commit
  35. 15 Oct, 2014 1 commit
  37. 02 Oct, 2014 1 commit
  39. 24 Mar, 2014 2 commits
  41. 21 Mar, 2014 1 commit
  43. 13 Mar, 2014 2 commits
  45. 11 Mar, 2014 1 commit
    • Generalize grade report to allow display of any report · d0b12ee3 
      We would like to be able to generate arbitrary reports and expose them to the instructor by simply uploading them to S3.  The existing grade download infrastructure pretty much supported that already, however, all of the internal and external structures were referring to the reports as exclusively grading related.

Fixes: AN-590
      Gabe Mulley committed
  47. 22 Nov, 2013 2 commits
  49. 30 Oct, 2013 4 commits
  51. 16 Oct, 2013 1 commit
  53. 10 Oct, 2013 1 commit
  55. 25 Sep, 2013 1 commit
  57. 02 Aug, 2013 3 commits