Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,398 Commits 1 Branch 0 Tags
7ac8fecb38582cfa0f7a73e8a223dfd08affe543
Commit Graph

53 Commits

Author SHA1 Message Date
Calen Pennington
7ac8fecb38 Rename XModule[Descriptor].type to .category to be parallel to Location 2012-07-02 09:01:08 -04:00
Calen Pennington
5cd388d638 Have the CMS use the same XMLModuleStore for import that the LMS uses for reading content 2012-06-29 12:44:15 -04:00
Calen Pennington
5b8120280e Move the resources_fs abstraction into the primary DescriptorSystem, as it is needed for more than just XMLParsing 2012-06-29 12:38:58 -04:00
Calen Pennington
3c054306c6 Add the ability to specify Keystore engines and default descriptor classes by name from settings 2012-06-29 12:38:10 -04:00
Calen Pennington
21ba501989 Revert "Make import work via mako again, to unblock others while I work on making the LMS work using XModuleDescriptors" 
This reverts commit 6fdf44fe8d.
 2012-06-29 12:38:10 -04:00
Calen Pennington
3c60d1a9af Clean up how errors in import command are handled 2012-06-29 12:34:58 -04:00
Calen Pennington
feef179e3e Merge remote-tracking branch 'origin/master' into cpennington/cms-xml-processing 
Conflicts:
	cms/envs/common.py
 2012-06-29 12:11:35 -04:00
Calen Pennington
919f8cf261 Import x_module using the full path 2012-06-28 11:28:42 -04:00
Calen Pennington
6fdf44fe8d Make import work via mako again, to unblock others while I work on making the LMS work using XModuleDescriptors 2012-06-26 14:35:21 -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
daf3eed4ee Handle unnamed modules during import 2012-06-26 12:14:18 -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
Kyle Fiedler
863568ec99 Added red wip class and added tag for it 2012-06-25 11:52:43 -04:00
Kyle Fiedler
656fa38944 Added wip class 2012-06-25 11:44:06 -04:00
Kyle Fiedler
3081258836 Refactored the css and fixed some smaller bugs 2012-06-25 11:21:24 -04:00
Kyle Fiedler
5908d844b8 Added styles to be more consistant across pages 2012-06-25 11:21:24 -04:00
Calen Pennington
83b3d51fd2 Wire up the cancel button in the unit editor 2012-06-22 10:58:18 -04:00
Calen Pennington
72eef72d8b Html Module can now be editing, saved, and re-opened 2012-06-22 10:58:18 -04:00
Kyle Fiedler
f9bb8a701a Added new readme info and started to rework some of the css 2012-06-22 09:42:22 -04:00
Calen Pennington
5bef1e14b2 Split problem metadata out from problem editing contents when rendering 2012-06-22 09:21:09 -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
Kyle Fiedler
657fcd9984 Added new styles for html editing and removed a bunch of unused templates 2012-06-21 17:36:21 -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
Kyle Fiedler
28b570cf79 Added body class for layout 2012-06-20 11:39:55 -04:00
Calen Pennington
1853b99861 Work in progress editing. Committing to allow kfiedler to work in parallel 2012-06-20 11:14:25 -04:00
Calen Pennington
cc22125971 Remove old pre-compiled css 2012-06-19 14:30:19 -04:00
Calen Pennington
cac53cf1a0 Switch the cms over to using django-pipeline 2012-06-19 14:30:19 -04:00
Calen Pennington
b91a1d48b6 Remove reference to instructor module 2012-06-19 11:44:54 -04:00
Calen Pennington
6fb35c4773 Cleanup intertwined descriptor and keystore code 2012-06-19 11:31:13 -04:00
Calen Pennington
58085f8ed9 Remove unused urls 2012-06-19 11:29:14 -04:00
Calen Pennington
6daa0f1aa0 Fix string layout for readability 2012-06-19 11:29:14 -04:00
Calen Pennington
703103e767 Get rid of references to askbot 2012-06-19 11:25:41 -04:00
Calen Pennington
0379d1cb95 Search for course specifically in navigation view 2012-06-19 11:25:29 -04:00
Calen Pennington
199f94aa99 Conform to new TODO standards 2012-06-19 11:24:22 -04:00
Calen Pennington
605b1ae0fd Remove old template that is no longer relevant 2012-06-18 14:24:45 -04:00
Calen Pennington
9ff0effd71 Remove copy/paste instructor module. It was a bad idea anyway. =) 2012-06-18 14:08:15 -04:00
Calen Pennington
79e81d69b4 Delay initializition of the MongoKeyStore until required 2012-06-18 13:41:53 -04:00
Calen Pennington
5404345b1f Make tests pass when running on cms 2012-06-18 13:21:06 -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
Kyle Fiedler
cb1f6838ba Added more styles and markup for sequence 2012-06-15 13:27:24 -04:00
Kyle Fiedler
93478d53df Added scratch on the calendar view and added handles on the calendar view 2012-06-15 10:11:04 -04:00
Kyle Fiedler
57b605dbd3 Added more styels to the section view and default section view 2012-06-14 17:15:30 -04:00
Calen Pennington
6fee7928fc Successfully read course children out of mongodb 2012-06-14 16:16:15 -04:00
Kyle Fiedler
3eb7c69b23 Continued on week view styles 2012-06-14 11:55:49 -04:00
Kyle Fiedler
d96d982a5a Added sass readme 2012-06-13 15:21:25 -04:00
Calen Pennington
f2080fde62 Porting latest changes from ui_prototype 2012-06-13 14:43:01 -04:00
Calen Pennington
8338031f3e Switch to mako templates 2012-06-13 13:22:38 -04:00
Calen Pennington
a333612cce Add templates directly from cms_proto/ui_prototype 2012-06-13 11:54:17 -04:00