Commit Graph

1676 Commits

Author SHA1 Message Date
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
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
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
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
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
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
97fb054449 add export grades to remote gradebook to instructor dashboard 2013-01-10 23:31:46 -05:00
ichuang
200493a54f instructor dashboard upgrade - add enrollment management 2013-01-10 23:31:45 -05:00
Vik Paruchuri
3bf532e199 Check marks in each step 2013-01-10 19:00:03 -05:00
Vik Paruchuri
5150d6cdee Add in better status indicators 2013-01-10 19:00:03 -05:00
Vik Paruchuri
bccafe6c31 Add in correctness display 2013-01-10 19:00:02 -05:00
Vik Paruchuri
af705ca1af Remove html 2013-01-10 19:00:02 -05:00
Vik Paruchuri
943c0ff820 Display results separately from submission logic 2013-01-10 19:00:02 -05:00
Vik Paruchuri
3620fd93d9 Create a result container and put results into it 2013-01-10 19:00:02 -05:00
Vik Paruchuri
24bfe44049 Some restyling, automatically check for feedback, remove reload button 2013-01-10 19:00:02 -05:00
Vik Paruchuri
5273d44788 Fix css and display current step 2013-01-10 19:00:02 -05:00
Vik Paruchuri
a3c1f7c9f4 Feedback submission moved 2013-01-10 19:00:02 -05:00
Vik Paruchuri
f70434970e Make everything look a bit nicer 2013-01-10 19:00:02 -05:00
Vik Paruchuri
9788535416 Get rid of open ended message 2013-01-10 19:00:02 -05:00
Vik Paruchuri
5b0181c925 Status moved to the right 2013-01-10 19:00:02 -05:00
Vik Paruchuri
9a4ee350d7 JS tweaks, move feedback into its own template 2013-01-10 19:00:02 -05:00
Vik Paruchuri
e46ecdb6e2 Move skip button 2013-01-10 19:00:02 -05:00
Vik Paruchuri
8d80fcfb86 Add button to skip post assessment 2013-01-10 19:00:02 -05:00
Vik Paruchuri
d4dd0cd84c Html changes 2013-01-10 19:00:01 -05:00
Vik Paruchuri
ea6945a3fe Collapsible feedback 2013-01-10 19:00:01 -05:00
Vik Paruchuri
d9ea0fcda0 display feedback in status box 2013-01-10 19:00:01 -05:00
Vik Paruchuri
a7c64b8e2d Add collapsible 2013-01-10 19:00:01 -05:00
Vik Paruchuri
b6774ed2e8 Add back check for feedback button. Can always remove later 2013-01-10 19:00:01 -05:00
Vik Paruchuri
792e57ac62 Remove check for feedback button 2013-01-10 19:00:01 -05:00
Vik Paruchuri
146e0919f1 Work on alerts, transitions between pages 2013-01-10 19:00:01 -05:00
Vik Paruchuri
0ec1db8169 Add in a message area 2013-01-10 19:00:01 -05:00
Vik Paruchuri
5e38433494 Add in static data for max score and max attempts 2013-01-10 19:00:01 -05:00
Vik Paruchuri
c6c77c0cde Simple status display 2013-01-10 19:00:01 -05:00
Vik Paruchuri
a06680a23b Move status, remove self assessment format conversion 2013-01-10 19:00:01 -05:00
Vik Paruchuri
d8f6e1fe34 Factor out init modules, add in status display 2013-01-10 19:00:00 -05:00
Vik Paruchuri
e3da5aeb2c Reverse correct and incorrect 2013-01-10 19:00:00 -05:00
Vik Paruchuri
41ba6dde35 Make things looks slightly prettier 2013-01-10 19:00:00 -05:00
Vik Paruchuri
9ba57ad5df Add in correctness display for open ended response 2013-01-10 19:00:00 -05:00