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

4251 Commits

Author SHA1 Message Date
Brian Wilson
290368ef0d merge out from master 2013-02-07 17:40:54 -05:00
Vik Paruchuri
5154068d75 Debug some score tuple issues 2013-02-07 17:33:03 -05:00
Vik Paruchuri
7bf0532a04 Fix some issues with displaying grader info on rubric 2013-02-07 17:28:31 -05:00
Vik Paruchuri
41d35632f3 Working on combined rubric stuff 2013-02-07 17:18:53 -05:00
Vik Paruchuri
0f81b0f816 Aggregate rubric feedback 2013-02-07 16:51:51 -05:00
Vik Paruchuri
47d5fe60ef Return feedback items individually 2013-02-07 16:43:21 -05:00
Vik Paruchuri
091f34668b Support centralized results 2013-02-07 16:40:25 -05:00
Vik Paruchuri
4b5457c997 Fixing some rubric score errors 2013-02-07 16:13:07 -05:00
Brian Wilson
80e4944314 minor cleanup 2013-02-07 16:12:02 -05:00
Brian Wilson
cc11dc2aa3 switch to using timelimit module for Pearson test 2013-02-07 15:57:43 -05:00
Vik Paruchuri
4a897d4e7f Save rubric scores in self assessment 2013-02-07 15:52:23 -05:00
Vik Paruchuri
3874fe545a Working on making a combined rubric 2013-02-07 15:46:49 -05:00
Calen Pennington
4f555f6480 Merge remote-tracking branch 'origin/master' into feature/cale/xmodule-storage-model 
Conflicts:
	cms/djangoapps/contentstore/course_info_model.py
	cms/djangoapps/contentstore/module_info_model.py
	cms/djangoapps/contentstore/tests/factories.py
	cms/djangoapps/contentstore/tests/test_course_settings.py
	cms/djangoapps/contentstore/views.py
	cms/djangoapps/models/settings/course_details.py
	cms/djangoapps/models/settings/course_grading.py
	cms/templates/edit_subsection.html
	common/djangoapps/mitxmako/shortcuts.py
	common/djangoapps/static_replace.py
	common/djangoapps/util/converters.py
	common/djangoapps/xmodule_modifiers.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/abtest_module.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/discussion_module.py
	common/lib/xmodule/xmodule/error_module.py
	common/lib/xmodule/xmodule/html_module.py
	common/lib/xmodule/xmodule/js/src/video/display.coffee
	common/lib/xmodule/xmodule/mako_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/store_utilities.py
	common/lib/xmodule/xmodule/modulestore/xml.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	common/lib/xmodule/xmodule/raw_module.py
	common/lib/xmodule/xmodule/self_assessment_module.py
	common/lib/xmodule/xmodule/seq_module.py
	common/lib/xmodule/xmodule/template_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_export.py
	common/lib/xmodule/xmodule/tests/test_import.py
	common/lib/xmodule/xmodule/video_module.py
	common/lib/xmodule/xmodule/x_module.py
	common/lib/xmodule/xmodule/xml_module.py
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/models.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/django_comment_client/utils.py
	lms/templates/staff_problem_info.html
	lms/templates/video.html
	rakefile
 2013-02-07 15:12:30 -05:00
Vik Paruchuri
62435b4c27 Clean up results display 2013-02-07 14:12:14 -05:00
Vik Paruchuri
1cf8326b32 Make status bar, minor CSS fixes 2013-02-07 14:03:43 -05:00
Vik Paruchuri
b1726dae99 Fix prompt UI in combined open ended to close by default and be collapsible 2013-02-07 13:48:32 -05:00
Vik Paruchuri
5ef4af5afd Fix peer and staff grading interfaces 2013-02-07 12:54:36 -05:00
Vik Paruchuri
baba8d3a36 Add collapse action into staff grading view 2013-02-07 12:42:05 -05:00
Vik Paruchuri
3457b86bd0 Fix JS, style student response box 2013-02-07 12:36:57 -05:00
Vik Paruchuri
c195fe65cd Restyle rubric list, submission container 2013-02-07 11:10:29 -05:00
Vik Paruchuri
198885f7e0 Move elements around, do some restyling 2013-02-07 10:40:15 -05:00
Vik Paruchuri
b30407d7c8 Work on showing results properly 2013-02-07 10:22:33 -05:00
Diana Huang
cab9bfcd55 Minor cleanup 2013-02-07 10:08:34 -05:00
Diana Huang
12ff015bff Include due date parsing in new versioned xmodule. 2013-02-07 10:00:05 -05:00
Vik Paruchuri
de8e1e9472 Change around some names, restyle rubric 2013-02-07 09:57:41 -05:00
Vik Paruchuri
03a6572bbe Restyle status, get rubric to work properly 2013-02-07 09:49:56 -05:00
Diana Huang
e6957a01a4 Merge branch 'master' into feature/diana/close-oe-problems 
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
 2013-02-07 09:44:31 -05:00
Diana Huang
97655d0358 Remove the requirement that the problem peer grading module 
has to have a certain naming structure
 2013-02-07 09:40:30 -05:00
Vik Paruchuri
9a5a988116 Revert peer grading problem to master version 2013-02-07 09:29:24 -05:00
Vik Paruchuri
2542b6cb72 Merge remote-tracking branch 'origin/master' into feature/vik/improve-oe-ui 2013-02-07 09:26:40 -05:00
Vik Paruchuri
6a6962df9e Alter rubric list, restyle rubric 2013-02-07 09:26:27 -05:00
Brian Wilson
33a5a5fd9f add implementation for fixed_time_module 2013-02-07 05:17:56 -05:00
Victor Shnayder
37b735d708 Merge pull request #1454 from MITx/hotfix/dave/youtube_object 
Hack to disable YouTube <iframe> API when they break it.
 2013-02-06 19:41:12 -08:00
David Ormsbee
a470a62d12 Hack to disable YouTube <iframe> API when they break it. 2013-02-06 22:37:41 -05:00
Victor Shnayder
edf96036c8 Merge remote-tracking branch 'origin/master' into 7012x-clean 2013-02-06 18:53:14 -05:00
ichuang
b5ba88f0af Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/conditional-xmodule-icon-and-errortracker 
Conflicts:
	common/lib/xmodule/xmodule/conditional_module.py
 2013-02-06 18:15:36 -05:00
ichuang
c16f688802 conditional xmod: add errortracker msg and inherit icon from child 2013-02-06 18:10:25 -05:00
David Ormsbee
e5fda33eff Throw the error back up if we don't have a console to log it to. 2013-02-06 17:13:22 -05:00
Vik Paruchuri
463f31618d Merge remote-tracking branch 'origin/master' into fix/vik/peer-grading-images 2013-02-06 16:37:52 -05:00
Vik Paruchuri
48719a7a45 Merge branch 'feature/vik/oe-versioning' into feature/vik/improve-oe-ui 
Conflicts:
	common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee
	lms/static/sass/course/_staff_grading.scss
 2013-02-06 16:04:01 -05:00
Vik Paruchuri
cf81fb27e8 Add in close date to metadata 2013-02-06 15:55:39 -05:00
Vik Paruchuri
733faebaf0 Fix git issue 2013-02-06 15:28:05 -05:00
Vik Paruchuri
5a51d142bb Merge remote-tracking branch 'origin/master' into feature/vik/oe-versioning 
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
 2013-02-06 15:26:01 -05:00
Vik Paruchuri
f568e49265 Fix oe version tests 2013-02-06 15:20:02 -05:00
Vik Paruchuri
9e4e98ef74 Fix some css to get things to properly close/open 2013-02-06 15:13:56 -05:00
Diana Huang
04f6d6d0ff Improve documentation 2013-02-06 15:00:08 -05:00
Diana Huang
6f147df7f7 Merge branch 'master' into feature/diana/close-oe-problems 
Conflicts:
	common/lib/xmodule/xmodule/peer_grading_module.py
 2013-02-06 14:16:18 -05:00
Diana Huang
f42f84d9e8 Merge pull request #1440 from MITx/diana/rubric-ui-improvements 
Rubric UI updates
 2013-02-06 11:04:44 -08:00
Diana Huang
f3fa438018 Merge branch 'master' into feature/diana/close-oe-problems 
Conflicts:
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
	common/lib/xmodule/xmodule/timeparse.py
 2013-02-06 13:26:22 -05:00
Vik Paruchuri
f565d17b4f Merge branch 'feature/vik/oe-versioning' into fix/vik/peer-grading-images 
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
 2013-02-06 13:23:31 -05:00