Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,636 Commits 1 Branch 0 Tags
a4196ffa00a98684d8f77e81d0ca7477e90a4bb9
Commit Graph

584 Commits

Author SHA1 Message Date
cahrens
77865f7ab2 Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce 2013-01-17 14:22:18 -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
29f49895d3 Pretty much works. 2013-01-14 15:41:12 -05: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
06aa4a553e Correct file name case (which I thought mac os would catch :-( 2013-01-11 16:53:23 -05:00
Don Mitchell
c05d887904 Handle metadata from save being empty 2013-01-11 10:39:57 -05:00
Don Mitchell
d53ca05d6c Placeholder images for cheat sheet 2013-01-11 09:37:08 -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
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
Brian Talbot
19fa439326 studio - firming up section-wide collapsing/expanding functionality 2013-01-09 12:31:32 -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
5daa6e7b73 Tom cruft to be deleted. 2013-01-09 10:49:59 -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
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