Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
11,756 Commits 1 Branch 0 Tags
3ce01882bb50ca06c6270bc05fa92bb8a67dca44
Commit Graph

141 Commits

Author SHA1 Message Date
Don Mitchell
3ea70eac9d Also clean up children after sort saved. 2013-03-20 17:59:24 -04:00
Don Mitchell
af136e75ca Fix bug 249 the ugly way (decerebrate the moronically impotent model) 2013-03-19 18:07:46 -04:00
Will Daly
6b94090e67 Fixed jasmine test issue with cms caused by previous change 
to order of file import.  Introduced static_files list
in files.json (supported in original django_jasmine implementation)
that loads static files before any compiled files.
 2013-03-11 11:27:49 -04:00
cahrens
596de8ab2c Hook up "View Live" buttons and get "New Static Tab" working again. 2013-02-19 11:34:41 -05:00
Jay Zoldak
c590c24e25 Add vendor files to files.json for the cms jasmine tests to work. 2013-01-31 13:48:38 -05:00
Don Mitchell
f257f12124 Meant to add the file here 2013-01-31 12:56:18 -05:00
Christina Roberts
91b3a220b8 Merge pull request #1367 from MITx/fix/cdodge/static-tab-reordering 
support reordering of static tabs in studio
 2013-01-30 08:51:36 -08:00
Chris Dodge
7f32aae47d rename method to something that actually better reflects what it is doing. Also rename a variable to help with readability 2013-01-30 11:50:11 -05:00
Jay Zoldak
c3eba0d2da Add RequireJS.js to files.json so that the cms jasmine tests will run without erroring when importing RequireJS. 2013-01-29 16:22:37 -05:00
Chris Dodge
28a2dd9a18 support reordering of static tabs in studio 2013-01-28 16:33:28 -05:00
Don Mitchell
c05d887904 Handle metadata from save being empty 2013-01-11 10:39:57 -05: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
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
5daa6e7b73 Tom cruft to be deleted. 2013-01-09 10:49:59 -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
cahrens
1c886b33cd Get buttons working again (with old behavior). 2013-01-03 12:24:17 -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
Jay Zoldak
b19aa06540 Fix broken jasmine tests for CMS. All (11) specs are now passing. 2012-12-19 11:26:36 -05:00
Tom Giannattasio
2be1f852e7 clean up of users page 2012-12-13 11:28:59 -05:00
Tom Giannattasio
75c4909785 added modal cover for editors 2012-12-13 11:28:59 -05:00
Tom Giannattasio
d7b3f28d17 reworked add component steps 2012-12-13 11:28:59 -05:00
Tom Giannattasio
5b81d6b8cc cleaned up subsection and unit page 2012-12-13 11:28:59 -05:00
Tom Giannattasio
052b6f695a cleaned up editor styles; cleaned up static tabs page 2012-12-13 11:26:10 -05:00
Chris Dodge
79e48dde97 move the underscore tempaltes to /static/client-templates and update the references 2012-12-10 10:01:08 -05:00
Chris Dodge
130de49b49 support the editing of course handouts via a generic editor until we have implemented the Rich HTML editor completed 2012-12-07 09:45:12 -05:00
Tom Giannattasio
63e38822bd course handouts styled and basic view handling added 2012-11-30 10:41:10 -05:00
Tom Giannattasio
335c6949f8 started consolidating editor functions 2012-11-30 10:41:10 -05:00
Tom Giannattasio
5dd90aa9cb working on date picker; conflicts with ids 2012-11-30 10:41:10 -05:00
Tom Giannattasio
3d9961f874 started adding date picker 2012-11-30 10:41:10 -05:00
Tom Giannattasio
46d4e27cdc update styles fixed; tweaks to white button mixins; add update to top of list; render updates upon save 2012-11-30 10:41:10 -05:00
Don Mitchell
0b7bff4c3f Everything tested and ready for Tom to fix 2012-11-30 10:40:19 -05:00
Don Mitchell
111e8521db Hopefully the course-info changes I had made w/o link destruction 2012-11-30 10:40:19 -05:00
Tom Giannattasio
c7dbdc1242 added asset button to visual editor 2012-11-20 07:19:35 -05:00
Tom Giannattasio
10a4d4ec25 tiny mce styling 2012-11-20 07:19:34 -05:00
Tom Giannattasio
b38072207e primary tiny mce integration 2012-11-20 07:19:34 -05:00
Tom Giannattasio
9c3c72ad3c discussion editor and preview added; string response glitch fixed 2012-11-20 07:19:34 -05:00
Tom Giannattasio
daea87ebb9 simple html editor added 2012-11-20 07:19:34 -05:00
Tom Giannattasio
f2eb665626 cheatsheet and advanced settings added 2012-11-20 07:19:34 -05:00
Tom Giannattasio
44fb9561e8 added a ton of speed editor goodness 2012-11-20 07:19:33 -05:00
Chris Dodge
b432db1aba Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/static-tab-edit 2012-11-08 09:55:56 -05:00
Chris Dodge
7dbabce4db fix up styling by reusing existing CSS class names. Also refactor some code regarding the management of static_tabs so that it's in the course as course contains references to static_tabs in the current data model 2012-11-08 09:55:52 -05:00
chrisndodge
e3d65a0c08 Merge pull request #997 from MITx/feature/cale/js-tests 
Feature/cale/js tests
 2012-11-08 06:44:49 -08:00
Chris Dodge
a99277275d add new files 2012-11-07 15:56:16 -05:00
Chris Dodge
afd8584569 remove explicit 'null' for child collection on saveName on unit code paths. I had seen cases where save was posting back an empty set on renames - deleting the components. But I can no longer reproduce it now. 2012-11-07 09:34:44 -05:00
Chris Dodge
a9c4493a70 always make the spinner spin on unit renames 2012-11-05 12:26:44 -05:00
Chris Dodge
6b45b4c741 bind the disabling/enabling of the unit name input field based on whether the page state is public or not. We shouldn't be able to edit when public. 2012-11-05 12:02:08 -05:00
Calen Pennington
255720abd7 Clean old javascript tests from CAS 2012-10-31 13:21:36 -04:00
Calen Pennington
3d9c92c574 Remove references to #visibility id that was changed to .visibility-select 2012-10-26 13:34:21 -04:00
Calen Pennington
bd1233d38c Only update data in modules that have been set when passing into save_item, and don't force callers to set everything 2012-10-25 13:56:24 -04:00