ichuang
557b79129b
added image, solution, showhide examples to latex_problem template;
...
fixed x_module.py to only load *.yaml files as templates
TODO: Note that bad templates cause the CMS not to load; it should throw
exceptions instead of dying.
2012-10-14 23:26:46 -04:00
ichuang
a8cbcca9ab
fix HTML display of math (it wasn't queueing mathjax)
2012-10-14 22:14:51 -04:00
ichuang
50f665311e
update latex template problem; add template adaptive hint problem
2012-10-14 21:28:25 -04:00
ichuang
8742ba76a3
improved latex problem template; hls codemirror box autosizes height;
...
capa responsetypes can now include "inline='1'" for their span to be inline
2012-10-14 20:19:14 -04:00
ichuang
12869ecedd
fix hls modal window style (it now autosizes properly)
2012-10-14 17:48:45 -04:00
ichuang
69bfdac49f
minor change in dev_ike for cms-master
2012-10-14 16:58:11 -04:00
ichuang
09d7d6d688
add AUTH_USE_MIT_CERTIFICATES feature flag to CMS, and @ssl_login_shortcut
2012-10-14 16:40:04 -04:00
ichuang
92f329ca1a
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/ichuang/cms-input-filter-latex2edx
2012-10-14 16:36:40 -04:00
chrisndodge
f4b61e8f47
Merge pull request #901 from MITx/fix/cdodge/multiple-choice
...
remove the — from the HTML, this apparently is causing the CAS and...
2012-10-14 12:44:49 -07:00
Chris Dodge
d34075ff89
remove the — from the HTML, this apparently is causing the CAS and LMS to barf on staging, but strangly not on dev
2012-10-14 15:43:16 -04:00
chrisndodge
f845cc4e08
Merge pull request #898 from MITx/fix/cdodge/multiple-choice
...
remove HTML comment from schematiceditor template
2012-10-13 20:44:06 -07:00
Chris Dodge
8f1336d87a
remove HTML comment from schematiceditor template
2012-10-13 23:27:37 -04:00
ichuang
db8f69d497
fix tabs in latex_html.yaml template
2012-10-13 23:10:51 -04:00
ichuang
bf959d8fc3
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/ichuang/cms-input-filter-latex2edx
2012-10-13 22:54:14 -04:00
ichuang
f846f4c2ad
add import filter capability to html & problem editing; provides latex2edx interface
2012-10-13 22:33:41 -04:00
chrisndodge
bdbeec9ad5
Merge pull request #895 from MITx/fix/cdodge/multiple-choice
...
fix exception in LMS when rendering newly create multiple choice problem...
2012-10-13 19:21:21 -07:00
Chris Dodge
444d4b1054
fix exception in LMS when rendering newly create multiple choice problems. The capa module is barfing on the HTML comment which was in there and the XML parser couldn't handle it.
2012-10-13 22:19:48 -04:00
chrisndodge
1b4f569c08
Merge pull request #894 from MITx/fix/cdodge/cas-bugs
...
Fix/cdodge/cas bugs
2012-10-13 18:53:48 -07:00
Chris Dodge
13e23cbbab
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into fix/cdodge/cas-bugs
...
Conflicts:
cms/templates/widgets/header.html
2012-10-13 21:49:05 -04:00
chrisndodge
91fe7da44a
Merge pull request #883 from MITx/fix/cale/edge-bugs
...
Fix/cale/edge bugs
2012-10-13 18:46:05 -07:00
Chris Dodge
ebf6d74776
Merge branch 'feature/cale/cms-master' into fix/cale/edge-bugs
...
Conflicts:
cms/static/js/base.js
2012-10-13 21:44:15 -04:00
Chris Dodge
258a467fa6
make delete unit delete both the draft and non-draft versions
2012-10-13 20:55:49 -04:00
Chris Dodge
271fa6956a
save_item should also do proper 'is this element draft aware' logic so that incorrect versioning occurs on elements which do not support versioning at this point in time (aka courses, sections, and subsections).
2012-10-13 18:53:32 -04:00
Chris Dodge
cbc619f8af
hack patch to at least keep the unit.html page from blowing up
2012-10-13 16:09:33 -04:00
Chris Dodge
2e43d2ebcc
don't display a broken thumbnail image if a thumbnail is not available
2012-10-13 15:43:50 -04:00
Chris Dodge
f1517fefa6
hide search button on asset index page
2012-10-13 10:45:52 -04:00
Chris Dodge
8151b1030f
remove wip on Import header button
2012-10-13 10:42:49 -04:00
chrisndodge
edb31c97b6
Merge pull request #890 from MITx/feature/cdodge/cas-new-course
...
Feature/cdodge/cas new course
2012-10-12 18:34:40 -07:00
ichuang
73477ec1bf
reset_problem in capa_module should always return dicts not strings
2012-10-12 21:06:15 -04:00
Chris Dodge
a12baec599
add new files
2012-10-12 20:55:16 -04:00
Chris Dodge
a58e6ce9e4
create course. Quick review on import. Add progress bar stuff to import as well as redirect
2012-10-12 20:54:27 -04:00
Chris Dodge
26e735b178
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cas-new-course
2012-10-12 16:11:59 -04:00
Chris Dodge
4e4b6accda
wip: create new course
2012-10-12 16:11:55 -04:00
Calen Pennington
64240c441f
Add date display when subsection date is set and section date isn't
2012-10-12 16:00:03 -04:00
Calen Pennington
623c756b9f
Enable section and subsection reordering (with no drag between them)
2012-10-12 15:59:46 -04:00
Calen Pennington
a160f6144f
Fix date display in unit page
2012-10-12 15:16:44 -04:00
Calen Pennington
4005cbf455
Hide/show wips w/ press of 'w' key
2012-10-12 15:11:02 -04:00
Calen Pennington
607b99dece
Make separate links for lms_preview and lms as needed
2012-10-12 15:03:06 -04:00
Calen Pennington
d10f56dd08
Only try to remove a directory if it exists during import
2012-10-12 14:10:32 -04:00
Calen Pennington
fb48a4fb8f
Remove scheme on jquery.form.js load so that it works over https
2012-10-12 14:02:51 -04:00
Calen Pennington
ab913cb5ac
Fix edit_unit header to point to the correct course module
2012-10-12 13:22:53 -04:00
Calen Pennington
90a847cb26
Fix context course on edit subsection
2012-10-12 13:19:25 -04:00
Calen Pennington
0e277277a8
Merge pull request #881 from MITx/fix/cdodge/cas-thumbnail-exception-handling
...
swallow exceptions when generating thumbnails
2012-10-12 10:12:36 -07:00
Chris Dodge
d31a7c6d6b
log and continue on thumbnail generation exception
2012-10-12 13:11:55 -04:00
Chris Dodge
78df26605d
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into fix/cdodge/cas-thumbnail-exception-handling
2012-10-12 13:03:02 -04:00
chrisndodge
5aa474a10d
Merge pull request #879 from MITx/feature/cale/cas-import-ui
...
Feature/cale/cas import ui
2012-10-12 10:02:43 -07:00
Calen Pennington
c70f29e83a
Wire up import to the frontend, and make sure that it puts it into the already extant course
2012-10-12 12:40:03 -04:00
Chris Dodge
b17836f232
swallow exceptions when generating thumbnails
2012-10-12 12:27:21 -04:00
Tom Giannattasio
3d2a1c2493
removed red import button – drawing too much attention; this will be reworked onto a different page at some point anyways
2012-10-12 11:58:43 -04:00
Tom Giannattasio
c7cdaf8080
styled import page
2012-10-12 11:58:43 -04:00
