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

2381 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
19044abed2 Run tests before running code quality checks (for faster turnaround time) 2012-06-28 11:29:46 -04:00
Calen Pennington
919f8cf261 Import x_module using the full path 2012-06-28 11:28:42 -04:00
Calen Pennington
2fde7f4c6d Minor fixes from pull request 131 2012-06-28 08:39:12 -04:00
ichuang
6f5e54b9de Merge pull request #147 from MITx/ps-fix-problem 
Queue up MathML conversion to be after render
 2012-06-27 16:21:17 -07:00
Bridger Maxwell
bf4f946f0d Put in a fix for the Profile page (a bug was showing up for new users). A basecamp discussion will be started on the issue. 2012-06-27 14:47:16 -04:00
Prem Sichanugrist
4db0a70166 Fix code convention 2012-06-26 16:35:44 -04:00
Prem Sichanugrist
4580ef89d4 Queue up MathML conversion to be after render 
From https://www.pivotaltracker.com/story/show/31700967
Fixes #137
 2012-06-26 16:35:44 -04:00
Prem Sichanugrist
7475e415a4 Fix test failure after progress introduction 2012-06-26 16:35:44 -04:00
Kyle Fiedler
6c95bfc175 Fix hover on textbook buttons 2012-06-26 15:18:17 -04:00
Kyle Fiedler
fc81cf75c1 fixed padding issue on seq nav 2012-06-26 14:56:28 -04:00
Calen Pennington
65c8396eab Merge pull request #140 from MITx/kf-html-edit 
Kf html edit
 2012-06-26 11:51:19 -07: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
David Ormsbee
084c4875be Merge pull request #144 from MITx/kf-seq-nav 
Added new styles for the sequence nav including completeness
 2012-06-26 11:34:54 -07:00
David Ormsbee
2ec12f59c7 Merge pull request #145 from MITx/kf-sidebar-buttons 
Added fix for the sidebar buttons in the courseware
 2012-06-26 11:34:36 -07:00
Kyle Fiedler
10c1270b8a Added fix for the sidebar buttons in the courseware 2012-06-26 14:31:04 -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
Kyle Fiedler
aee2cf4ed5 Added new styles for the sequence nav including completeness 2012-06-26 14:09:57 -04:00
Calen Pennington
f0cf323488 Handle chapters as sequence modules 2012-06-26 12:15:03 -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
Prem Sichanugrist
3f9554f20b Merge pull request #141 from MITx/ps-player-slider 
Scroll the caption upon video seeking
 2012-06-26 07:32:06 -07: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
Prem Sichanugrist
d9d6f9b749 Introduce rake cms:import task to import data 
Usage: `rake cms:import DATA_DIR=<path_to_your_data_dir>`
 2012-06-25 16:38:06 -04:00
Calen Pennington
5b4c501a71 Merge remote-tracking branch 'origin/kf-html-edit' into cpennington/cms-xml-processing 2012-06-25 16:06:37 -04:00
Prem Sichanugrist
05f4e4fb38 Scroll the caption upon video seeking 2012-06-25 12:22:37 -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