David Ormsbee
d5bff2e28c
Merge pull request #814 from edx/bugfix/ichuang/make-edit-link-use-static-asset-path
...
fix: make edit link use static_asset_path in xmodule_modifiers.py
2013-12-10 13:58:13 -08:00
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
David Baumgold
fb13bed947
Updating comments and docs for MITx -> edX transition
2013-12-10 13:21:18 -05:00
Sarina Canelake
b406ba0f83
Acceptance tests for grades download
...
Refactor instructor dash acceptance tests.
Add additional acceptance tests for buttons on 'Data Download' tab.
LMS-58
2013-12-09 18:28:41 -05:00
Sarina Canelake
c547ac7286
Fix bulk email acceptance test
2013-12-09 18:28:41 -05:00
David Baumgold
2666b96976
Change mitx.db to edx.db for dev sqlite
2013-12-06 11:21:19 -05:00
David Baumgold
effee03bd7
Merge pull request #1867 from edx/db/update-factory-boy
...
Update factory_boy to 2.2.1
2013-12-05 13:22:22 -08:00
David Baumgold
d15391fdfa
Update factory_boy to 2.2.1
2013-12-05 15:50:49 -05:00
Ned Batchelder
1cbc171616
Merge master in prep for merging back the hotfix changes.
2013-12-05 15:48:49 -05:00
Ned Batchelder
be3ab1c5e9
Drop the temp table
2013-12-05 14:56:30 -05:00
Ned Batchelder
108e02e1ed
Remove the one-time-use managemant command.
2013-12-05 14:41:30 -05:00
Julia Hansbrough
83f42f5691
Response to CR
2013-12-05 19:14:45 +00: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
Greg Price
88610cb8fb
Change forum role granted to staff on enrollment
...
This applies to global staff (is_staff=True), not course staff.
Previously, staff were granted the Moderator role but not the Student
role upon enrolling in a course. If the Moderator role were later
revoked, then the user would have no role and be unable to post in the
forums, which is confusing for the user. edX staff indicated they would
prefer to not automatically receive the Moderator role, so the Student
role is granted instead. Note that staff will still be able to grant
themselves Moderator privileges through the instructor dashboard if
they wish.
JIRA: FOR-338
2013-12-05 12:54:12 -05:00
Calen Pennington
e561c1354d
Add managemant command to generate sql to clean up tp truncated student ids in ORA db
2013-12-04 16:18:40 -05:00
Adam Palay
4d506016e7
Add a backwards migration to delete the archive table
2013-12-04 16:07:43 -05: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
b32f2bc170
MITX_ROOT_URL => EDX_ROOT_URL
2013-12-04 12:59:35 -05:00
David Baumgold
f3f4af8087
settings.MITX_FEATURES => settings.FEATURES
2013-12-03 15:34:55 -05:00
David Baumgold
69899e24df
Merge pull request #1823 from edx/db/mitxmako-edxmako
...
mitxmako => edxmako
2013-12-03 11:36:50 -08:00
David Baumgold
8eff442752
mitxmako => edxmako
2013-12-03 14:15:09 -05:00
brianhw
c8adbe3895
Merge pull request #1182 from carsongee/add_mitx_ssl_bypass_signup
...
Add feature to do auto signup with external auth
2013-12-03 07:03:43 -08:00
Ned Batchelder
c8a7b259ff
Resolve conflicts merging master to rc/2013-11-21
2013-11-27 11:55:44 -05:00
Jay Zoldak
6614d7e9bb
Add migration to remove pearson tables
2013-11-26 17:04:19 -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
Don Mitchell
7f91ce40ae
Restful api for course advanced settings
...
STUD-948
2013-11-26 10:17:52 -05:00
Carson Gee
3ad705cd16
Removing external_auth addition to cms, and skipping test
2013-11-25 17:08:18 -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
Carson Gee
bf9ac26a06
Corrected CMS tests so that one is passing, added external_auth to cms apps
...
Several pylint fixes and bad super call
2013-11-25 15:30:36 -05:00
Ned Batchelder
9a106a32d5
Merged master to rc/2013-11-21
2013-11-25 14:56:09 -05:00
Carson Gee
96c7cb5ffd
Added tests for signup skipping
2013-11-25 13:06:28 -05:00
Carson Gee
0f324baaca
Fixed PEP8 and indentation issues
2013-11-25 11:16:06 -05:00
Carson Gee
5d066db1bf
Add feature to do auto signup with external auth
...
This adds a feature flag: AUTH_USE_MIT_CERTIFICATES_IMMEDIATE_SIGNUP
that does an automatic signup of users if they are using external authentcation.
2013-11-25 11:16:06 -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
