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

132 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
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
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
Calen Pennington
99ae0c2041 Import logging where needed 2012-06-29 13:16:04 -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
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
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
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
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
2fde7f4c6d Minor fixes from pull request 131 2012-06-28 08:39:12 -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
ichuang
a988452d4d Merge pull request #132 from MITx/kf-problems 
I'll go ahead and merge this, since it fixes nearly all the issues we had with problem and html css, and this should go in before more changes.  The table borders can be fixed in another round.
 2012-06-25 19:14:12 -07:00
David Ormsbee
f041fc4a0b Merge pull request #135 from MITx/cpennington/cms-editing 
Roundtrip HTML module editing working in the CMS
 2012-06-22 10:06:51 -07:00
Calen Pennington
ced9136973 Merge remote-tracking branch 'origin/master' into cpennington/cms-xml-processing 2012-06-22 11:40:19 -04:00
Calen Pennington
72eef72d8b Html Module can now be editing, saved, and re-opened 2012-06-22 10:58:18 -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
82023f6bd3 Added styles for more basic html elements and reworked design of textinput 2012-06-21 15:41:36 -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
Victor Shnayder
f87433e346 folders and a bit of initial test data for xml validation 2012-06-21 15:27:19 -04:00
Victor Shnayder
bf8e70f94e check whether requestcontext exists before access 2012-06-21 11:28:02 -04:00
Victor Shnayder
95806847d0 bugfix: lcp score can apparently be 0/0 2012-06-20 17:20:34 -04:00
Victor Shnayder
5e7535fbfb Progress tracking cleanup. 
* use clearer names for the two status strings passed to js
* add functions to do canonical conversion of progress to js string
* fix updating bug in sequence.coffee
* add some todo comments and other docs to make future expansion easier
 2012-06-20 16:04:03 -04:00
Victor Shnayder
e5a791e031 Add scaffolding comments for progress tracking in video modules. 2012-06-20 16:04:03 -04:00
Calen Pennington
1b7b7e91e4 Merge branch 'master' into cpennington/cms-editing 2012-06-20 15:07:15 -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
e9d5f85745 Merge pull request #115 from MITx/capa-include 
modify capa_problem to add <include file="foo"> functionality
 2012-06-20 07:34:19 -07:00
Calen Pennington
c317521468 Merge pull request #126 from MITx/victor/progress-tracking 
Victor/progress tracking
 2012-06-20 07:33:48 -07:00
Victor Shnayder
e872f31835 minor edits to address Calen's comments. 2012-06-20 10:31:37 -04:00
Calen Pennington
65d02819e8 Merge pull request #124 from MITx/cpennington/cms-pipeline 
Switch cms over to django pipeline
 2012-06-20 05:35:49 -07:00