Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

6923 Commits

Author SHA1 Message Date
Diana Huang
48be0b15a1 Clean up on staff grading code path and 
the beginnings of peer grading.
 2013-01-15 11:21:10 -05: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
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
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
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
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
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