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
Brian Wilson
c76f37050a
introduce form to template
2013-01-03 03:22:37 -05:00
Brian Wilson
4abd9cd3d4
get closer to working again
2013-01-02 18:56:25 -05:00
Calen Pennington
0bed19648e
Remove filename and giturl references
2013-01-02 15:08:27 -05:00
Calen Pennington
8991cdd3b5
Stop raising BaseExceptions
2012-12-28 14:51:50 -05:00
Calen Pennington
01411ae66e
WIP: Trying to get tests working
2012-12-28 14:48:47 -05:00
Calen Pennington
c5e3380b71
WIP: Save student state via StudentModule. Inheritance doesn't work
2012-12-28 14:45:46 -05:00
Calen Pennington
cbfc7b201a
WIP more changes to model definitions. Next Up: actually wiring model data into the rdbms
2012-12-28 14:44:31 -05:00
Don Mitchell
ff490599fa
Debugging unit tests
2012-12-26 10:29:35 -05:00
Carlos Andrés Rocha
1ac41787a7
Fix broken display of courses in university profile
2012-12-21 16:38:17 -05:00
David Ormsbee
8532d79ea5
Merge pull request #1198 from MITx/feature/ichuang/update-tracking-log-sql-schema
...
update schema for tracking sql logs - larger fields; add hostname
2012-12-21 12:23:45 -08:00
David Ormsbee
241b4eb0fe
Merge pull request #1196 from MITx/feature/rocha/change-courses-layout
...
New Layout for course listings with new course graphical overlay
2012-12-21 12:18:05 -08:00
ichuang
320f1b4141
update schema for tracking sql logs - larger fields; add hostname
2012-12-21 08:44:40 -05:00
Brian Wilson
2788ad8629
switch back to returning json to test_center_register template, and enable jquery handling in template.
2012-12-21 01:39:18 -05:00
Carlos Andrés Rocha
22de7cbb4e
Add logic to display courses by start date and show the new overlay
2012-12-20 20:05:11 -05:00
Carlos Andrés Rocha
3a4b626e62
Remove unused code from accounts login page
2012-12-20 14:19:06 -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
Carlos Andrés Rocha
5d85fab283
Fix django auth login redirection
...
The django authentication decorator login_required, redirects to
settings.LOGIN_URL. If it is missing, it redirects to /accounts/login.
We did not have the setting enable, not a proper page where to
redirect. This cause users not logged in to see a 404 error when
accessing courseware directly, by using a link or a bookmark.
[#41499213 ]
2012-12-19 18:48:30 -05:00
