Jason Bau
3f9c52cd1c
Move shopping cart from session into model/db
2013-08-22 15:39:54 -04:00
Jason Bau
988a7a1fba
initial commit of shopping cart and cybersource integration
2013-08-22 15:39:54 -04:00
David Ormsbee
91fab4579b
Merge branch 'diana/verified-certs-payment' into ormsbee/verifyuser_func
...
Conflicts:
common/djangoapps/course_modes/models.py
lms/envs/common.py
lms/envs/dev.py
2013-08-22 14:57:34 -04:00
David Ormsbee
0dd5819683
basic flow from enroll mode selection to verify screen
2013-08-22 13:56:23 -04:00
David Ormsbee
1676fc31a5
Halfway state for course enrollment by mode
2013-08-21 16:21:53 -04:00
John Jarvis
6ba85765e7
pep8
2013-08-21 15:15:13 -04:00
John Jarvis
ca24d2ab40
adding certificate info to the grade dump
2013-08-21 15:14:02 -04:00
Jason Bau
efbb439cb5
Adding migration to store purchased mode in PaidCourseRegistration
2013-08-21 13:14:22 -04:00
Jason Bau
ed4e7f54c7
Move shopping cart from session into model/db
2013-08-21 13:14:21 -04:00
Jason Bau
b7d73933b7
initial commit of shopping cart and cybersource integration
2013-08-21 13:14:20 -04:00
chrisndodge
594a73d437
Merge pull request #722 from edx/feature/cdodge/add-a-mixed-modulestore
...
Feature/cdodge/add a mixed modulestore
2013-08-17 07:32:51 -07:00
James Tauber
b985722255
fixed encoding
...
xgettext seems to only like `utf-8` not `utf8` so string extraction
was failing without this
2013-08-16 13:52:07 -04:00
Chris Dodge
7bdc4c5134
fix errant conflict resolution
2013-08-15 22:58:03 -04:00
Chris Dodge
54bd3170bc
remove another debug logging message
2013-08-15 22:58:03 -04:00
Chris Dodge
cff93d324b
WIP
2013-08-15 22:58:02 -04:00
John Jarvis
4c469cc414
Merge pull request #666 from edx/jarv/add-get-grades
...
adding django-admin commands to dump grades to a csv file
2013-08-14 11:42:51 -07:00
John Jarvis
7dc7406d3c
updating help for --course
2013-08-14 14:42:24 -04:00
David Ormsbee
57a8063517
Merge pull request #651 from edx/ormsbee/enrollment_modes
...
Add mode and is_active to CourseEnrollment, shift enrollment logic to model
2013-08-14 10:45:27 -07: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
Joe Blaylock
d6530fa633
Anonymized ID mapping fixups
...
Fixups to Nate's anonymized id mapper, repairing pep8 and pylint errors,
and rebasing on recent master.
2013-08-13 11:39:50 -07:00
Nate Hardison
e4994b15cd
Add mgmt cmd to generate anonymized ID mapping
...
So that instructors have easy access to the mapping from anonymized
IDs (a simple MD5 hash of the user ID that's used when integrating
with third-party services like Qualtrics) to user IDs, we have a
simple Django management command to generate a CSV mapping. To run,
use the following:
rake django-admin[anonymized_id_mapping,<system>,<env>,<course_id>]
And, of course, substitute the appropriate values for <system>, <env>,
and <course_id>. (E.g., lms, dev, and MITx/6.002x/Circuits)
2013-08-13 11:10:05 -07:00
John Jarvis
d0a64f2c2a
adding django-admin commands to dump grades to a csv file
2013-08-13 13:29:48 -04:00
Adam Palay
f9ab433e26
add settings.PLATFORM_NAME to password_reset_confirm context
2013-08-12 17:58:31 -04:00
Miles Steele
6cf8643da5
Merge pull request #545 from edx/feature/msteele/fix-sql-index
...
Fix mysql indexing validity in migrations
2013-08-12 06:29:43 -07:00
Jay Zoldak
e78edf8ef9
Rename MITX_SETTING AUTOMATIC_AUTH_FOR_LOAD_TESTING -> AUTOMATIC_AUTH_FOR_TESTING because it will be used for acceptance testing also.
2013-08-08 12:08:25 -04:00
Jay Zoldak
385e9de1fd
Modify auto_auth to accept parameters for overriding created user attributes.
2013-08-08 12:08:24 -04:00
Miles Steele
090f8d812f
add migration to remove index
2013-08-08 10:39:51 -04:00
Miles Steele
aaceb288a7
fix mysql indexing validity in migrations
2013-08-08 10:39:51 -04:00
cahrens
3732d418c9
Add helper methods to hide internals of how users are enrolled in courses.
...
Remove _
Minor cleanup.
2013-08-06 09:36:39 -04:00
Diana Huang
c867be7961
Limit the rate of logins.
2013-08-02 11:23:59 -04:00
brianhw
a628b62d1e
Merge pull request #511 from edx/feature/brian/audit-log
...
Use audit logger for logging of logins in external_auth...
2013-08-01 14:08:08 -07:00
Calen Pennington
e8ee29786f
Remove news carousel and other unused pages
...
Remove unused course_filter page
removes university_profile urls and templates
removes all university_profile views
remove news from templates/index
2013-07-31 19:39:15 -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
ihoover
aad6dc4345
Merge pull request #417 from edx/ihoover/feature_flag_auto_auth
...
Ihoover/feature flag auto auth
2013-07-25 08:11:22 -07:00
ihoover
56883d65a1
csrf test fix
...
remove test that csrf middleware is disabled (since we can't seem to reload middleware between tests)
move definitions from setuo into test method
2013-07-24 17:08:18 -04:00
Calen Pennington
76055aa211
Add a manage.py command that understands the extra edX options
2013-07-24 09:04:12 -04:00
ihoover
402ae4d8bd
added csrf tests
2013-07-23 17:32:21 -04:00
ihoover
4148c00cc4
resolve conflicts
2013-07-23 16:26:11 -04:00
Jay Zoldak
ea31b17d57
Fix up auto auth tests.
2013-07-23 16:22:51 -04:00
Adam Palay
2b40462263
convert all datetime.now() to datetime.now(UTC)
2013-07-22 17:39:11 -04:00
Adam Palay
b744aaa360
make sure parsed times are set to UTC
2013-07-22 17:39:11 -04:00
ihoover
18352e9f20
comment tweaks
2013-07-20 16:20:32 -04:00
ihoover
d7de09442e
tweaks
2013-07-20 16:14:41 -04:00
ihoover
967ef6ff94
tests added
2013-07-20 13:01:37 -04:00
ihoover
b42eacaa8f
moved MAX_AUTO_AUTH_USERS to ENV_TOKENS
2013-07-17 10:00:24 -04:00
ihoover
ee4bc424ce
remove depracated feature flag GENERATE_RANDOM_USER_CREDENTIALS
2013-07-17 09:12:07 -04:00
ihoover
ceacc3b4b5
moved auto_auth view to students.view and fixed flag conflicts
2013-07-16 17:43:32 -04:00
ihoover
e5f44165f8
Made activation flag and ENV_TOKEN
2013-07-16 15:29:38 -04:00
ihoover
9eb1cce352
maximum number of random users
2013-07-16 14:05:41 -04:00
David Baumgold
a6f349dab9
Studio i18n
2013-07-12 16:25:39 -04:00
