Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
10,188 Commits 1 Branch 0 Tags
826b070bfa047f94de6d14d43eaa9b598000d9ff
Commit Graph

3122 Commits

Author SHA1 Message Date
Diana Huang
90c39d51ee Fix wrong order in the text 2013-01-14 10:39:20 -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
Vik Paruchuri
c7339ee664 Minor bug fix 2013-01-14 10:16:57 -05:00
Brian Talbot
1cf5e10a34 revised cheatsheet markdown, fixed height + added vertical scroll, and replaced explanation example in sheet 2013-01-13 12:47:30 -05:00
Brian Talbot
04e9447367 added in icons for header and explanation markdown elements 2013-01-13 12:15:29 -05:00
Brian Wilson
3d0384692c add pearson_make_tc_registration command 2013-01-11 17:50:02 -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
Don Mitchell
033264b58d Change case of Explanation to match markdown (although it's functionally 
equivalent)
 2013-01-11 16:57:00 -05:00
Don Mitchell
7d8276b6c5 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-11 16:52:10 -05:00
cahrens
a4b6851e6c Remove some dead css. 2013-01-11 16:11:09 -05:00
Vik Paruchuri
7d0bb7b3fe Minor string to boolean fix 2013-01-11 16:02:09 -05:00
Vik Paruchuri
682ac3455b Address some comments from code review, fix rubric display 2013-01-11 15:51:37 -05:00
Don Mitchell
ab7be1a6e0 Unit tests 2013-01-11 15:22:30 -05:00
Don Mitchell
5920142f71 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-11 15:05:30 -05:00
Don Mitchell
755bf709a5 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-11 14:44:38 -05:00
Chris Dodge
9479ef3c84 fix up call signatures for get_parent_locations() 2013-01-11 14:29:53 -05:00
Brian Talbot
7d445f5630 studio - tweaking problem editor's advanced editor toggle control UI and prompt message 2013-01-11 14:25:22 -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
Chris Dodge
476e6c7b3b need to add the depth parameter to the DraftMongoStore implementation of get_instance 2013-01-11 11:57:41 -05:00
Calen Pennington
5dd83e4d5f Remove import 2013-01-11 11:10:51 -05:00
Don Mitchell
64507bd5fd Drop down for markup done but w/o new icons 2013-01-11 10:36:42 -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
Vik Paruchuri
1dca370a7f Better initial documentation of combined open ended 2013-01-11 09:50:43 -05:00
Vik Paruchuri
bcbf65e2b9 Code reformat, line length fix, change text names to variables 2013-01-11 09:45:10 -05:00
Don Mitchell
e095a139b9 Cheat sheet updated for header and explanation. Video removed. 2013-01-11 09:36:29 -05:00
Diana Huang
5a211f566d Make the rubric smaller so that we can accomodate more columns. 2013-01-11 09:31:38 -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
Vik Paruchuri
8dbbb021a7 Change value passing to hidden input type 2013-01-10 19:00:04 -05:00
Vik Paruchuri
c76786ae4e Roll back hidden input changes 2013-01-10 19:00:04 -05:00
Vik Paruchuri
ee2990da4f Change hidden div to input name 2013-01-10 19:00:04 -05:00
Vik Paruchuri
e4568c3a20 Use include clearfix in css 2013-01-10 19:00:04 -05:00
Vik Paruchuri
b0d3bcc516 Fix feedback response for peer grading so that students can respond to multiple feedback items 2013-01-10 19:00:04 -05:00
Vik Paruchuri
f4968e1e8e Fix spacing error 2013-01-10 19:00:04 -05:00
Vik Paruchuri
cb203a6f55 Better error messages 2013-01-10 19:00:04 -05:00
Vik Paruchuri
62e9387095 Fix score passing from controller 2013-01-10 19:00:04 -05:00
Vik Paruchuri
742d9475c7 Parse int from score 2013-01-10 19:00:04 -05:00
Vik Paruchuri
c4b1c8d074 Correct peer grading score parsing 2013-01-10 19:00:04 -05:00
Vik Paruchuri
c267efb400 Add in a comment 2013-01-10 19:00:03 -05:00
Vik Paruchuri
5a3a537c1b Support formatting of peer grading feedback 2013-01-10 19:00:03 -05:00
Vik Paruchuri
4a2875ccdd Document open ended child 2013-01-10 19:00:03 -05:00
Vik Paruchuri
f858dce753 Document self assessment 2013-01-10 19:00:03 -05:00
Vik Paruchuri
5303086a10 Start commenting open ended module 2013-01-10 19:00:03 -05:00
Vik Paruchuri
134c3f3db0 Document open ended descriptor 2013-01-10 19:00:03 -05:00
Vik Paruchuri
2f841c8a33 Document combined open ended module 2013-01-10 19:00:03 -05:00