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

400 Commits

Author SHA1 Message Date
Calen Pennington
6abd1ec64a Merge pull request #309 from MITx/feature/tutorials_fix 
Add optional hide_from_toc attribute to XML elements
 2012-07-27 05:38:29 -07:00
Calen Pennington
aa855eec0f Merge pull request #307 from MITx/kimth/lms-coderesponse 
Kimth/lms coderesponse
 2012-07-27 05:37:57 -07:00
Arjun Singh
c4c8bc2fbe Adding the ability for javascript from problems to execute more intelligently; for example, errors from javascript included in the returned html will show up in the console when using this mechanism. 2012-07-26 16:35:33 -04:00
David Ormsbee
2671801f93 Add optional hide_from_toc attribute to XML elements to support Tutorials (which don't show up in the navigation). 2012-07-26 14:55:42 -04:00
Calen Pennington
1d554c76a0 Comment out really loud debug messages from xml.py 2012-07-26 12:05:23 -04:00
kimth
6631848b53 CodeMirror fix in the new scss org 2012-07-26 10:49:10 -04:00
kimth
8e8ac35d46 restored responsetypes.py from master 2012-07-26 10:11:49 -04:00
kimth
07de2d9903 Merging master 2012-07-26 10:08:55 -04:00
kimth
1255ed130f Adjust comments 2012-07-26 09:15:07 -04:00
kimth
57810bb564 Consolidate textbox styling into codemirror.css 2012-07-25 16:53:07 -04:00
kimth
31641252e7 Typos in and some additional comments 2012-07-25 13:28:52 -04:00
Calen Pennington
8b1bab75bd Fixing up comments on xmodule components 2012-07-25 10:10:17 -04:00
Calen Pennington
bdf964a305 Modularize video css 2012-07-24 16:14:05 -04:00
Calen Pennington
6029c28695 Modularize sequence css 2012-07-24 16:14:04 -04:00
Calen Pennington
8a0270ea2b Allow for modular css from XModules, and split capa module css out as a test 2012-07-24 16:14:04 -04:00
Calen Pennington
408726e678 Standardize how JS XModules are instantiated 2012-07-24 16:14:04 -04:00
Calen Pennington
ebb737b94a Add better logging to capa_module during problem checking 2012-07-24 16:14:03 -04:00
Calen Pennington
1924609b10 Move schematic.js into capa_module js includes 2012-07-24 16:14:02 -04:00
Calen Pennington
6ea5f6a493 Move imageinput.js to capa_module js includes 2012-07-24 16:14:02 -04:00
Calen Pennington
7e4d3c8b35 Modularize sequence coffeescript in prepration for CMS preview 2012-07-24 16:14:02 -04:00
Victor Shnayder
5988d1f47f Organize and de-duplicate imports in mongo.py 2012-07-24 16:14:02 -04:00
Victor Shnayder
49e8d08c1e Add get_courses() to mongo modulestore 
* Note: This doesn't run yet
* add config file for lms on mongo
* Some comment additions and cleanups
 2012-07-24 16:14:01 -04:00
Victor Shnayder
51ae0d5484 improve docstrings and formating in mongo.py 2012-07-24 16:14:01 -04:00
Calen Pennington
61446b0544 Make javascript for video previews work correctly 2012-07-24 16:14:01 -04:00
Calen Pennington
cb6c7640c8 Get the video module pointing to the correct static files directory, without relying on get_html replacement 2012-07-24 16:14:01 -04:00
Calen Pennington
4c82f35e2d Put data_dir into metadata for all XModuleDescriptors loaded from xml 2012-07-24 16:14:01 -04:00
Calen Pennington
5f86fcfbff Standardize how Problem and Video modules are loaded in the LMS and CMS preview pane 2012-07-24 16:14:00 -04:00
Calen Pennington
987fe17358 Load js fragments in order, so that Subview is loaded before the classes that use it 2012-07-24 16:14:00 -04:00
Calen Pennington
5026d6e9fb Give all XModuleDescriptors a module_class, and make it inheritance of js_module_names work 2012-07-24 16:14:00 -04:00
Calen Pennington
3cdceab16c Uniquify js fragments pulled from XModules, and load both XModuleDescriptor and XModule js into the cms 2012-07-24 16:13:59 -04:00
Calen Pennington
3fa636e060 Move module javascript into common/lib/xmodule. Still TODO: run jasmine tests in that directory 2012-07-24 16:13:59 -04:00
Calen Pennington
1395e5d55c Empty Locations are now legal 2012-07-24 16:13:59 -04:00
Calen Pennington
9458e53988 Adding stripped down 6002x course for testing, along with CMS test for edit pages for same 2012-07-24 16:13:51 -04:00
Calen Pennington
6bf0e093bc Add tests for the edit page for the toy course, and make sure that exporting to github sets up the git repo properly 2012-07-24 15:05:07 -04:00
Calen Pennington
45144ec4ce Remove the live preview code from the html and raw modules, in preparation for updating the preview on save 2012-07-24 15:05:07 -04:00
Calen Pennington
15ac476781 Display preview html on the module edit page. Javascript for previews doesn't yet function 2012-07-24 15:05:07 -04:00
Calen Pennington
a81015a91b Move I4xSystem into xmodule so that the definition is available to the CMS 2012-07-24 15:05:07 -04:00
Calen Pennington
97cdb67b49 Log error messages when failing to parse xml from a string that contain context of where the error occurred in the string (in definition_to_xml) 2012-07-24 15:05:07 -04:00
Calen Pennington
1d1a9173a4 Cleaning up pep8 violations 2012-07-23 14:44:40 -04:00
Calen Pennington
ebe67d2d7d Merge remote-tracking branch 'origin/release/1.0' 
Conflicts:
	common/djangoapps/student/views.py
 2012-07-23 13:55:20 -04:00
David Ormsbee
f213353613 Change how we display the start date to be internationally unambiguous. 2012-07-21 20:19:12 -04:00
Arjun Singh
d446081748 Added a filestore pointing at the directory of the file being run for xmodule tests 2012-07-20 13:31:11 -07:00
Arjun Singh
25b6db762f Replacing startouttext/endouttext with text in examples. 2012-07-19 13:24:19 -07:00
Arjun Singh
c87f9cd523 Added tests for ChoiceResponses. 2012-07-19 13:07:00 -07:00
Arjun Singh
6871326001 Adding information and an example for ChoiceResponse 2012-07-19 12:41:28 -07:00
Arjun Singh
85f5c93d92 Added MultipleChoiceResponse, TrueFalseResponse, and choicegroup back in. 2012-07-19 10:25:51 -07:00
Arjun Singh
a23c51e39c Merged two multiple-choice-like response types into a single response; created inputtypes for checkboxes and radio buttons adn cleaned up the code a bit. Fixed checkbox responses. 2012-07-19 10:25:51 -07:00
Arjun Singh
ab11a5f7ed Allowing for form fields to submit more than one value; e.g. checkbox inputs. 2012-07-19 10:25:51 -07:00
ichuang
77dfc2ade7 Merge pull request #224 from MITx/fix_optioninput 
minor patch to fix optioninput; merging this in now, to unblock berkeley's changes to MC; passes my tests.
 2012-07-19 10:16:02 -07:00
ichuang
b814e6a08d Merge pull request #221 from MITx/kimth/lms-coderesponse 
CodeResponse restricted to only one answer field
 2012-07-19 08:25:03 -07:00