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
cahrens
c7feee5b67
Delete speed-editor.js and cruft from unit.html.
2013-01-08 15:39:45 -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
cahrens
bc10d080df
Save work
2013-01-08 13:39:16 -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
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
b4312cbfef
Starting the markdown editor.
2013-01-03 13:39:01 -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
Brian Talbot
7b75703556
resolving Sass issues caused by previous merge conflict resolution in branch
2013-01-03 11:44:09 -05:00
cahrens
e60230dd5a
More deletion
2013-01-03 11:21:01 -05:00
cahrens
b91e85c09f
Remove tiny_mce.
2013-01-03 10:53:42 -05:00
Don Mitchell
4f32d5f34d
Merge commit 'af908104df8d18555ed2804b2e7f70577844de16' into feature/cas/speed-editor
...
Conflicts:
cms/static/sass/_assets.scss
cms/static/sass/_base.scss
cms/static/sass/_unit.scss
cms/templates/unit.html
2013-01-02 17:39:27 -05:00
Brian Talbot
a5aafc42ad
studio - resolved unit editing bug where larger images would overflow out of editing visual area
2013-01-02 12:58:59 -05:00
Brian Talbot
ed3f3b02d6
studio - course export UI alpha - roughing in states/views
2012-12-26 09:10:05 -05:00
Don Mitchell
d66f33956e
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into bug/dhm/dec12
2012-12-19 17:31:30 -05:00
Don Mitchell
e37180e074
Generalized the grader drop down and applied to edit_subsection
2012-12-19 17:31:06 -05:00
Don Mitchell
14330ebc4a
Merge pull request #1187 from MITx/feature/christina/misc
...
Fix for Studio #87 , plus some cleanup.
2012-12-19 14:03:05 -08:00
cahrens
61c19dbc70
Fix for Studio #87 , plus some cleanup.
2012-12-19 16:55:39 -05:00
Jay Zoldak
b19aa06540
Fix broken jasmine tests for CMS. All (11) specs are now passing.
2012-12-19 11:26:36 -05:00
Don Mitchell
b5fd6c9012
Send back error to client if failed to save malformed update and have it
...
show an alert.
2012-12-18 15:22:07 -05:00
Don Mitchell
0192a04b20
Fixed course_info parsing bug.
...
Addressed some of Christina's review comments.
2012-12-18 14:28:53 -05:00
Don Mitchell
5709ff34f5
Refactored videos to a much simpler impl b/c about videos don't have
...
speeds and don't use the video/default.yaml format.
2012-12-18 12:46:54 -05:00
Don Mitchell
598922b4cb
Dont' warn about name change on initial creation.
...
Fixed overview to save correctly (not overwrite w/ old value)
2012-12-17 17:22:08 -05:00
Don Mitchell
f7703dadee
Alert for assignment type name change referential integrity.
...
Fixed orphaned graders (manifested as url not defined)
To keep assignment type blur from spamming warnings, I made all blurs
check whether the data changed before doing any other behaviors.
2012-12-17 17:10:56 -05:00
Don Mitchell
7223c8ce13
Found cut/paste error which was causing intermittent bug due to
...
overloaded template name.
2012-12-15 16:36:23 -05:00
Don Mitchell
521fa938b3
Fixed course info bug (and simplified parsing). Incidentally fixed 2
...
other course info bugs (not editing/deleting right element if > 10,
putting new elements at end rather than beginning of list).
Made Location more robust against parsing errors.
2012-12-15 15:56:51 -05:00
chrisndodge
368abbe669
Merge pull request #1165 from MITx/bug/btalbot/pullrequest1160-untangling
...
cms pull request 1160 - CSS resolutions
2012-12-15 11:50:07 -08:00
Brian Talbot
2ee488733c
cms pull request 1160 - brought back all css changes lost in this request - mostly overview related
2012-12-15 00:25:29 -05:00
Don Mitchell
2a353068ab
Merge pull request #1163 from MITx/feature/christina/misc
...
Feature/christina/misc
2012-12-14 14:29:53 -08:00
Christina Roberts
e57b5b1431
Merge pull request #1160 from MITx/feature/btalbot/cms-gradable
...
Overview page allows user to specify grading policy per subsection
2012-12-14 14:09:28 -08:00
Don Mitchell
ac7b0334a6
Code review changes.
2012-12-14 16:51:40 -05:00
Christina Roberts
dbd9ac6e59
Merge pull request #1162 from MITx/fix/cdodge/security-holes
...
add some permissions asserting
2012-12-14 13:37:12 -08:00
cahrens
e3b302f5fe
Merge branch 'feature/cale/cms-master' into feature/christina/misc
2012-12-14 16:28:50 -05:00
Chris Dodge
ab9b208605
add some permissions asserting
2012-12-14 16:26:15 -05:00
cahrens
808cf8c692
Some JavaScript cleanup (also addresses Studio #60 ).
2012-12-14 16:24:01 -05:00
Brian Talbot
7d1a08d481
pages - made intro text visible again and styled it some
2012-12-14 16:15:01 -05:00
Don Mitchell
0b762fa35f
Remove ability to set gradability at the section level (commented out
...
until we decide the inheritance)
Remove Policy from subsection editor
Commented out Graded as: _____ from subsection settings
Fix menu dismissa
Fix ambiguous selection
2012-12-14 15:19:14 -05:00
Don Mitchell
0fc16dffee
Gradable impl'd for overview page
2012-12-14 12:29:57 -05:00
Brian Talbot
4e152952af
cms settings - revised course overview textarea to display as codemirror field on page load
2012-12-14 11:57:46 -05:00
Brian Talbot
91713cbe18
editing UI - added in preventDefault() to all editing actions on course info
2012-12-14 11:14:09 -05:00
Brian Talbot
c7feaa1373
editing - revised unit editor styling
2012-12-14 10:54:44 -05:00
Christina Roberts
fef3fd871e
Merge pull request #1154 from MITx/feature/dhm/cms-settings
...
Fixed 2nd fn which had regex infinite loop
2012-12-14 06:58:43 -08:00
Don Mitchell
b9d9c7b8c0
Fixed infinite loop in the 2nd video string parser which I'd fixed in
...
the first yesterday. Fixed formatting of compounded video string errors.
2012-12-14 09:48:04 -05:00
Don Mitchell
1eacd5e346
Fix infinite loop in videosourceSample. Had fixed same one in
...
parse_videosource but neglected to fix this one.
2012-12-14 09:45:25 -05:00
Don Mitchell
6c64032fcf
Overview should be ready to test.
2012-12-14 09:22:54 -05:00
