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

4005 Commits

Author SHA1 Message Date
Don Mitchell
2ae92cbd88 Added RequireJS to fix expectation that it's included. 
Unit drag and drop works correctly now.
 2013-01-22 17:25:28 -05:00
Brian Talbot
023dadd074 studio - resolved base variable missing issue on lms side 2013-01-22 16:31:42 -05:00
Brian Talbot
fd3ae2c478 studio html editor - matched up styles for <pre> elements 2013-01-22 16:16:30 -05:00
cahrens
731fb209de Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce 
Conflicts:
	cms/static/css/tiny-mce.css
 2013-01-22 16:15:27 -05:00
Brian Talbot
b381881a02 studio html editor - adding in font references to tinyMCE css 2013-01-22 16:05:06 -05:00
Brian Talbot
aec7692d27 studio html editor - revised header styles for editing/displaying HTML components (including separating studio editing chrome from style rules) 2013-01-22 15:51:12 -05:00
Brian Talbot
e3a2749ff8 studio html editor - added in styles for TinyMCE table elements 2013-01-22 15:20:25 -05:00
Don Mitchell
6ce300a3c8 Merge branch 'feature/dhm/drag' of github.com:MITx/mitx into feature/dhm/drag 
Conflicts:
	cms/static/js/base.js
	cms/static/js/hesitate.js
 2013-01-22 11:47:49 -05:00
Don Mitchell
1b64faf610 Caching to change branches for other work 2013-01-22 11:42:23 -05:00
Don Mitchell
48fa4b4a5e Cache in order to try updated sortable lib 2013-01-22 11:39:23 -05:00
Don Mitchell
edda80d485 New style base python classes and basestring type. 2013-01-22 11:30:24 -05:00
Don Mitchell
f10a5c4f83 Oops, forgot new class 2013-01-18 15:21:21 -05:00
Brian Talbot
72fc192f6e studio - adding in LMS synced styles for TinyMCE WYSIWYG preview 2013-01-18 10:24:29 -05:00
Brian Talbot
d2f79f10f0 studio - synced LMS common content styles with HTML component display/edit rendering styles 2013-01-18 09:59:08 -05:00
Brian Talbot
70457176f1 studio - stubbed in basic LMS styling to HTML displaygst 2013-01-17 21:28:14 -05:00
Don Mitchell
30c87be20f Subsection drag between sections should work now. 2013-01-17 17:09:31 -05:00
Brian Talbot
5b82a68c18 studio - removing extra line/whitespace in sass 2013-01-17 17:06:07 -05:00
Brian Talbot
66a3e9621b studio - removed editor type icon and text for all components except for problems 2013-01-17 17:04:28 -05:00
Don Mitchell
ac09e18b9e Now traps out of bounds as implying no change. Seems very slow. 2013-01-17 15:09:23 -05:00
cahrens
77865f7ab2 Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce 2013-01-17 14:22:18 -05:00
cahrens
5f05ec83f1 Change the div being used to create code mirror to a textarea-- just make sure to escape the content! Update tests accordingly. 2013-01-17 13:11:47 -05:00
Don Mitchell
1782c54e68 Merge branch 'feature/dhm/drag' of github.com:MITx/mitx into feature/dhm/drag 2013-01-17 11:23:45 -05:00
Don Mitchell
db4455e6e1 Cache 2013-01-17 11:23:39 -05:00
Don Mitchell
480aa80db3 Cache 2013-01-17 11:23:39 -05:00
Don Mitchell
ebb2976332 Merge pull request #1298 from MITx/feature/christina/misc 
Escape text being passed to markdown editor, delete copied (and unused) JS code
 2013-01-17 07:50:43 -08:00
cahrens
d07a9203d1 in progress 2013-01-17 09:10:23 -05:00
chrisndodge
358c56da9e Merge pull request #1297 from MITx/fix/cdodge/filesystem-xml-fixes 
Fix/cdodge/filesystem xml fixes
 2013-01-17 05:55:22 -08:00
cahrens
bc80779f6f Fix bug related to creation of thumbnails for non-image files. 
https://edx.lighthouseapp.com/projects/102637-studio/tickets/139-uploads-of-non-images-dont-have-reasonable-icon#ticket-139-2
 2013-01-16 15:40:14 -05:00
Brian Talbot
e8ba078d4e studio HTML editor - codemirror/tinymce toggle work - wip 2013-01-16 14:54:28 -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
65d45d6dee Minor cleanup. 2013-01-16 09:57:21 -05:00
cahrens
07d6bee5a7 storing work 2013-01-16 09:53:28 -05:00
cahrens
9818664bb1 storing work 2013-01-15 16:04:34 -05:00
cahrens
0461407857 Proposed changes to fix asset caching bug. 2013-01-15 11:45:08 -05:00
Don Mitchell
244584ce6c DnD for subsections and units (no auto open) 2013-01-15 11:33:11 -05:00
Don Mitchell
e8bcc1729a Merge branch 'feature/cale/cms-master' into feature/dhm/drag 2013-01-15 11:00:41 -05:00
Don Mitchell
3a2c57524f Basic dnd for units 2013-01-15 10:35:20 -05:00
Chris Dodge
1cb2a6724d add some additional logging for optional verbosity 2013-01-14 22:31:21 -05:00
cahrens
29f49895d3 Pretty much works. 2013-01-14 15:41:12 -05:00
cahrens
db9875758f Saving work. 2013-01-14 15:41:12 -05:00
cahrens
c4ec8ead4a Work in progress, related to rich HTML editor. 2013-01-14 15:41:12 -05:00
Calen Pennington
f91a5f0e23 Merge pull request #1273 from MITx/fix/cdodge/filesystem-xml-fixes 
Fix/cdodge/filesystem xml fixes
 2013-01-14 09:34:25 -08:00
Chris Dodge
b5776a775e add another assert test 2013-01-14 12:17:51 -05:00
Chris Dodge
edb913f6ac add tests for about content overrides 2013-01-14 12:12:40 -05:00
Christina Roberts
c9c9f7e54f Merge pull request #1268 from MITx/feature/cas/speed-editor 
menu bar for heading and explanation
 2013-01-14 06:39:07 -08:00
Brian Talbot
e82987a32d problem editor - revised classes on editor cheatsheet text and explanation tooltip text 2013-01-14 09:37:38 -05:00
chrisndodge
fdba0e48dc Merge pull request #1270 from MITx/bug/dhm/jan13 
Fixed bug 114: randomized problems never right b/c state not preserved
 2013-01-14 06:21:47 -08: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