Commit Graph

401 Commits

Author SHA1 Message Date
Victor Shnayder
0e78eaaf80 Add a course_groups djangoapp with a CourseUserGroup model. 2013-01-24 15:12:52 -05:00
Victor Shnayder
c655f62f7a Remove out-of-date text about user replication, askbot 2013-01-24 15:12:51 -05:00
Brian Wilson
9d28c37724 add more test coverage for openid provider. 2013-01-23 04:23:30 -05:00
Brian Wilson
ba62a657bf Merge remote-tracking branch 'origin/master' into bugfix/brian/openid_provider_post 2013-01-22 23:50:38 -05:00
Don Mitchell
1f261e6556 Removed unused and stylistically incorrect class defs 2013-01-22 17:34:45 -05:00
Don Mitchell
edda80d485 New style base python classes and basestring type. 2013-01-22 11:30:24 -05:00
Brian Wilson
9653631e9a Add initial openid_provider tests (covers xrds and authentication requests) 2013-01-22 11:15:30 -05:00
Brian Wilson
6da9c7bd9a get (openId) provider_login to work with POST requests 2013-01-18 18:37:24 -05:00
Chris Dodge
550e805b74 Merge branch 'master' into feature/cdodge/cms-master-merge4
Conflicts:
	common/lib/xmodule/xmodule/course_module.py
2013-01-18 15:44:41 -05:00
Carlos Andrés Rocha
ef69b738c9 Sort courses announcement date
If there is no announcement date (in the policy metadata) then use a
heuristic to sort them.

If there is an announcement date, the use it in the heuristic to
determine if the course is new or not.
2013-01-17 21:46:58 -05:00
Chris Dodge
44cfcb88a3 Merge branch 'master' into feature/cdodge/cms-master-merge4 2013-01-17 20:30:22 -05:00
Brian Wilson
80b2f45ac5 move pearson_import to another branch 2013-01-17 10:14:55 -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
4a59125bf9 add pearson import confirmation tool 2013-01-16 17:51:31 -05:00
Brian Wilson
fea6feb04f Strip whitespace off of registration demographics before validation 2013-01-16 17:39:33 -05:00
Brian Wilson
e68e612ee1 Return 404 in begin_exam_registration when course or exam are not valid 2013-01-16 16:40:28 -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
David Ormsbee
5d66490065 Add a try/catch so that Askbot removal doesn't die if there's no Askbot to remove from auth_user 2013-01-16 12:15:23 -05:00
cahrens
07d6bee5a7 storing work 2013-01-16 09:53:28 -05:00
Brian Wilson
cc31c79517 fixes for first round of code review 2013-01-15 18:15:54 -05:00
cahrens
9818664bb1 storing work 2013-01-15 16:04:34 -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
9e157b91f0 change urls from xxx_test_registration to xxx_exam_registration. 2013-01-15 00:59:34 -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
Chris Dodge
08adf9c0d5 Merge branch 'master' into feature/cdodge/cms-master-merge3
Conflicts:
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/search.py
	common/lib/xmodule/xmodule/modulestore/xml.py
	doc/development.md
	lms/envs/common.py
2013-01-11 14:04:46 -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
16b91cf732 remove spurious old migration file 2013-01-10 23:32:48 -05:00
ichuang
04d6f08c0c add offline grade computation & DB table for this 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
Carlos Andrés Rocha
8f21d7a738 Add property to course module to check if a course is new
The property can be set in the policy metadata. If it is not specified
then it is set to true if the course has not started yet.

Also adds a property to check how many days are left until the course starts.
2013-01-10 15:57:29 -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
83fdab79ba pearson_make_tc_user: add support for incremental changes, and changes to 'internal' fields for debugging. 2013-01-10 15:16:13 -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
Chris Dodge
3b5e17ef55 Merge branch 'master' into feature/cdodge/cms-master-merge2
Conflicts:
	.gitmodules
	common/djangoapps/__init__.py
	common/djangoapps/track/migrations/__init__.py
	common/lib/capa/capa/inputtypes.py
	common/lib/capa/capa/responsetypes.py
	common/lib/capa/capa/templates/openendedinput.html
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/video_module.py
	common/static/sass/bourbon/css3/_box-sizing.scss
	doc/development.md
	lms/djangoapps/instructor/tests.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/templates/video.html
	requirements.txt
	test-requirements.txt
2013-01-07 12:34:48 -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
e70db062b2 Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge
Conflicts:
	requirements.txt
2013-01-03 10:46:24 -05:00
Chris Dodge
7229a9cdaf perform a new merge from master, resolve conflicts 2013-01-03 10:43:03 -05:00