Brian Wilson
cd2a704aec
Merge remote-tracking branch 'origin/master' into feature/brian/pearson-reg
2013-01-15 16:04:05 -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
fb251cacbe
Merge branch 'feature/brian/pearson-reg' of github.com:MITx/mitx into feature/brian/pearson-reg
2013-01-15 15:42:29 -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
Vik Paruchuri
8aa033f601
Add peer and staff grading required display, notifications
2013-01-15 15:40:23 -05:00
Vik Paruchuri
ef2b069409
Add staff grading notifications
2013-01-15 15:34:09 -05:00
Brian Talbot
a4e53d7a7f
pearson registration - restyled and tweaked markup for registration closed message and styled disabled labels appropriately
2013-01-15 14:52:39 -05:00
VikParuchuri
e2f8ce9de6
Merge pull request #1276 from MITx/feature/vik/add-peer-grading-notifications
...
Feature/vik/add peer grading notifications
2013-01-15 11:40:59 -08:00
Vik Paruchuri
301293f8b0
Remove debug statement, fix active page issue on problem page
2013-01-15 14:33:38 -05:00
Vik Paruchuri
7b1262f667
Fix up authentication, other things
2013-01-15 14:31:02 -05:00
Brian Wilson
c8f52deb3d
wire up registration closed functionality
2013-01-15 11:55:36 -05:00
David Ormsbee
36b024ab95
Merge pull request #1203 from MITx/feature/alex/gst-mitx
...
Feature/alex/gst mitx
2013-01-15 08:24:09 -08:00
David Ormsbee
ad261706c8
Merge pull request #1263 from MITx/feature/ichuang/instructor-dashboard-upgrade3
...
Upgrade to instructor dashboard: enrollment, offline grades, remote gradebook
2013-01-15 08:22:19 -08:00
Brian Talbot
e070a926c5
pearson registration - resolving merge conflict
2013-01-15 07:46:49 -05:00
Valera Rozuvan
f2fd649a16
Removed unnecessary XML section. Documenting.
2013-01-15 12:55:13 +02:00
Valera Rozuvan
080e96fdc4
Work in progress on GST.
2013-01-15 12:55:11 +02:00
valera-rozuvan
0913e9ef69
Work on GST.
2013-01-15 12:51:55 +02:00
valera-rozuvan
643ac69a57
Separating JS from the html for GST.
2013-01-15 12:51:55 +02:00
Alexander Kryklia
da4a676513
working xmodule - GsT
2013-01-15 12:51:55 +02:00
Alexander Kryklia
69d0156c36
slider, plot and input contrlos are transferred from xml to html substituted to proper div elements
2013-01-15 12:51:54 +02:00
Alexander Kryklia
169d4b123c
updates
2013-01-15 12:51:54 +02:00
Alexander Kryklia
54c222a015
template for gst
2013-01-15 12:51:54 +02:00
Brian Wilson
9e157b91f0
change urls from xxx_test_registration to xxx_exam_registration.
2013-01-15 00:59:34 -05:00
Brian Talbot
4e83f748b7
pearson registration - revised contact calls to action and order in status section, edited flash message copy/styling, added in strawman state for disabled form/closed registration state of form, added in strawman state for demographics rejected flash message, revised accomodations text labe and isntructions
2013-01-14 17:31:05 -05:00
Vik Paruchuri
4353c4ab05
Clean up some logic
2013-01-14 15:16:06 -05:00
Vik Paruchuri
cc56e47633
Fix active page issue
2013-01-14 15:12:54 -05:00
Vik Paruchuri
4ffa00b400
Add in notifications, peer grading tab, tab image
2013-01-14 15:00:13 -05:00
VikParuchuri
a64111a6e7
Merge pull request #1242 from MITx/feature/vik/integrate-sa-and-oe
...
Feature/vik/integrate sa and oe
2013-01-14 10:06:43 -08:00
Vik Paruchuri
1316728aaa
Minor naming fix
2013-01-14 12:32:31 -05:00
Vik Paruchuri
0e11deffcf
Fix staff and peer grading settings to not fail catastrophically
2013-01-14 12:31:50 -05:00
Vik Paruchuri
a64806656a
Integrate rubric into self assessment
2013-01-14 12:20:27 -05:00
Vik Paruchuri
16f06ae7b7
Fix some minor html
2013-01-14 11:57:09 -05:00
Vik Paruchuri
3e0cf9d234
Make rubric render more nicely
2013-01-14 11:53:23 -05:00
Vik Paruchuri
2b4929562a
Fix up rubric rendering
2013-01-14 10:39:58 -05:00
Vik Paruchuri
0567e8f0aa
Factor out rubric rendering
2013-01-14 10:35:53 -05:00
Brian Wilson
8e059ff934
fix placeholders for phone_country_code values, and subject line of exam_help email.
2013-01-12 00:58:04 -05:00
Vik Paruchuri
682ac3455b
Address some comments from code review, fix rubric display
2013-01-11 15:51:37 -05:00
Vik Paruchuri
9a752f51c7
Fix rubric return, add in score field
2013-01-11 12:48:15 -05:00
Vik Paruchuri
7febe2c2c8
Integrate minimal rubric display
2013-01-11 12:43:57 -05:00
Vik Paruchuri
52164f58ff
Fix self.get call in peer grading service
2013-01-11 11:39:32 -05:00
Brian Talbot
5d40d22136
revised rejected state error message content, markup, and styling on registration's right hand side status area
2013-01-11 09:52:46 -05:00
ichuang
4f869ad382
remove spurious comment
2013-01-11 00:10:52 -05:00
ichuang
b7ad39a0b9
instructor dashboard shouldn't import .grading anymore
2013-01-11 00:09:46 -05:00
ichuang
37f848949d
only is_staff users can add/edit/delete course instructors
2013-01-10 23:32:49 -05:00
ichuang
5cc88ec1ad
example course_id for compute_grades management command
2013-01-10 23:32:48 -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
ec94f7328c
remove try...except workaround for circular import bug fixed by https://github.com/MITx/mitx/issues/1260
2013-01-10 23:32:48 -05:00
ichuang
e5c958082b
list/add/delete instructors on instructor dashboard
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
82e31d533b
Hookup CourseEnrollmentAllowed to lms/djangoapps/courseware/access.py
2013-01-10 23:31:46 -05:00
