Calen Pennington
379c6d164d
Allow importing of courses that still have mako templating in them
2012-07-11 23:02:33 -04:00
Calen Pennington
b3ab9c23f7
Allow importing of courses that don't have the expected path/filename structure for problems and html
2012-07-11 23:02:33 -04:00
ichuang
926fdd010e
Merge pull request #173 from MITx/cpennington/pull-155-cleanup
...
This cleans up remaining issues w/ https://github.com/MITx/mitx/pull/155
2012-07-11 19:34:56 -07:00
Calen Pennington
dfad0decc3
Disambiguating name in XMLModuleStore definition
2012-07-11 22:19:34 -04:00
Calen Pennington
f0717570c0
Clean up how mapping from metadata to xml attributes is done
2012-07-11 22:19:34 -04:00
Calen Pennington
a4d2245b44
Add comment about LazyLoadingDict
2012-07-11 22:19:34 -04:00
Calen Pennington
cdd55373c6
Make it clear that the module for backwards compatability is just that
2012-07-11 22:19:34 -04:00
Calen Pennington
8e4c7c878e
Add comment about location invalid chars
2012-07-11 22:19:34 -04:00
Calen Pennington
8119e6b939
Adding comment about future of user groups
2012-07-11 22:19:34 -04:00
Calen Pennington
780eb646fc
Add note that metadata dictionary is scaffolding
2012-07-11 22:19:34 -04:00
Calen Pennington
77fea77726
Define type of resource_fs in export_to_xml docstring
2012-07-11 22:18:41 -04:00
Calen Pennington
3cef71431e
Make mapping from xml attributes to metadata values less manual
2012-07-11 22:18:40 -04:00
Calen Pennington
e7d44a2606
Remove explain attribute in favor of solution stanza as exemplified in edx4edx
2012-07-11 22:18:40 -04:00
Calen Pennington
c3964c5447
Clarify CapaModule docstring
2012-07-11 22:18:40 -04:00
Calen Pennington
aeae2e02e2
Add docstrings to abtest with xml and json formats
2012-07-11 22:18:40 -04:00
Calen Pennington
35ffa4dc0e
Micro optimization of Location initialization from dictionaries
2012-07-11 16:41:25 -04:00
Calen Pennington
f8e9313dad
Minimize the number of roundtrips to mongo during cms save by prefetching children
2012-07-11 16:22:24 -04:00
Bridger Maxwell
ae955ec4a5
Now using the course name as the default wiki namespace.
2012-07-11 15:32:59 -04:00
Calen Pennington
9c883420fd
Fix typo when reading showanswer out of capa problem metadata
2012-07-11 09:17:30 -04:00
Calen Pennington
853a452699
Use appropriate indexes in mongo modulestore
2012-07-11 08:53:56 -04:00
Bridger Maxwell
a9eab86aee
Merge branch 'dormsbee/multicourse' of github.com:MITx/mitx into dormsbee/multicourse
2012-07-10 15:47:39 -04:00
Calen Pennington
6dd141247d
Fixing github_sync to work with multiple course data directories
2012-07-10 14:58:27 -04:00
Bridger Maxwell
aff904a69d
Merge
2012-07-10 14:40:31 -04:00
Calen Pennington
fdd9663699
Merge remote-tracking branch 'origin/master' into dormsbee/multicourse
...
Conflicts:
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/modulestore/xml.py
lms/djangoapps/courseware/views.py
lms/templates/index.html
lms/templates/info.html
lms/templates/main.html
lms/templates/navigation.html
requirements.txt
2012-07-10 13:39:19 -04:00
Calen Pennington
74593d18af
Fix url in CapaModule error message
2012-07-10 13:15:40 -04:00
Calen Pennington
5406b9bb40
Make /static/ urls work in the courseware
2012-07-10 12:54:47 -04:00
Calen Pennington
dbfcd78c88
Get custom_tag templates using system.filestore so that they work in multicourse
2012-07-10 10:46:18 -04:00
Calen Pennington
ad08df7abd
Add logging when info and about sections are missing
2012-07-10 09:32:18 -04:00
Calen Pennington
3011f3f336
Expect the proper error type when about or info sections aren't found
2012-07-10 09:30:14 -04:00
Calen Pennington
332ccb0bef
Use course 'display_name' from metadata, and fall back to course id name if display_name is not set
2012-07-10 09:27:05 -04:00
Calen Pennington
115a572fd0
Set defaults for org and course, and log error messages when they are used
2012-07-10 09:23:40 -04:00
Calen Pennington
6d246f0685
Merge remote-tracking branch 'origin/master' into ps-cms-backbone
...
Conflicts:
cms/djangoapps/contentstore/views.py
cms/static/coffee/unit.coffee
cms/templates/index.html
cms/templates/widgets/sequence-edit.html
2012-07-10 08:55:45 -04:00
Calen Pennington
cfd6890d68
Merge remote-tracking branch 'origin/master' into cpennington/cms-github
...
Conflicts:
common/lib/xmodule/xmodule/xml_module.py
2012-07-10 08:50:54 -04:00
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
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
