Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,856 Commits 1 Branch 0 Tags
2ea166313b534159af2b500955da047e1398e426
Commit Graph

129 Commits

Author SHA1 Message Date
Julia Hansbrough
421f02518b Merge pull request #1744 from edx/flowerhack/feature/verified-cert-events 
Events for entering verified flow & buying
 2013-12-10 11:47:47 -08:00
Ned Batchelder
1cbc171616 Merge master in prep for merging back the hotfix changes. 2013-12-05 15:48:49 -05:00
Julia Hansbrough
f880bcb652 Response to CR 2013-12-05 19:14:45 +00:00
Julia Hansbrough
e8196d9761 Events for entering verified flow & buying 2013-12-05 19:10:27 +00:00
David Baumgold
e26fc08d2b Update logging.getLogger() calls to use edx instead of mitx 2013-12-04 15:18:15 -05:00
Calen Pennington
838622f5bd Handle integrity errors when creating/retrieving AnonymousUserId entries 2013-12-04 13:56:53 -05:00
Adam Palay
7171397d95 extend max_length of anonymous_user_id (LMS-1571) 2013-12-04 13:56:53 -05:00
David Baumgold
f3f4af8087 settings.MITX_FEATURES => settings.FEATURES 2013-12-03 15:34:55 -05:00
Ned Batchelder
c8a7b259ff Resolve conflicts merging master to rc/2013-11-21 2013-11-27 11:55:44 -05:00
Jay Zoldak
a56b9457a0 Rebase to re-prepare PR 2013-11-26 17:04:19 -05:00
Jay Zoldak
341875bb18 Remove code related to Pearson Testing Centers 2013-11-26 17:04:19 -05:00
Calen Pennington
1205173d6f Add a per-course anonymous student id 
This does not yet replace the existing per-student anonymous id, but
is intended to do so in the future.

Co-author: Alexander Kryklia <kryklia@edx.org>
Co-author: Ned Batchelder <ned@edx.org>
Co-author: Oleg Marchev <oleg@edx.org>
Co-author: Valera Rozuvan <valera@edx.org>
Co-author: polesye
 2013-11-26 16:29:35 -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
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
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
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
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
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
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
Gabe Mulley
5734cae1c3 emit enrollment event 2013-11-06 08:46:40 -05:00
Julia Hansbrough
1a3f4cb8f8 Moved can_refund logic to CourseEnrollment 2013-11-04 18:48:43 +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
Julia Hansbrough
fcab46b138 Refactored to use signals; full test coverage 2013-11-04 18:38:42 +00:00
Adam Palay
421174980a add UserStanding model 
add migration
 2013-10-16 16:57:06 -04:00
Julian Arni
1a0b752a81 Review fixes 2013-09-24 14:59:07 -04:00
Julian Arni
e5c90d33fc Fix middleware order in CMS. 
And include Don's fix for partial course_id lookup.
 2013-09-23 15:11:06 -04:00
Diana Huang
238a2d53e3 Don't allow people into the verification flow if they've already been verified 2013-09-06 17:20:24 -04:00
Adam Palay
d347390c24 fix error logging for unenrolling if enrollment not found 2013-08-26 09:39:16 -04:00
Jason Bau
6f70c9b9ce Adding migration to store purchased mode in PaidCourseRegistration 2013-08-22 15:39:55 -04:00
David Ormsbee
3ce87583ab Shift enroll/unenroll logic to CourseEnrollment model, add is_active and mode. 
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.
 2013-08-14 13:23:06 -04:00
Miles Steele
aaceb288a7 fix mysql indexing validity in migrations 2013-08-08 10:39:51 -04:00
Brian Wilson
635d36fcf9 Add audit log definition, and use for logging of logins in external_auth and student apps. Move test_login to student app. Improve conditional tests for Shibboleth login logic. (Does not include reconfiguring log settings.) 2013-07-31 13:32:21 -04:00
Calen Pennington
76055aa211 Add a manage.py command that understands the extra edX options 2013-07-24 09:04:12 -04:00
Adam Palay
2b40462263 convert all datetime.now() to datetime.now(UTC) 2013-07-22 17:39:11 -04:00
Don Mitchell
168cb306d3 Move tz_aware into connection config rather than settings. 
Make django use_tz
 2013-06-10 17:16:35 -04:00
Don Mitchell
855433341d Minor code review fixes (removing commented code). 2013-06-10 17:16:34 -04:00
Don Mitchell
d7194e6bec struct_time to datetime conversion. 2013-06-10 17:16:34 -04:00
dcadams
c64f0b1a18 Modifications to instructor dashboard - enrollment tab: 
- Remove single enrollment/unenrollment
- Make unenrollment work with multi-email listbox.
- Provide checkbox for auto-enroll on activate if user not yet signed
up.
- Enroll student when activating if auto-enroll flag set.
 2013-04-29 09:38:10 -07:00
Victor Shnayder
3f18e5c3d7 In sign up form, merge PhD-science and PhD-other, add Associate's degree 
Includes corresponding documentation changes.

Per request from Harvard: LH #276
 2013-03-21 17:23:46 -04:00
Calen Pennington
cfae1cdf62 Pep8 autofixes 2013-02-06 11:13:50 -05:00
jarv
877f757f94 Merge pull request #1369 from MITx/feature/jarv/certificate-restriction 
Feature/jarv/certificate restriction
 2013-01-29 13:14:41 -08:00
Brian Wilson
15a11e9cb7 add validation of accommodation codes 2013-01-29 11:16:23 -05:00
Brian Wilson
69ff879e95 add more validation for countries 2013-01-29 10:41:41 -05:00
Brian Wilson
bae2162fa0 add pearson_dump command. Modify rule for determining authorization transaction type. 2013-01-28 18:29:34 -05:00