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

18841 Commits

Author SHA1 Message Date
Vik Paruchuri
8e213f53d8 Fix rubric parsing errors 2013-01-14 15:52:57 -05:00
Vik Paruchuri
f5600c2b8a Make things more robust, ensure that a rubric is specified properly before combined open ended module will render 2013-01-14 15:42:38 -05:00
cahrens
1f681b4dcf Visual Editor work. 2013-01-14 15:41:13 -05:00
cahrens
29f49895d3 Pretty much works. 2013-01-14 15:41:12 -05:00
cahrens
db9875758f Saving work. 2013-01-14 15:41:12 -05:00
cahrens
b58577a913 Version 3.5.8 of tinyMCE. http://www.tinymce.com/ 2013-01-14 15:41:12 -05:00
cahrens
6312022b6e Delete old version of tiny_mce. 2013-01-14 15:41:12 -05:00
cahrens
3cc63f1b2f tiny_mce 2013-01-14 15:41:12 -05:00
cahrens
c4ec8ead4a Work in progress, related to rich HTML editor. 2013-01-14 15:41:12 -05:00
Diana Huang
79c8efcb68 Update the rubric renderer 2013-01-14 15:02:24 -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
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
Diana Huang
cc4095807f Handle scores if they exist in the xml 2013-01-14 13:38:44 -05:00
Calen Pennington
330a2eac80 Don't break the course if the grading policy is broken 2013-01-14 13:18:54 -05:00
Calen Pennington
95478922d0 Whitespace fixes 2013-01-14 13:18:54 -05:00
Calen Pennington
86be73f6a2 Make errors during course loading not break the site, but just hide that course instead 2013-01-14 13:16:22 -05:00
Vik Paruchuri
ad1e73fa86 Clean up capa by removing message post actions that aren't needed 2013-01-14 13:12:38 -05:00
Calen Pennington
f91a5f0e23 Merge pull request #1273 from MITx/fix/cdodge/filesystem-xml-fixes 
Fix/cdodge/filesystem xml fixes
 2013-01-14 09:34:25 -08:00
Chris Dodge
9f73294959 add end_date.html file 2013-01-14 12:23:36 -05:00
Chris Dodge
edb913f6ac add tests for about content overrides 2013-01-14 12:12:40 -05:00
Vik Paruchuri
3e0cf9d234 Make rubric render more nicely 2013-01-14 11:53:23 -05:00
Chris Dodge
ac7eceb636 be sure to first import 'extra' course content from base folder as well as a special override folder for the course run 2013-01-14 11:16:48 -05:00
Vik Paruchuri
59e5b494a9 Proper rubric rendering for self assessment 2013-01-14 10:51:17 -05:00
Vik Paruchuri
2b4929562a Fix up rubric rendering 2013-01-14 10:39:58 -05:00
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
jmvt
d230c1b03c Added example of geographic student distribution over world map. 2013-01-11 17:14:29 -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