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
Vik Paruchuri
be3d8cbb86
Fix small issue with graded callback
2013-01-14 18:00:53 -05:00
Vik Paruchuri
78a94a4e20
Fix naming bug
2013-01-14 17:50:20 -05:00
Vik Paruchuri
6f9c0a7d72
Minor fix for when grade is ready to submit
2013-01-14 17:47:44 -05:00
Vik Paruchuri
e748d59d78
Bug fixes
2013-01-14 17:42:21 -05:00
Vik Paruchuri
e5c6414d39
Adding score selection back into staff grading view
2013-01-14 17:35:41 -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
50f951d9df
Bug fixes
2013-01-14 17:14:55 -05:00
Vik Paruchuri
6427a7dac5
Rubric html change
2013-01-14 16:03:53 -05:00
Vik Paruchuri
f5600c2b8a
Make things more robust, ensure that a rubric is specified properly before combined open ended module will render
2013-01-14 15:42:38 -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
Diana Huang
79c8efcb68
Update the rubric renderer
2013-01-14 15:02:24 -05:00
Vik Paruchuri
4ffa00b400
Add in notifications, peer grading tab, tab image
2013-01-14 15:00:13 -05:00
Diana Huang
bb867ba3b4
Use the new CombinedOpenEndedRubric class for everything
...
related to rubric rendering. Remove the old input type.
2013-01-14 14:46:44 -05:00
Carlos Andrés Rocha
2f99d38e90
Update FAQ page: new content and styling
2013-01-14 14:17:39 -05:00
Diana Huang
ae65bb0332
Merge branch 'master' into feature/diana/rubric-input
...
Conflicts:
common/lib/capa/capa/inputtypes.py
2013-01-14 13:40:45 -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
Calen Pennington
fc2d5c43f1
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
...
Conflicts:
lms/envs/aws.py
2013-01-14 12:51:19 -05: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
Diana Huang
1680336da6
Fix some minor bugs in the staff grading interface
2013-01-14 10:22:22 -05:00
Diana Huang
a0c0005e95
Updates to the javascript and the grading controller
...
to handle rubric input
2013-01-14 08:58:33 -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
Diana Huang
f3e8d01e08
Pull out old rubric and score selection logic
...
and set up the new rubric
2013-01-11 17:29:39 -05:00
jmvt
d230c1b03c
Added example of geographic student distribution over world map.
2013-01-11 17:14:29 -05:00
Vik Paruchuri
682ac3455b
Address some comments from code review, fix rubric display
2013-01-11 15:51:37 -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
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
chrisndodge
5368a9ad3e
Merge pull request #1252 from MITx/feature/cale/lms-mongo-perf
...
Decrease the number of queries needed for LMS courseware
2013-01-11 07:23:00 -08: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
