Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,817 Commits 1 Branch 0 Tags
624bef547c66da17048e29ff5d80126a665f1a0d
Commit Graph

65817 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Bridger Maxwell
e122583440 Merge branch 'dormsbee/multicourse' into multicourse_wiki 2012-07-03 09:59:37 -07:00
Bridger Maxwell
064274a756 Most of the wiki pages are now loading without errors. 2012-07-03 09:50:58 -07:00
ichuang
ce74aa798d fix name of 6.002x course to correspond to change in course.xml 2012-07-03 12:16:33 -04:00
Matthew Mongeau
3ae48d19b4 Passes course around for courseware. Fix static assets. 2012-07-03 12:13:15 -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
92ea15b786 Merge pull request #155 from MITx/cpennington/cms-xml-export 
This allows XModuleDescriptors to export themselves to XML
 2012-07-02 17:08:36 -07: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
ichuang
20720c91b9 add 7.00x to dev_ike.py 2012-07-02 18:29:42 -04:00
Galen Frechette
506ee58b61 fixes template paths in course_about.html 2012-07-02 15:45:05 -04:00
Galen Frechette
c4bdfd9d6a wip course info/profile page 2012-07-02 15:39:19 -04:00
Galen Frechette
11bf79a52e cleans up course info/profile page 2012-07-02 15:38:21 -04:00
Galen Frechette
909f78c8ef cleans up course info/profile page 2012-07-02 14:26:11 -04:00
Galen Frechette
4359a2544e wip course info/profile page 2012-07-02 14:23:14 -04:00
Galen Frechette
e0f01aa828 cleans up course info/profile page 2012-07-02 14:11:25 -04:00
Calen Pennington
3b4fb61648 Push dependency on mitxmako up out of mako_module 2012-07-02 14:10:29 -04:00
ichuang
1509cdcced Merge pull request #153 from MITx/cpennington/lms-descriptors 
These changes make the LMS read from the XML course files using the ModuleStore interface. 

Note that stable-edx4edx will now no longer be a clean merge.  But this code has priority.
 2012-07-02 10:52:22 -07:00
Calen Pennington
d7178e4a41 Add a set of rake tasks for checking settings importability 2012-07-02 13:26:31 -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
ichuang
63aa451d67 use course = settings.COURSE_DEFAULT.replace('_',' ') for default accordion 2012-07-02 11:29:45 -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
ichuang
10a10c7938 clean up email settings check in lms.djangoapps.student.views 2012-07-02 11:21:00 -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
1e8acbefac Add a temporary url for testing xml export triggering 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