Commit Graph

30 Commits

Author SHA1 Message Date
Peter Fogg
eafb07552a Merge pull request #9287 from edx/release
Release
2015-08-12 13:06:39 -04:00
Waheed Ahmed
aff849281d Revert "Test library failed to export after import"
This reverts commit 4c1c4619f0.
2015-08-12 02:06:09 +05:00
Brandon DeRosier
34526ddf6a Revert "Revert "Merge pull request #8986 from jazkarta/remove-ccx-enrollment""
This reverts commit 42e78463a7.
2015-08-11 13:03:58 -04:00
Peter Fogg
344ff8c1bc Merge pull request #9267 from edx/release
2015-08-11 release
2015-08-11 12:07:21 -04:00
Peter Fogg
42e78463a7 Revert "Merge pull request #8986 from jazkarta/remove-ccx-enrollment"
This reverts commit 53db053c18, reversing
changes made to 386a8a27dd.
2015-08-07 16:59:56 -04:00
Kyle McCormick
a14667c6f2 MA-1061 Fix IntegrityError caused by race condition in CourseOverview.get_from_id 2015-08-07 08:53:33 -04:00
Syed Hassan Raza
4c1c4619f0 Test library failed to export after import 2015-08-05 12:47:27 -07:00
Carlos de la Guardia
458ed0a64e Use the standard enrollment table instead of a custom CCX table for CCX
enrollments.

The goal for this PR is to have a single mechanism for registering users and
reducing the number of places where special-casing for ccx courses is needed. The
migration at this point is purposefully limited to convert ccx memberships into
student enrollments when moving forward. No backward migration is in place at the
moment. The ccx membership tables are not removed at this time. It is possible to go
backwards and forwards multiple times with no errors or data loss.
2015-08-01 02:59:10 -05:00
Kyle McCormick
10aae0d480 MA-1063 Add versioning and timestamping to CourseOverview 2015-07-31 10:28:17 -04:00
Kyle McCormick
ea89e2d83b Fix conflicting 0004_ migrations on course_overviews
What happened:
* First, I merged `0004_default_lowest_passing_grade_to_None.py`, which adds `null=True` to `lowest_passing_grade`.
* Later, Renzo merged `0004_auto__add_field_courseoverview_enrollment_start__add_field_courseoverv.py`, which adds a bunch of enrollment-related fields
* Neither migrations' `models` variables reflects the changes in the other one.
* release currently has just `0004_default...`
* master and rc/2015-07-22 have `0004_auto...` and `0004_default...`, in that order.

What this commit changes:
* Change `0004_auto...` to `0005_add_enrollment_fields.py`
* Update `models` in `0005_...` to have `null=True` for `lowest_passing_grade`
2015-07-24 11:41:42 -04:00
Renzo Lucioni
b50c905865 Remove modulestore dependency from Enrollment API
Sets the Enrollment API free of the modulestore by replacing modulestore queries with calls to the CourseOverview model. Course deletion invalidates the corresponding CourseOverview. XCOM-462.
2015-07-20 13:41:19 -04:00
Max Rothman
c97314413b Merge branch 'release' into release-merge-test
Conflicts:
	lms/djangoapps/commerce/urls.py
	lms/djangoapps/commerce/views.py
2015-07-17 17:42:03 -04:00
Adam
2735b2b5bb Revert "Decorated instructor dashboard with sudo_required." 2015-07-17 12:11:38 -04:00
Waheed Ahmed
bc052db1ee Added DjangoSudo functionality for instructor dashboard and course team page 2015-07-16 11:14:11 +05:00
Kyle McCormick
e1472080da MA-1036 Make CourseOverviews handle malformed grading policies 2015-07-15 14:16:18 -04:00
Ben McMorran
ccf20e52b1 TNL-2458 Cache discussion id mapping on course publish 2015-07-13 20:12:52 +00:00
Kyle McCormick
1dfe9ed9e8 MA-779 Update student dashboard to use CourseOverview 2015-07-08 12:05:38 -04:00
Kyle McCormick
5b630a7704 MA-779 Make has_access work on CourseOverview objects 2015-07-08 12:05:38 -04:00
muhammad-ammar
b0eda4cac9 Display warning message on course outline in Studio when course contains deprecated features/components
TNL-2303
2015-06-30 13:26:18 +05:00
Kyle McCormick
1726c136fa MA-772 create app course_overviews for caching course metadata 2015-06-22 18:33:12 -04:00
John Eskew
bd05dc0b71 Wrap course structure generation task in bulk operation. 2015-06-19 08:10:46 -04:00
Daniel Friedman
3acd7a008c Refactor and add tests for new grade report.
* Handle grading errors
2015-05-13 06:58:02 -04:00
Daniel Friedman
9269ec3b00 Add new instructor task for weighted problems 2015-05-12 16:32:00 -04:00
Clinton Blackburn
9a8ecc65a7 Removed invalid kwarg 2015-03-27 10:37:04 -04:00
Clinton Blackburn
6a2b9f4521 Reorganized course_structures app
Celery requires all tasks to be in a tasks module. Also, the task has been updated to use default values if the the course structure generator encounters a block without the graded or format fields.
2015-03-10 11:12:51 -04:00
Clinton Blackburn
ebc9c75e36 Explicitly naming task
This should prevent errors due to relative imports. See http://docs.celeryproject.org/en/latest/userguide/tasks.html#automatic-naming-and-relative-imports for additional information.
2015-03-03 15:59:19 -05:00
Clinton Blackburn
4062b94a0f Fixed Celery Serialization Bug
CourseLocator is not JSON-serializable. Passing course keys as Unicode instead when scheduling tasks to update course structure.
2015-02-27 09:59:18 -05:00
Clinton Blackburn
92ca64fa2a Finishing async course structure work
- Added tests
- Updated model field specification
- Fixed issue of multiple event emission
- Updated admin page
- Added management command to manually generate course structures
2015-02-13 12:21:51 -05:00
David Ormsbee
88681ba91a Make the Course Structure admin slightly more usable (list/search fields) 2015-02-11 16:13:10 -05:00
David Ormsbee
24fcab7f24 Very rough cut at generating a course outline after publishing. 2015-02-11 16:13:10 -05:00