Rocky Duan
028bd23c1c
Merge branch 'master' of github.com:MITx/mitx into profile
...
Conflicts:
lms/djangoapps/courseware/module_render.py
lms/djangoapps/courseware/views.py
lms/templates/course_navigation.html
2012-08-18 16:57:00 -07:00
Calen Pennington
3b36fbf914
Move mitxmako out of common lib, and pass template rendering function into MongoModuleStore
2012-08-16 12:49:42 -04:00
Rocky Duan
5d3b187540
Merge branch 'master' of github.com:MITx/mitx
2012-08-01 16:45:21 -04:00
Victor Shnayder
c0cdff7071
Rename MalformedDescriptor to ErrorDescriptor
...
* change references and tests
* add staff/non-staff display
* added is_staff to ModuleSystem
2012-08-01 11:42:39 -04:00
Victor Shnayder
53608922ba
Make the malformed descriptor import properly
...
* Also get rid of lazy loading of metadata and definition
2012-08-01 11:40:11 -04:00
Rocky Duan
f7c51870f3
initial setup for the discussion module
2012-07-18 12:00:42 -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
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
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
Calen Pennington
e9ee1566d6
Modularize capa and mitxmako so that xmodule can properly depend on them
2012-07-05 12:48:18 -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
dcd74e6dd0
Make abtests work, using the new abtest xml format
2012-06-29 12:45:18 -04:00
Calen Pennington
c3a432f217
Make problemsets display as verticals rather than sequences
2012-06-29 12:45:18 -04:00
Calen Pennington
bae90ab16d
Make custom tags work in the LMS
2012-06-29 12:42:48 -04:00
Calen Pennington
2011861444
Get capa problems to display from a keystore
2012-06-29 12:42:48 -04:00
Calen Pennington
de07b8b345
Begin using a Keystore for XML parsing. Still broken: sequence icons, custom tags, problems, video js
2012-06-29 12:40:50 -04:00
Calen Pennington
9983160995
Parse more module types as sequence modules
2012-06-26 14:29:30 -04:00
Calen Pennington
66ca31947a
Remove semantically meaningless sections from course.xml by moving their attributes onto the contained element. If there is more than one contained element, turn the section into a sequence. Also handles includes
2012-06-26 14:10:15 -04:00
Calen Pennington
f0cf323488
Handle chapters as sequence modules
2012-06-26 12:15:03 -04:00
Calen Pennington
e9a00ffc5a
Parse XModuleDescriptors on import using from_xml
...
Also:
Render all XModuleDescriptors in the cms the same way
Default them to editing raw xml, if there is no specific module for them
2012-06-26 11:56:21 -04:00
Calen Pennington
17a4d7fd09
Call js module name dynamically, rather than statically calling the HTML module
2012-06-22 08:59:53 -04:00
Calen Pennington
69290c18c3
Live editing of html modules implemented, but no saving to the backend
2012-06-21 15:33:52 -04:00
Calen Pennington
6fb35c4773
Cleanup intertwined descriptor and keystore code
2012-06-19 11:31:13 -04:00
Calen Pennington
e67dfb70e4
Add categories and XModuleDescriptors for all module types that are used at the top level of a course
2012-06-18 11:22:36 -04:00
Calen Pennington
fe45de3833
Read week headings from mongodb
2012-06-18 11:20:57 -04:00
