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
Don Mitchell
96a7db62cd
Fixed time picker race condition for grace period. Still quirky in that
...
in rounds down times from :01-:09 to :00 (and perhaps others). I think
that's a bug or setting in timepicker.
2013-01-09 17:55:02 -05:00
Don Mitchell
d1c888b119
Put init code in a document ready event handler.
2013-01-09 16:37:45 -05:00
cahrens
b3d168b6f2
Make editor names consistent.
2013-01-09 16:20:38 -05:00
Brian Talbot
e725087122
studio - removing unused scrollTo plugin reference from base template
2013-01-09 15:05:07 -05:00
Brian Talbot
7921b32b63
studio - set viewport to scroll to bottom of component type list in component editor
2013-01-09 15:04:20 -05:00
cahrens
1252181fe1
Code review cleanup.
2013-01-09 14:11:13 -05:00
Brian Talbot
19fa439326
studio - firming up section-wide collapsing/expanding functionality
2013-01-09 12:31:32 -05:00
Don Mitchell
144c6bca8b
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
2013-01-09 11:38:23 -05:00
Don Mitchell
fff9afdeb8
Minor cleanups
2013-01-09 11:38:01 -05:00
cahrens
31f9084b61
Tom cruft to be deleted.
2013-01-09 11:12:52 -05:00
cahrens
64387a4f0c
Tom cruft to be deleted, problem editor CSS moved to correct location.
2013-01-09 11:06:18 -05:00
cahrens
67b72a92bc
Merge remote-tracking branch 'origin/feature/cas/speed-editor' into feature/cas/speed-editor
2013-01-09 10:50:16 -05:00
cahrens
5daa6e7b73
Tom cruft to be deleted.
2013-01-09 10:49:59 -05:00
Don Mitchell
b8f530e865
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
2013-01-09 10:49:20 -05:00
Don Mitchell
2d8ddb0dcb
Ever slightly more rigorous test. actually look for the markdown field
...
in the model as well as the ancillary info
2013-01-09 10:47:03 -05:00
Don Mitchell
62a70170cf
Updated unit test for the create operation related to bug 107
2013-01-09 09:55:50 -05:00
Don Mitchell
2019c9d037
Bug 107
2013-01-09 09:47:43 -05:00
cahrens
d53669fcb9
Merge branch 'feature/cale/cms-master' into feature/cas/speed-editor
2013-01-09 09:41:35 -05:00
cahrens
b704645f99
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
2013-01-09 09:40:34 -05:00
cahrens
b97955965a
Warn user when going to XML Editor. Cleanup and comments.
2013-01-09 09:39:46 -05:00
Don Mitchell
21f5c2d89a
Merge pull request #1240 from MITx/feature/zoldak/cms-bdd-testing
...
Set up the framework for running lettuce tests against studio
2013-01-09 06:30:03 -08:00
chrisndodge
2b87940828
Merge pull request #1241 from MITx/bug/dhm/jan13
...
Fix iframe conversion problem (111)
2013-01-09 06:14:27 -08:00
chrisndodge
21fc7340d6
Merge pull request #1243 from MITx/fix/cdodge/missing-setting-for-cms
...
add required video setting
2013-01-09 06:12:50 -08:00
Chris Dodge
b8074b8bb4
add required video setting
2013-01-09 09:11:43 -05:00
Brian Talbot
2a1e102fca
studio - resolving merge conflict with cms/templates/unit.html
2013-01-09 08:56:58 -05:00
