Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,212 Commits 1 Branch 0 Tags
3b165da17047b13c696ee319fa8798d20f8cff04
Commit Graph

85 Commits

Author SHA1 Message Date
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
John Jarvis
5d5642673c Add new field to disable certificate download 2013-01-28 12:58:02 -05:00
Victor Shnayder
6847779f22 Merge remote-tracking branch 'origin/master' into feature/victor/cohorts 
Conflicts:
	common/djangoapps/student/models.py
 2013-01-26 12:37:26 -05:00
Victor Shnayder
76c4730532 whitespace 2013-01-25 13:33:25 -05:00
Victor Shnayder
66934ce220 Address Dave's comments on https://github.com/MITx/mitx/pull/1350 2013-01-25 13:33:19 -05:00
Victor Shnayder
3d303518eb Remove old user replication code. 
- we don't use it, and if we do want to change the arch, we should have a proper central user info service.
 2013-01-25 12:51:34 -05:00
Victor Shnayder
c655f62f7a Remove out-of-date text about user replication, askbot 2013-01-24 15:12:51 -05:00
Brian Wilson
740d0403e9 change name of function back to get_testcenter_registration, and disable its use as a test 2013-01-24 09:42:25 -05:00
Brian Wilson
553528cd1c change get_testcenter_registration to get_tc_registration, so it's not treated as a test. 2013-01-24 09:42:25 -05:00
Brian Wilson
d30974b560 Get pearson export working in a unit test 2013-01-24 09:42:24 -05:00
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