Chris Dodge
44cfcb88a3
Merge branch 'master' into feature/cdodge/cms-master-merge4
2013-01-17 20:30:22 -05:00
Chris Dodge
22695d80c7
Merge branch 'master' into feature/cdodge/cms-master-merge4
...
Conflicts:
common/djangoapps/student/models.py
common/lib/capa/capa/responsetypes.py
common/lib/xmodule/setup.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/xml_module.py
jenkins/test.sh
lms/djangoapps/courseware/access.py
lms/djangoapps/courseware/tests/tests.py
lms/djangoapps/django_comment_client/models.py
requirements.txt
2013-01-17 09:15:37 -05:00
Brian Wilson
1de67be788
clear upload_status if user makes changes to TestCenterUser or TestCenterRegistration (so the change is pending, rather than rejected)
2013-01-16 15:43:15 -05:00
Brian Wilson
1d6b1be888
fix missing indirection in log message
2013-01-16 14:30:30 -05:00
Brian Wilson
cc31c79517
fixes for first round of code review
2013-01-15 18:15:54 -05:00
Brian Wilson
ef0f973ca4
display client_candidate_id when registration accepted; strip whitespace from accommodation_request; cosmetic cleanup on pearson management commands.
2013-01-15 16:00:10 -05:00
Brian Wilson
32b2d1b97f
Perform merge from master, including renumbering of migrations in common/djangoapps/student/migrations
2013-01-15 15:42:09 -05:00
David Ormsbee
66ffef131d
Merge branch 'master' into cale/circular-import-fix
...
Conflicts:
common/djangoapps/student/models.py
2013-01-15 11:35:19 -05:00
Brian Wilson
96da4ac55e
Add some log statements. Add missing fields to _make_tc_user, and make _make_tc_registration independent of course configuration (for testing)
2013-01-14 16:27:28 -05:00
Brian Wilson
3d0384692c
add pearson_make_tc_registration command
2013-01-11 17:50:02 -05:00
Calen Pennington
5dd83e4d5f
Remove import
2013-01-11 11:10:51 -05:00
Calen Pennington
9853c6323f
Remove circular dependencies that connect student.models and django_comment_client
...
Includes removal of "from django_comment_client.models import Role" from common/djangoapps/student/models.py
Conflicts:
common/djangoapps/student/models.py
2013-01-10 23:32:48 -05:00
ichuang
200493a54f
instructor dashboard upgrade - add enrollment management
2013-01-10 23:31:45 -05:00
Brian Wilson
7d279efd0e
add functionality for exporting EAD files to Pearson (and add dump_all option to CDD-dumping).
2013-01-10 18:31:41 -05:00
Calen Pennington
a74dfdb2e7
Remove circular dependencies that connect student.models and django_comment_client
2013-01-10 15:19:38 -05:00
Brian Wilson
468d703b57
Update CDD export to output only changed records.
2013-01-09 18:08:05 -05:00
Brian Wilson
cc8e8ba6c6
Pearson reg: relax validation of phone country codes.
2013-01-09 13:31:04 -05:00
Brian Wilson
8ad9bc5949
Move Pearson URL to settings. Fix Register button. Other small changes.
2013-01-09 11:26:54 -05:00
Brian Wilson
a5cce4769e
add accommodation listing, and revise error messages
2013-01-09 02:14:02 -05:00
Brian Wilson
25f08374ca
hook up more registration status boxes
2013-01-08 17:42:15 -05:00
Brian Wilson
e57656e24f
Add TestCenterExam class to course module, and plumb through.
2013-01-06 17:57:13 -05:00
Brian Wilson
ea8a56da0a
add id generation and validation
2013-01-04 18:45:46 -05:00
Brian Wilson
e32dfcf0a0
get display of validation errors to work.
2013-01-04 01:39:40 -05:00
Brian Wilson
c5cc15a92a
return json, and add validation errors. Start displaying field with error.
2013-01-03 18:51:26 -05:00
Chris Dodge
7229a9cdaf
perform a new merge from master, resolve conflicts
2013-01-03 10:43:03 -05:00
Brian Wilson
4abd9cd3d4
get closer to working again
2013-01-02 18:56:25 -05:00
Brian Wilson
d5bd2313c1
fix migrations, removing one field and making another nullable. Update registration page to allow for editing only demographics.
2012-12-20 04:16:00 -05:00
Brian Wilson
ee99080687
add additional fields to testcenter user and update test center registration.
2012-12-19 16:53:13 -05:00
Brian Wilson
f472ac60f5
minor tweaks to test center registration
2012-12-19 00:21:49 -05:00
Brian Wilson
f912ffe8a2
add persistence of testcenter_user registration
2012-12-18 18:31:41 -05:00
Victor Shnayder
052807d7f6
Change the unique student id calculation to match the id we send to xqueue
...
- can't change the xqueue one because there's data that uses it
- we checked, and no one has sent out survey links that use the old sha1() format
doing this because we'll need the LMS to be able to send the anon student id to backend services e.g. for peer grading, and passing two different anon student ids to xmodule (one for xqueue, one for other uses) is just asking for confusion.
2012-11-30 11:30:02 -05:00
Victor Shnayder
d1eec9bcf4
add a salt. using user.id since that's handy.
2012-11-19 11:34:31 -05:00
Victor Shnayder
71b585bb61
move unique_id_for_user into student/models.py
2012-11-17 16:33:00 -05:00
David Ormsbee
156dc1fb6c
Merge branch 'master' into feature/victor/actual-askbot-removal
...
Conflicts:
lms/envs/aws.py
2012-11-15 14:24:55 -05:00
David Ormsbee
ad93f70e65
Re-add TestCenterUser along with a basic command to make an entry for a given user already in the system.
2012-11-07 09:24:38 -05:00
Victor Shnayder
793354a0dc
remove (almost) all references to askbot.
2012-10-30 18:23:07 -04:00
David Ormsbee
e4ffb2a514
Add TestCenterUser model and export for Pearson
2012-10-24 11:15:14 -04:00
Victor Shnayder
8b7390c966
Turn of discussion service in test env
...
- add a check for the feature flag before trying to save user info to the service
2012-09-06 17:11:21 -04:00
ichuang
258274f2a7
add string to model class unicode
2012-09-04 10:25:28 -04:00
ichuang
9e8ec09b4d
pep8 fixes
2012-09-02 20:15:57 -04:00
ichuang
2efe481237
move instructor dashboard into its own lms djangoapp; add new
...
functionality - grade dump and download as csv, manage staff list,
force reload of course from xml
2012-09-02 19:05:34 -04:00
Arjun Singh
ed6317f37c
getting rid of terrible hack in favor of re enabling the dispatcher to sync w/ the comment service
2012-08-23 10:03:36 -07:00
Arjun Singh
7f3a4889b8
make discussions work for new users
2012-08-23 06:48:37 -07:00
David Ormsbee
783a3905a4
disable user replication and associated tests
2012-08-21 11:39:36 -04:00
Rocky Duan
028bd23c1c
Merge branch 'master' of github.com:MITx/mitx into profile
...
Conflicts:
lms/djangoapps/courseware/module_render.py
lms/djangoapps/courseware/views.py
lms/templates/course_navigation.html
2012-08-18 16:57:00 -07:00
David Ormsbee
61108c27cb
When replicating CourseEnrollment, make sure Users were created in all DBs before replicating other models
2012-08-16 19:12:57 -04:00
Rocky Duan
50e95de9ef
a place to start for the user profiel & fixed some bugs
2012-08-14 15:04:36 -07:00
Rocky Duan
eb47093b1c
Merge branch 'master' of github.com:MITx/mitx into merge
...
Conflicts:
common/djangoapps/student/models.py
lms/djangoapps/courseware/views.py
lms/templates/course_navigation.html
2012-08-14 12:54:43 -07:00
David Ormsbee
a25f289ca7
re-enable User save signal handler
2012-08-13 13:16:33 -04:00
David Ormsbee
301695a5c4
Remove outdated comment
2012-08-13 13:11:27 -04:00
