Commit Graph

66833 Commits

Author SHA1 Message Date
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
Calen Pennington
7b89b1eb54 Add ability to update modulestore metadata for a module separately from data or children 2012-07-02 10:44:30 -04:00
Calen Pennington
51a790173f Only set the default etree parser options in the module that is starting the xml parsing 2012-07-02 10:35:40 -04:00
Calen Pennington
f859457037 Cache loaded plugins in memory 2012-07-02 10:35:40 -04:00
Calen Pennington
520fac1aa2 Enforce an index over the location key in mongo 2012-07-02 10:35:40 -04:00
Calen Pennington
a7d0e2e122 Use a string key for default groups in abtests (and remove code that was expecting groups from django) 2012-07-02 10:35:40 -04:00
Calen Pennington
b5cd01841c Merge remote-tracking branch 'origin/master' into cpennington/lms-descriptors
Conflicts:
	lms/djangoapps/courseware/grades.py
2012-07-02 10:31:26 -04:00
Calen Pennington
312dda760e Fixing repr for Locations 2012-07-02 10:25:25 -04:00
Calen Pennington
e0e42ae8ac Fix up cms after changing html and sequence descriptors to use metadata 2012-07-02 10:18:24 -04:00
Calen Pennington
3cf29af8fe Make location into a named tuple, and use it more as a first class entity, rather than URL for identifying content 2012-07-02 10:17:59 -04:00
Calen Pennington
7ed9b4aa89 Add hashing and equality methods to Location 2012-07-02 09:08:24 -04:00
Calen Pennington
736148f21d Adding clarifying comment about the contents of 'data' 2012-07-02 09:02:41 -04:00
Calen Pennington
7ac8fecb38 Rename XModule[Descriptor].type to .category to be parallel to Location 2012-07-02 09:01:08 -04:00
Calen Pennington
7b78fa5278 Make self.rerandomize a property accessor that reads from metadata 2012-07-02 08:57:05 -04:00
Calen Pennington
4ae711c421 Clarify from_json arguments 2012-07-02 08:54:23 -04:00
Calen Pennington
32ed18fef6 Allow slightly more latitude in what is passed as the children array 2012-07-02 08:54:13 -04:00
Calen Pennington
cff8ae4623 Add more documentation to XModule 2012-07-02 08:50:56 -04:00
Calen Pennington
6686179bb6 Moving __init__ functions in xmodule to top of class for consistancy 2012-07-01 14:15:02 -04:00
ichuang
ff96fbf5d5 Merge pull request #146 from MITx/cpennington/cms-xml-processing
These changes make xml import into the cms use XModuleDescriptors
2012-07-01 10:55:53 -07:00
Calen Pennington
e61946dfea Fix titles in sequence module display 2012-07-01 13:52:06 -04:00
ichuang
8467aa0846 fix dev_edx4edx mako path - add EDX4EDX_ROOT 2012-07-01 17:44:04 +00:00
Calen Pennington
19a958a3d4 Renaming keystore to modulestore for clarity 2012-07-01 13:33:32 -04:00
ichuang
5f4a27d6cc typo 2012-07-01 13:17:57 -04:00
ichuang
b3cc34c3d4 add debugging to courseware debug (tricky with https behind gunicorn) 2012-07-01 13:16:09 -04:00
ichuang
d28ad6ced8 lms/envs/edx4edx_aws update 2012-07-01 12:53:31 -04:00
ichuang
23128ced67 courseware views now goes to default chapter and section if unprovided
- uses multicourse settings (default_chapter and default_section)
  - it would be nice to use course_settings instead, but that is not
    currently compatible with multicourse
2012-07-01 12:51:14 -04:00
ichuang
7e25e30ac1 Merge branch 'master' of github.com:MITx/mitx into stable-edx4edx 2012-07-01 12:26:04 -04:00
pmitros
81a1dd8975 Merge pull request #151 from MITx/course_settings_json
Course settings is in json, not python
2012-06-30 04:30:47 -07:00
ichuang
7f4ebcb6a9 pep8 fixes - inputtypes 2012-06-29 23:22:40 -04:00
ichuang
fedf216bde Exception, err -> Exception as err 2012-06-29 23:18:58 -04:00
ichuang
547e19625a exception as err 2012-06-29 23:09:26 -04:00
Bridger Maxwell
baa2c06803 Got history and view revision working on wiki. 2012-06-29 20:53:36 -04:00
ichuang
0f1ae7f03b Merge branch 'master' of github.com:MITx/mitx into stable-edx4edx 2012-06-29 16:22:49 -04:00
ichuang
14745893b7 add edx4edx root stuff from aws config to dev_ike config 2012-06-29 15:47:49 -04:00
ichuang
735833c135 Merge branch 'stable-edx4edx' of github.com:MITx/mitx into stable-edx4edx 2012-06-29 14:50:47 -04:00