cahrens
77865f7ab2
Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce
2013-01-17 14:22:18 -05:00
cahrens
5f05ec83f1
Change the div being used to create code mirror to a textarea-- just make sure to escape the content! Update tests accordingly.
2013-01-17 13:11:47 -05:00
Don Mitchell
ebb2976332
Merge pull request #1298 from MITx/feature/christina/misc
...
Escape text being passed to markdown editor, delete copied (and unused) JS code
2013-01-17 07:50:43 -08:00
cahrens
d07a9203d1
in progress
2013-01-17 09:10:23 -05:00
chrisndodge
358c56da9e
Merge pull request #1297 from MITx/fix/cdodge/filesystem-xml-fixes
...
Fix/cdodge/filesystem xml fixes
2013-01-17 05:55:22 -08:00
cahrens
bc80779f6f
Fix bug related to creation of thumbnails for non-image files.
...
https://edx.lighthouseapp.com/projects/102637-studio/tickets/139-uploads-of-non-images-dont-have-reasonable-icon#ticket-139-2
2013-01-16 15:40:14 -05:00
Brian Talbot
e8ba078d4e
studio HTML editor - codemirror/tinymce toggle work - wip
2013-01-16 14:54:28 -05:00
cahrens
d4f79c0498
Fix bug related to img link for non-img files.
...
https://edx.lighthouseapp.com/projects/102637-studio/tickets/135-via-tender-studio-asset-locker-currently-returns-incorrect-xml-snippet
2013-01-16 13:51:17 -05:00
cahrens
65d45d6dee
Minor cleanup.
2013-01-16 09:57:21 -05:00
cahrens
07d6bee5a7
storing work
2013-01-16 09:53:28 -05:00
cahrens
9818664bb1
storing work
2013-01-15 16:04:34 -05:00
cahrens
0461407857
Proposed changes to fix asset caching bug.
2013-01-15 11:45:08 -05:00
Chris Dodge
1cb2a6724d
add some additional logging for optional verbosity
2013-01-14 22:31:21 -05:00
cahrens
29f49895d3
Pretty much works.
2013-01-14 15:41:12 -05:00
cahrens
db9875758f
Saving work.
2013-01-14 15:41:12 -05:00
cahrens
c4ec8ead4a
Work in progress, related to rich HTML editor.
2013-01-14 15:41:12 -05:00
Calen Pennington
f91a5f0e23
Merge pull request #1273 from MITx/fix/cdodge/filesystem-xml-fixes
...
Fix/cdodge/filesystem xml fixes
2013-01-14 09:34:25 -08:00
Chris Dodge
b5776a775e
add another assert test
2013-01-14 12:17:51 -05:00
Chris Dodge
edb913f6ac
add tests for about content overrides
2013-01-14 12:12:40 -05:00
Christina Roberts
c9c9f7e54f
Merge pull request #1268 from MITx/feature/cas/speed-editor
...
menu bar for heading and explanation
2013-01-14 06:39:07 -08:00
Brian Talbot
e82987a32d
problem editor - revised classes on editor cheatsheet text and explanation tooltip text
2013-01-14 09:37:38 -05:00
chrisndodge
fdba0e48dc
Merge pull request #1270 from MITx/bug/dhm/jan13
...
Fixed bug 114: randomized problems never right b/c state not preserved
2013-01-14 06:21:47 -08:00
Brian Talbot
11656feba3
one last style tweak to problem header styling
2013-01-13 13:10:29 -05:00
Brian Talbot
2429192765
resolved problem headers/general H1 elements floating by default in component views
2013-01-13 13:07:11 -05:00
Brian Talbot
1cf5e10a34
revised cheatsheet markdown, fixed height + added vertical scroll, and replaced explanation example in sheet
2013-01-13 12:47:30 -05:00
Brian Talbot
04e9447367
added in icons for header and explanation markdown elements
2013-01-13 12:15:29 -05:00
Don Mitchell
1bf2cdd528
Changed order of buttons to match order of cheat sheet
2013-01-11 17:01:50 -05:00
Don Mitchell
06aa4a553e
Correct file name case (which I thought mac os would catch :-(
2013-01-11 16:53:23 -05:00
Don Mitchell
7d8276b6c5
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
2013-01-11 16:52:10 -05:00
Don Mitchell
208ed0a438
Fixed bug 114: randomized problems never right b/c state not preserved
...
on server
2013-01-11 16:48:19 -05:00
cahrens
a4b6851e6c
Remove some dead css.
2013-01-11 16:11:09 -05:00
Don Mitchell
5920142f71
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
2013-01-11 15:05:30 -05:00
Don Mitchell
755bf709a5
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
2013-01-11 14:44:38 -05:00
Chris Dodge
9479ef3c84
fix up call signatures for get_parent_locations()
2013-01-11 14:29:53 -05:00
Brian Talbot
7d445f5630
studio - tweaking problem editor's advanced editor toggle control UI and prompt message
2013-01-11 14:25:22 -05:00
Brian Talbot
e7e26a471c
studio - changed expectation of lettuce test for course overview section toggling
2013-01-11 12:03:17 -05:00
Don Mitchell
c05d887904
Handle metadata from save being empty
2013-01-11 10:39:57 -05:00
Don Mitchell
64507bd5fd
Drop down for markup done but w/o new icons
2013-01-11 10:36:42 -05:00
chrisndodge
5368a9ad3e
Merge pull request #1252 from MITx/feature/cale/lms-mongo-perf
...
Decrease the number of queries needed for LMS courseware
2013-01-11 07:23:00 -08:00
Don Mitchell
d53ca05d6c
Placeholder images for cheat sheet
2013-01-11 09:37:08 -05:00
Don Mitchell
e095a139b9
Cheat sheet updated for header and explanation. Video removed.
2013-01-11 09:36:29 -05:00
Jay Zoldak
64e8f9c0cd
Add BDD lettuce tests for studio overview toggle section feature.
2013-01-10 16:00:40 -05:00
Calen Pennington
89a0b82e5c
Decrease the number of queries needed for LMS courseware
...
This cuts the number of queries in 6.002 courseware loads from ~650 to
~5-40. Still to do: cache CustomTag templates so that we only load them
once per request.
2013-01-10 13:55:46 -05:00
cahrens
993d59b230
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
2013-01-10 13:50:57 -05:00
cahrens
58837066b0
A couple renames.
2013-01-10 13:50:21 -05:00
Christina Roberts
a7887721af
Merge pull request #1255 from MITx/bug/btalbot/unit-editing
...
Moving Static Component View Under Modal While Editing
2013-01-10 10:35:31 -08:00
Brian Talbot
4128f37a1f
studio - moving a component's static view visually below modal while editing
2013-01-10 13:18:26 -05:00
Christina Roberts
b3af587ba0
Merge pull request #1247 from MITx/feature/btalbot/cms-sectiontoggling
...
Course Overview Section Collapse/Expand Toggling
2013-01-10 09:04:26 -08:00
cahrens
bcafc5fdfb
Bug fix for modal cover not going way when click outside of edit ( #106 ).
2013-01-10 11:07:11 -05:00
chrisndodge
ee9b9d0422
Merge pull request #1249 from MITx/feature/cas/speed-editor
...
Feature/cas/speed editor
2013-01-09 17:52:46 -08:00
