Don Mitchell
70e5344949
Merge pull request #1256 from MITx/fix/cdodge/import-ordering-error
...
make sure we commit the course module first when importing. There's a sn...
2013-01-10 10:40:30 -08: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
Chris Dodge
76059b52e7
make sure we commit the course module first when importing. There's a sneaky little ordering dependency where we can't save a static tabe until the course module has been saved. This is because - when saving a static tab - we have to scribble on the course module's metadata to point to it.
2013-01-10 13:24:40 -05: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
e5d73107bd
Merge pull request #1254 from MITx/bug/dhm/jan13
...
update timepicker to fix minutes bug
2013-01-10 09:25:38 -08: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
Don Mitchell
04582f4e7c
Update timepicker b/c it wasn't handling minutes from 01-09 and they'd
...
fixed it
2013-01-10 11:05:14 -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
chrisndodge
171d4c34b0
Merge pull request #1250 from MITx/bug/dhm/jan13
...
Fixed time picker race condition for grace period. Still quirky in that
2013-01-09 17:39:02 -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
Don Mitchell
7f836e77a7
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
2013-01-09 16:28:36 -05:00
Don Mitchell
35e353e06b
Oops, xxp was going to (x) xp :-( now ( ) xxp :-)
2013-01-09 16:28:25 -05:00
cahrens
2caa5a518f
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
2013-01-09 16:20:51 -05:00
cahrens
b3d168b6f2
Make editor names consistent.
2013-01-09 16:20:38 -05:00
Christina Roberts
700ae5bf53
Merge pull request #1248 from MITx/fix/cdodge/discussion-boards
...
change over the 'get all discussion models' to use get_items() which is ...
2013-01-09 13:19:00 -08:00
Don Mitchell
603c6ce296
Get rid of extra space at beginning of markdown for templates
2013-01-09 16:17:58 -05:00
Chris Dodge
d4f30b378e
remove commented out line and add a new comment. also remove debugging trace output
2013-01-09 16:05:09 -05:00
Don Mitchell
d0e06e1a35
With improved unit tests to test machavellian (sic) patterns
2013-01-09 16:03:09 -05:00
Chris Dodge
e11706ef07
change over the 'get all discussion models' to use get_items() which is better supported in Mongo-backed stores
2013-01-09 15:53:22 -05:00
Don Mitchell
373c8eb2a7
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
2013-01-09 15:36:28 -05:00
Don Mitchell
8245ebac83
On menu based markdown conversion,
...
be picky about x as marker for correct requiring it to be first
non-whitespace char on line, followed by whitespace, followed eventually
but another non-whitespace char
strip trailing newline from selection.
2013-01-09 15:36:16 -05:00
cahrens
71ee11bfb0
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
2013-01-09 15:10:56 -05:00
cahrens
914132f802
remove tiny mce link CSS
2013-01-09 15:10:41 -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
Don Mitchell
cc4482b4c9
Merge pull request #1245 from MITx/feature/cdodge/cache-toc
...
add some simple in-mem caching for course TOC. This is a problem when ru...
2013-01-09 08:01:38 -08: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
Chris Dodge
9b72d11473
add some comments to the change
2013-01-09 10:47:29 -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
chrisndodge
8760e7669e
Merge pull request #1244 from MITx/bug/dhm/jan13
...
Bug 107: create update not working
2013-01-09 07:42:20 -08:00
Chris Dodge
fd600e5be2
add some simple in-mem caching for course TOC. This is a problem when running against Mongo since courses are created/disposed very frequently
2013-01-09 10:38:32 -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
