Matthew Mongeau
ff74bc79d4
Undo forced CourseDescriptor
2012-07-09 18:21:06 -04:00
Bridger Maxwell
4aacace056
Fixed exception type when about or info section missing.
2012-07-09 15:54:36 -04:00
Matthew Mongeau
43e6bbb29f
Added info page content
2012-07-09 14:16:17 -04:00
Matthew Mongeau
c47cdc7f87
Fix some path problems.
2012-07-09 14:06:44 -04:00
Matthew Mongeau
3053caec7e
Get course about page working.
2012-07-09 13:48:18 -04:00
Matthew Mongeau
949efb62e9
Got courses page working... mostly.
2012-07-09 11:27:45 -04:00
ichuang
aedcd9a4c4
change "type" to "category" in xml_module.py
2012-07-08 22:04:54 -04:00
ichuang
0daf7b0497
merging of stable-edx4edx into master - bugfixes and debugging
2012-07-08 19:03:29 -04:00
ichuang
9b90068e03
Merge branch 'stable-edx4edx' of github.com:MITx/mitx
...
Conflicts:
common/lib/xmodule/seq_module.py
common/lib/xmodule/xmodule/capa_module.py
lms/djangoapps/courseware/module_render.py
lms/djangoapps/courseware/views.py
lms/djangoapps/multicourse/multicourse_settings.py
2012-07-08 16:52:36 -04:00
Matthew Mongeau
be3539f1b2
Use CourseDescriptor instead of HiddenDescriptor.
2012-07-08 14:46:05 -04:00
Matthew Mongeau
213d64c159
Append courses
2012-07-06 18:43:30 -04:00
Matthew Mongeau
83fdeea2bc
Hookup the CourseDescriptor stuff by fixing a fewt push -f dorm issues.
2012-07-06 18:23:22 -04:00
Matthew Mongeau
5109253378
Revert "workarounds for get_about_section"
...
This reverts commit 05e1bcf4f1
2012-07-06 17:23:56 -04:00
Matthew Mongeau
05e1bcf4f1
workarounds for get_about_section
2012-07-06 17:13:53 -04:00
ichuang
74e01bb07a
fixed two bugs in inputtypes: textline with quotes crashed problems, and
...
choice without text caused error
2012-07-06 09:49:08 -04:00
Calen Pennington
a1f98e76cd
WIP: Merging multicourse and xmodule descriptor changes
...
The basic form has been fleshed out. Things still to do:
1) Extend get_course interface to the rest of modulestore
2) Make courses actually load
3) Make org/course/maybe others metadata attributes for course_module (see xml_module), so
that they are loaded/saved on import/export to xml
2012-07-05 21:56:52 -04:00
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
