Commit Graph

2418 Commits

Author SHA1 Message Date
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
Calen Pennington
19a958a3d4 Renaming keystore to modulestore for clarity 2012-07-01 13:33:32 -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
Calen Pennington
99ae0c2041 Import logging where needed 2012-06-29 13:16:04 -04:00
Calen Pennington
87d80835c0 Initialize StudentModule with the max_score 2012-06-29 12:45:46 -04:00
Calen Pennington
f25478b3d4 Consolidate access to metadata, and allow some of it to be inherited between modules 2012-06-29 12:45:46 -04:00
Calen Pennington
2a9eba3886 Removing content_parser 2012-06-29 12:45:46 -04:00
Calen Pennington
c7f95695c5 Fix check_course command 2012-06-29 12:45:46 -04:00
Calen Pennington
3a26b98027 Remove errant print line left over from debugging 2012-06-29 12:45:18 -04:00
Calen Pennington
3fdae56a27 Remove dead code 2012-06-29 12:45:18 -04:00
Calen Pennington
d7ee03874d Make staff histograms work again 2012-06-29 12:45:18 -04:00
Calen Pennington
c837cf797d Remove some unused code from content_parser 2012-06-29 12:45:18 -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
27b75ca76e Use display_name in sequence title bar 2012-06-29 12:45:18 -04:00
Calen Pennington
506c281bcc Make gradesheet work again 2012-06-29 12:45:18 -04:00
Calen Pennington
35af8101d7 Make grade graph on profile work correctly 2012-06-29 12:45:18 -04:00
Calen Pennington
23195e9d76 Make user profiles work again after the switch to an XMLModuleStore. Staff user histograms are still broken 2012-06-29 12:45:17 -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
7d16dbbcb4 Clean up module_render.py 2012-06-29 12:42:48 -04:00
Calen Pennington
bae90ab16d Make custom tags work in the LMS 2012-06-29 12:42:48 -04:00
Calen Pennington
c140fe8766 Get problem execution working with problems read from keystore 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
6987349561 Make icons show up in sequences containing verticals that contain videos 2012-06-29 12:40:51 -04:00
Calen Pennington
c6b477c815 Use html safe IDs for sequences and videos 2012-06-29 12:40:50 -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
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
d02abac820 Restrict the set of characters allowed in locations further 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