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 |
|
Brian Talbot
|
f60a9d8d35
|
studio - problem speed editor: tweaking presentation of problem sub menu further
|
2013-01-09 08:54:40 -05:00 |
|
Don Mitchell
|
83b7997d12
|
Added unit tests and generalized a catch
|
2013-01-08 16:43:42 -05:00 |
|
Brian Talbot
|
75447eb80d
|
studio - problem speed editor: revised html and DOM for problem sub menu
|
2013-01-08 15:43:02 -05:00 |
|
cahrens
|
c7feee5b67
|
Delete speed-editor.js and cruft from unit.html.
|
2013-01-08 15:39:45 -05:00 |
|
Don Mitchell
|
1708dc4080
|
Use html rather than xml parsing for course updates
|
2013-01-08 15:13:37 -05:00 |
|
cahrens
|
4ac15daf44
|
Fix formatting.
|
2013-01-08 15:04:48 -05:00 |
|
cahrens
|
f616aecd81
|
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
Conflicts:
common/lib/xmodule/xmodule/js/src/problem/edit.coffee
|
2013-01-08 14:56:59 -05:00 |
|
Jay Zoldak
|
f056f0624d
|
Set up the framework for running lettuce tests against studio
|
2013-01-08 14:44:45 -05:00 |
|
cahrens
|
bc10d080df
|
Save work
|
2013-01-08 13:39:16 -05:00 |
|
Don Mitchell
|
ae4e7815a9
|
CapaDescriptor new unit tests
|
2013-01-08 13:16:38 -05:00 |
|
Don Mitchell
|
6e2b4a07d8
|
Added is_empty to model presented to unit.html
|
2013-01-08 11:18:57 -05:00 |
|
Don Mitchell
|
76f2ef6f7c
|
Empty template now recognized as allowing markdown editing
Save saves markdown and updates the xml
|
2013-01-08 10:53:45 -05:00 |
|
Chris Dodge
|
c7d81cc425
|
be sure to return an instance of the class
|
2013-01-07 16:28:30 -05:00 |
|
cahrens
|
e296d52c7d
|
merge
|
2013-01-07 12:06:12 -05:00 |
|
Don Mitchell
|
12abdbce73
|
Added 'has_markdown' property to templates in unit.html so that we can
differentiate them in the drop down (just added MD to names for
now--brian's doing the official differentiation)
|
2013-01-07 10:55:10 -05:00 |
|
Brian Talbot
|
6b8944ad6b
|
studio - section expanding/collapsing UI - wip
|
2013-01-07 09:07:40 -05:00 |
|
Don Mitchell
|
2e527a6ae0
|
Fixed all regex's in toXml (I hope) and added 2 markdown templates
|
2013-01-04 17:15:44 -05:00 |
|
Brian Talbot
|
ce4994dd94
|
studio - revised course overview section collapse button to toggle collapsing/expanding
|
2013-01-04 13:27:59 -05:00 |
|
cahrens
|
6d732c217b
|
Tabs now showing.
|
2013-01-04 09:04:27 -05:00 |
|
cahrens
|
533f4876b5
|
Rename, add css file.
|
2013-01-03 14:27:32 -05:00 |
|
cahrens
|
b4312cbfef
|
Starting the markdown editor.
|
2013-01-03 13:39:01 -05:00 |
|
cahrens
|
e09a8e4a9b
|
Don't show markdown if it doesn't exist.
|
2013-01-03 12:50:38 -05:00 |
|
cahrens
|
1c886b33cd
|
Get buttons working again (with old behavior).
|
2013-01-03 12:24:17 -05:00 |
|
Brian Talbot
|
439addc130
|
resolving further Sass conflicts within unit editing view styling
|
2013-01-03 11:49:58 -05:00 |
|