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
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
968ff7325c
Merge pull request #131 from MITx/victor/xml-testing
...
Victor/xml testing
2012-06-22 08:38:01 -07:00
Kyle Fiedler
9e8f20104c
added styles for ol in html units
2012-06-22 11:17:31 -04:00
Calen Pennington
83b3d51fd2
Wire up the cancel button in the unit editor
2012-06-22 10:58:18 -04:00
Calen Pennington
72eef72d8b
Html Module can now be editing, saved, and re-opened
2012-06-22 10:58:18 -04:00
Kyle Fiedler
f9bb8a701a
Added new readme info and started to rework some of the css
2012-06-22 09:42:22 -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
657fcd9984
Added new styles for html editing and removed a bunch of unused templates
2012-06-21 17:36:21 -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
Kyle Fiedler
184d0ab038
added styles for lists and paragraphs in problems
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
0f52b31ac1
Make the LMS check_course command work again.
2012-06-21 15:23:47 -04:00
Victor Shnayder
da204cf5d8
Started update of check_course script. It runs again now.
...
TODO:
- support picking a different course name
- make it use current module rendering path, get that working.
2012-06-21 11:48:19 -04:00
