Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,636 Commits 1 Branch 0 Tags
a4196ffa00a98684d8f77e81d0ca7477e90a4bb9
Commit Graph

506 Commits

Author SHA1 Message Date
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
Chris Dodge
3b5e17ef55 Merge branch 'master' into feature/cdodge/cms-master-merge2 
Conflicts:
	.gitmodules
	common/djangoapps/__init__.py
	common/djangoapps/track/migrations/__init__.py
	common/lib/capa/capa/inputtypes.py
	common/lib/capa/capa/responsetypes.py
	common/lib/capa/capa/templates/openendedinput.html
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/video_module.py
	common/static/sass/bourbon/css3/_box-sizing.scss
	doc/development.md
	lms/djangoapps/instructor/tests.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/templates/video.html
	requirements.txt
	test-requirements.txt
 2013-01-07 12:34:48 -05:00
ichuang
c555bf5a8d fix capa to add contextualize_text for optionresponse and multiplechoice 2013-01-03 22:57:24 -05:00
Vik Paruchuri
b01666f6d6 Fix error messages 2013-01-03 11:52:35 -05:00
Vik Paruchuri
5567477c67 Pass through initial display and answer 2013-01-03 11:52:35 -05:00
Vik Paruchuri
0c3eb67d5c More descriptive error message 2013-01-03 11:52:35 -05:00
Vik Paruchuri
cce6b70103 Fixes to log entire state on errors, format feedback better 2013-01-03 11:52:05 -05:00
Vik Paruchuri
68f0f7e0a8 Handle unicode feedback 2013-01-03 11:50:57 -05:00
Vik Paruchuri
a4eb76017b Display max score as well as score 2013-01-03 11:50:57 -05:00
Vik Paruchuri
9559c7b426 Patch "correct" answer display 2013-01-03 11:50:57 -05:00
Vik Paruchuri
37af39ef8d Change names 2013-01-03 11:50:57 -05:00
Vik Paruchuri
2c469cad75 Wire in submit message 2013-01-03 11:49:01 -05:00
Vik Paruchuri
1ac75b9420 Add in message passing pipeline 2013-01-03 11:47:41 -05:00
Diana Huang
09ed3d12a2 Hook up the backend into the new feedback response for scores 2013-01-03 11:40:41 -05:00
Diana Huang
8f4efb0456 Hook up new radio buttons to the Javascript 2013-01-03 11:40:41 -05:00
Diana Huang
69ae1cc268 Clean up the styling and make the evaluation parts collapsible. 2013-01-03 11:40:41 -05:00
Diana Huang
54c541de45 Fix up the feedback-on-feedback styling and add radio button score selection. 2013-01-03 11:40:41 -05:00
Vik Paruchuri
fa97187a31 Patch naming issue 2013-01-03 11:40:41 -05:00
Vik Paruchuri
b06ce84afd Wire in submit message 2013-01-03 11:40:41 -05:00
Vik Paruchuri
b71233fd50 Add in message passing pipeline 2013-01-03 11:40:41 -05:00
Vik Paruchuri
ce3b84d0e5 Message passing in lms 2013-01-03 11:40:41 -05:00
Vik Paruchuri
b782f712b9 Add in more js to handle student feedback 2013-01-03 11:40:41 -05:00
Vik Paruchuri
634b586085 Integrate new ajax action 2013-01-03 11:40:41 -05:00
Vik Paruchuri
d663d23257 Work on adding in a new ajax post type 2013-01-03 11:40:41 -05:00
Chris Dodge
e70db062b2 Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge 
Conflicts:
	requirements.txt
 2013-01-03 10:46:24 -05:00
Chris Dodge
7229a9cdaf perform a new merge from master, resolve conflicts 2013-01-03 10:43:03 -05:00
Jay Zoldak
cc54c37359 Exclude settings.py files from coverage reports and configure titles for the reports. 2012-12-17 15:00:11 -05:00
cahrens
dd7ed956dd Bug fix for Studio #55. 2012-12-14 11:37:45 -05:00
Diana Huang
3b805fac1a Merge pull request #1123 from MITx/bugfix/victor/open-ended-parsing 
Fix for issues in open ended parsing
 2012-12-11 10:24:53 -08:00
Vik Paruchuri
b4fffc798c Fix for issues in open ended parsing 2012-12-11 13:14:34 -05:00
Victor Shnayder
df578de11f Merge pull request #1119 from MITx/diana/open-ended-response-styling 
Updates to the styling of open ended problems
 2012-12-10 11:36:04 -08:00
Vik Paruchuri
ab84042435 Fix raised error 2012-12-10 14:24:00 -05:00
Diana Huang
7279d11cf2 Add a reload button to open-ended input problems 2012-12-10 14:16:00 -05:00
Victor Shnayder
ed1f4bdd85 Check for none. 2012-12-10 14:10:19 -05:00
Diana Huang
cc72870aac Make oepn-ended responses and self-assessment answers use 
the same CSS
 2012-12-10 11:00:28 -05:00
David Ormsbee
7596deb40a Merge pull request #1094 from MITx/feature/victor/instructor-grading 
Feature/victor/instructor grading
 2012-12-07 08:44:58 -08:00
Calen Pennington
c917725ff0 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	common/lib/xmodule/xmodule/seq_module.py
	common/lib/xmodule/xmodule/template_module.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/courseware/views.py
	lms/static/sass/course.scss
	requirements.txt
 2012-12-07 11:17:41 -05:00
Victor Shnayder
7190e484f1 Use a namedtuple for parsing ScoreMessages 2012-12-07 10:35:44 -05:00
Victor Shnayder
bf593c6603 clean up imports 2012-12-07 10:35:44 -05:00
Victor Shnayder
42f8afb083 address minor code review comments 2012-12-07 10:35:44 -05:00
Victor Shnayder
3da727125f fix feedback formatting 2012-12-07 10:35:43 -05:00
Victor Shnayder
6d2688cb66 unicode fix and cleanup in stringify children 2012-12-07 10:21:46 -05:00
Vik Paruchuri
0bc0657939 Add in support for ordering tags properly in feedback box 2012-12-07 09:21:23 -05:00
Vik Paruchuri
1eaf424c20 Change some things to use format 2012-12-05 13:17:16 -05:00
Vik Paruchuri
e813dc3514 Address format issue and exception 2012-12-05 12:08:26 -05:00
Victor Shnayder
3795b3a785 Address Dave's comments 
- factor out some common code
- improve variable names
 2012-12-05 10:56:12 -05:00
Victor Shnayder
1d87dab3a7 remove queueing spinner and polling logic, change message 
- no polling, since instructors may take a long time to grade
 2012-12-04 17:45:51 -05:00
David Ormsbee
cee0781a20 Don't cap points coming back from CodeResponses -- let them be more than max_points if they want to award extra credit. 2012-12-04 15:51:36 -05:00
Diana Huang
65c56edb5c Better error logging when login into queue fails 2012-12-03 15:04:34 -05:00
Victor Shnayder
22ce306f64 whitespace and comments 2012-12-03 12:50:41 -05:00