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

9300 Commits

Author SHA1 Message Date
Prem Sichanugrist
c94d6d1602 No need to append text key on HTML module save 2012-07-05 17:22:18 -04:00
Calen Pennington
9d1dc37b44 Merge remote-tracking branch 'origin/master' into dormsbee/multicourse 
Conflicts:
	cms/djangoapps/contentstore/management/commands/import.py
	cms/djangoapps/contentstore/views.py
	cms/envs/common.py
	cms/envs/dev.py
	cms/envs/test.py
	cms/static/sass/README.txt
	cms/static/sass/_base.scss
	cms/static/sass/_calendar.scss
	cms/static/sass/base-style.scss
	cms/templates/base.html
	cms/templates/index.html
	cms/templates/widgets/header.html
	cms/templates/widgets/module-dropdown.html
	cms/templates/widgets/navigation.html
	cms/templates/widgets/problem-edit.html
	cms/urls.py
	common/djangoapps/pipeline_mako/__init__.py
	common/djangoapps/util/views.py
	common/lib/capa/capa_problem.py
	common/lib/capa/templates/textinput_dynamath.html
	common/lib/mitxmako/middleware.py
	common/lib/mitxmako/shortcuts.py
	common/lib/mitxmako/template.py
	common/lib/xmodule/capa_module.py
	common/lib/xmodule/seq_module.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/test_files/symbolicresponse.xml
	common/lib/xmodule/test_files/test_files/symbolicresponse.xml
	common/lib/xmodule/tests/__init__.py
	common/lib/xmodule/tests/test_files/symbolicresponse.xml
	common/lib/xmodule/vertical_module.py
	common/lib/xmodule/video_module.py
	common/lib/xmodule/x_module.py
	lms/djangoapps/courseware/content_parser.py
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/static/coffee/spec/helper.coffee
	lms/static/coffee/spec/modules/video/video_player_spec.coffee
	lms/static/coffee/spec/modules/video/video_volume_control_spec.coffee
	lms/static/coffee/src/modules/problem.coffee
	lms/static/coffee/src/modules/sequence.coffee
	lms/static/coffee/src/modules/video/video_player.coffee
	lms/static/coffee/src/modules/video/video_volume_control.coffee
	lms/static/js/vendor/jquery-1.6.2.min.js
	lms/static/js/vendor/jquery-ui-1.8.16.custom.min.js
	lms/static/sass/application.scss
	lms/static/sass/courseware/_sequence-nav.scss
	lms/static/sass/courseware/_video.scss
	lms/templates/main.html
	lms/urls.py
	rakefile
	requirements.txt
 2012-07-05 16:22:50 -04:00
Prem Sichanugrist
a9aa5d9ea0 Update code base on changes in master 2012-07-05 15:25:04 -04:00
Calen Pennington
e9ee1566d6 Modularize capa and mitxmako so that xmodule can properly depend on them 2012-07-05 12:48:18 -04:00
ichuang
a5f3d8a900 fix handling of tail in inputtypes.math (needed saxutils.escape) 2012-07-04 16:06:07 -04:00
ichuang
d8b22ff12f add hidden attribute to textline and textbox inputtypes, for javascript problems 2012-07-04 14:13:13 -04:00
Calen Pennington
e33dce862a Merge branch 'master' into cpennington/cms-github 2012-07-03 21:24:44 -04:00
Calen Pennington
894ae58bc3 Use unicode for filepaths in data repos 2012-07-03 21:22:36 -04:00
Calen Pennington
cf2691301e Use _id to store the location, rather than location 2012-07-03 19:00:56 -04:00
Calen Pennington
9ae644e007 Make html save action send the correct data type 2012-07-03 18:59:17 -04:00
ichuang
96c132b333 put try around Progress call in capa_module - exception when divide by zero 2012-07-03 17:02:01 -04:00
Calen Pennington
5a2b2e0126 Add an index page that lists all courses 2012-07-03 14:44:41 -04:00
Calen Pennington
207777fbe1 Fix up problem display to use the new metadata that's available 2012-07-03 14:20:11 -04:00
Calen Pennington
42cef5b788 Get rid of references to self.filename in capa_module, as it no longer exists 2012-07-03 14:19:51 -04:00
Calen Pennington
67a732a0ff Allow the HTML module to use the lxml HTML parser when parsing html file includes 2012-07-03 13:18:01 -04:00
Calen Pennington
68c155b268 Don't use __dict__ for namedtuples, because it doesn't work in python 2.7.1 2012-07-03 09:57:51 -04:00
Calen Pennington
64a4a62cf5 Don't pass fileobjects to LoncapaProblem 2012-07-02 20:01:20 -04:00
Calen Pennington
3355f804d1 Add logging of filename when module file parsing fails 2012-07-02 20:01:01 -04:00
Calen Pennington
e172be3a26 Make XML import pass in an empty render_template function 2012-07-02 19:55:42 -04:00
Calen Pennington
3b4fb61648 Push dependency on mitxmako up out of mako_module 2012-07-02 14:10:29 -04:00
Calen Pennington
e56f8763ac Point to the js files in package data 2012-07-02 13:26:14 -04:00
Calen Pennington
a0f550396c Make xmodule fit the typical python installation setup 2012-07-02 13:19:27 -04:00
Calen Pennington
cc8ecb1891 Make xmodule tests pass again 2012-07-02 12:50:03 -04:00
Calen Pennington
8f59521660 Add a function to check round-trip export/import cycles 2012-07-02 12:25:48 -04:00
Calen Pennington
be40d8bb69 Make sure that xml_module definition xml doesn't have any metadata sprinkled in with it 2012-07-02 12:25:09 -04:00
Calen Pennington
c57833dab7 Define equality for XModuleDescriptors 2012-07-02 12:24:39 -04:00
Calen Pennington
f035d5602d Keep abtest children in a consistent order (makes testing easier) 2012-07-02 12:24:07 -04:00
Calen Pennington
3a348e5713 Adjust xml export code for the type -> category conversion 2012-07-02 11:25:42 -04:00
Calen Pennington
d7dbced8e6 Store the top level course in the XMLModuleStore (since there is only one course per module store 2012-07-02 11:25:21 -04:00
Calen Pennington
85f294b3e3 Allow for no default_class in XMLModuleStore 2012-07-02 11:21:40 -04:00
Calen Pennington
6612beab46 Acknowledge the fact that right now keystore is really just a module store. If we need a keystore that returns other objects, we can reexctract the base class into it's own module again 2012-07-02 11:15:37 -04:00
Calen Pennington
8cf848b191 Handle the filename for capa_module in the xml_module code, rather than specially in capa_module 2012-07-02 10:51:01 -04:00
Calen Pennington
552c199795 Export large xml as separate files. Note: inherited metadata is creeping into child nodes 2012-07-02 10:51:01 -04:00
Calen Pennington
bacce3e656 Load module contents from the file specified by the filename attribute 2012-07-02 10:51:01 -04:00
Calen Pennington
9c715b60a6 Fix broken element ids for modules with .s in their names 2012-07-02 10:51:01 -04:00
Calen Pennington
79987666df Lazily load module definition and metadata as needed, rather than immediately 2012-07-02 10:50:27 -04:00
Calen Pennington
1d4e1d55d5 Enforce location uniqueness in xml keystore 2012-07-02 10:49:05 -04:00
Calen Pennington
d95be5aa24 Fix html rendering after making it a RawDescriptor 2012-07-02 10:49:05 -04:00
Calen Pennington
b9dd30cd58 Don't dump inherited metadata when exporting xml 2012-07-02 10:49:05 -04:00
Calen Pennington
2f95146b9b Just use the class name when complaining about definition_from_xml not being implemented 2012-07-02 10:49:05 -04:00
Calen Pennington
f375258b38 Add xml export infrastructure for all existing modules 2012-07-02 10:49:05 -04:00
Calen Pennington
a94e4d2f1b Rearrange x_module definition into sections 2012-07-02 10:49:05 -04:00
Calen Pennington
c6d5eea841 Fix typo 2012-07-02 10:44:50 -04:00
Calen Pennington
ada152758d Make abtest store group portions as a dictionary 2012-07-02 10:44:50 -04:00
Calen Pennington
5b8c3dc1e4 Make html a RawDescriptor with a slightly different UI 2012-07-02 10:44:50 -04:00
Calen Pennington
b7062ca5ca Only set the xml slug if it isn't already set 2012-07-02 10:44:30 -04:00
Calen Pennington
8a64029b07 Remove blank text nodes during xml parsing 2012-07-02 10:44:30 -04:00
Calen Pennington
7b89b1eb54 Add ability to update modulestore metadata for a module separately from data or children 2012-07-02 10:44:30 -04:00
Calen Pennington
f859457037 Cache loaded plugins in memory 2012-07-02 10:35:40 -04:00
Calen Pennington
520fac1aa2 Enforce an index over the location key in mongo 2012-07-02 10:35:40 -04:00