Don Mitchell
7f91ce40ae
Restful api for course advanced settings
...
STUD-948
2013-11-26 10:17:52 -05:00
Julia Hansbrough
e4ebb586e8
Update mode appropriately when user enrolls
...
The "mode" was remaining unchanged when a student unenrolled & re-enrolled in a course--i.e., someone who was verified when first registering would still be verified when unenrolling and re-registering in audit mode. This commit fixes this problem.
LMS-1526
2013-11-25 21:20:15 +00:00
Ned Batchelder
9a106a32d5
Merged master to rc/2013-11-21
2013-11-25 14:56:09 -05:00
Diana Huang
7a56e00d53
Merge pull request #1604 from edx/jarv/verified-certs
...
Jarv/verified certs
2013-11-25 07:37:13 -08:00
Diana Huang
586b1f72ef
Fix typo in comment.
2013-11-22 11:27:18 -05:00
David Ormsbee
a99fd08004
Fix error case where we have items in our grading csv output
...
that are not present in a given student's gradeset.
General code cleanup and addition of comments.
Instructor dashboard API unit tests.
LMS-58
2013-11-22 10:06:28 -05:00
Diana Huang
696f1df043
Pass through the certificate mode correctly.
2013-11-20 17:05:57 -05:00
Julia Hansbrough
bc4ebfdc40
Merge pull request #1693 from edx/flowerhack/fix/password-reset-messages
...
Fixed password reset message
2013-11-19 13:19:33 -08:00
Julia Hansbrough
87238e6d93
Removed null bits
2013-11-19 20:24:58 +00:00
Julia Hansbrough
dac5d2ac0e
Merge pull request #1634 from edx/flowerhack/feature/refactor-to-track-enrollment
...
Flowerhack/feature/refactor to track enrollment
2013-11-19 06:27:22 -08:00
Julia Hansbrough
41b73d8f48
Basic test fix
2013-11-18 23:03:18 +00:00
Julia Hansbrough
1b7a871926
Fixed password reset message
...
LMS-1507
2013-11-18 18:34:50 +00:00
Gabe Mulley
4b1974cdbc
fix spammy log messages from course_id tracking in CMS
2013-11-18 08:47:54 -05:00
Julia Hansbrough
f950ea106d
response to CR
2013-11-15 15:38:21 +00:00
Julia Hansbrough
e73489ec31
Response to CR
2013-11-14 22:34:18 +00:00
cahrens
569c86de74
Code review feedback.
2013-11-14 17:09:24 -05:00
cahrens
53a4016619
Utility method for converting string to bool.
2013-11-14 13:47:46 -05:00
cahrens
a170c6f4e7
Change save_item and create_item to RESTful URL.
...
Part of STUD-847.
2013-11-14 11:03:31 -05:00
Calen Pennington
3d5aa2b5bc
Merge pull request #1575 from cpennington/hotfix-memory-leaks
...
Improve memory profile during course grading runs
2013-11-13 12:07:36 -08:00
Calen Pennington
061a46beef
Formalize various access roles as objects
...
This centralizes the logic for group membership, and means that we
don't need to make queries to find out whether the legacy groups names exist.
2013-11-13 13:42:37 -05:00
Will Daly
35ec9d3105
Added wait for JS before clicking nav menus
2013-11-12 17:33:56 -05:00
Jason Bau
59225b973d
Merge pull request #1640 from edx/jbau/fix/remove-revision-from-middleware
...
Jbau/fix/remove revision from middleware
2013-11-12 13:16:51 -08:00
Jason Bau
bc32899c1b
actually, just remove the revision
2013-11-08 15:16:26 -08:00
Jason Bau
2627db13a0
make edxapp work when not run from a git repo
2013-11-08 12:49:52 -08:00
Julia Hansbrough
8042332cda
purchased_callback now uses the change_mode method
2013-11-08 20:33:52 +00:00
Julia Hansbrough
94b8b0acc9
all CourseEnrollment modifications route through create_or_update
2013-11-08 20:18:28 +00:00
Julia Hansbrough
73af5d017e
Changed create_enrollment to create_or_update_enrollment
2013-11-08 19:01:51 +00:00
Carlos Andrés Rocha
b72604d2bf
Merge pull request #1615 from rocha/fix-external_auth-djangostore
...
Fix error on external_auth djangostore
2013-11-08 10:26:51 -08:00
Julia Hansbrough
f294920473
Merge pull request #1601 from edx/flowerhack/feature/course-modes-expire-datetime
...
Added expiration_datetime field to CourseModes
2013-11-08 09:54:16 -08:00
Calen Pennington
864d831ce3
Use XBlock handlers for handle_ajax in XModules
...
Adds xblock handler_url support to the LMS, and makes handle_ajax use
that code.
[LMS-230] [LMS-229]
2013-11-08 11:08:48 -05:00
Calen Pennington
8ddd8c14a4
Fix pylint/pep8 errors
2013-11-08 11:08:48 -05:00
Calen Pennington
da26ae2529
Remove lms/lib from sys.path in favore of using it as the module lms.lib
2013-11-08 11:08:48 -05:00
Julia Hansbrough
05996a71df
Added expiration_datetime field to CourseModes
...
Added an expiration_datetime field to CourseModes, intended to eventually replace expiration_date.
Included relevant schema and data migration file.
LMS-1454
2013-11-08 15:30:37 +00:00
Carlos Andrés Rocha
28bc2e232f
Fix error on external_auth djangostore
...
Don't raise an exception when an association is not found.
2013-11-07 18:37:09 -05:00
Gabe Mulley
3377cb66c9
emit enrollment event
2013-11-06 15:09:33 -05:00
Gabe Mulley
5aa19c08b5
Revert "emit enrollment event"
...
This reverts commit 5734cae1c3
2013-11-06 14:35:28 -05:00
Christina Roberts
cd868efc22
Merge pull request #1580 from edx/christina/item
...
Change delete_item to RESTful URL.
2013-11-06 10:50:56 -08:00
cahrens
16766a5ee9
Change delete_item to RESTful URL.
...
Part of STUD-847.
2013-11-06 13:49:24 -05:00
Gabe Mulley
5734cae1c3
emit enrollment event
2013-11-06 08:46:40 -05:00
Sarina Canelake
939dbb6c9d
Merge pull request #1579 from edx/sarina/enhance-user-factories
...
Sarina/enhance user factories
2013-11-05 07:31:00 -08:00
Sarina Canelake
ea529b8841
Fix instructor api tests
2013-11-05 09:26:32 -05:00
Julia Hansbrough
8b6568f448
Removed duplicate code
2013-11-05 14:17:34 +00:00
Julia Hansbrough
1e2c0f50f7
Merge pull request #1529 from edx/flowerhack/feature/refunds-for-certificates
...
Flowerhack/feature/refunds for certificates
2013-11-04 13:33:10 -08:00
Julia Hansbrough
448f5cc41f
Response to CR
2013-11-04 20:32:47 +00:00
John Jarvis
24524ef305
addressing comments
2013-11-04 15:14:20 -05:00
John Jarvis
4a910f8724
adding create_user script
2013-11-04 14:58:34 -05:00
Julia Hansbrough
1a3f4cb8f8
Moved can_refund logic to CourseEnrollment
2013-11-04 18:48:43 +00:00
Julia Hansbrough
c375666d88
Added new copy, small CR fixes
...
* Changed text for "Are you sure you want to refund"...
* Addressed a CR comment adding clarity to student view code
* Converted UTC to pytz.utc
2013-11-04 18:38:46 +00:00
Julia Hansbrough
81661385fb
More response to Dave's PR
2013-11-04 18:38:45 +00:00
Julia Hansbrough
7ab8142e82
Response to Dave & Diana's CR
2013-11-04 18:38:44 +00:00
