Victor Shnayder
6847779f22
Merge remote-tracking branch 'origin/master' into feature/victor/cohorts
...
Conflicts:
common/djangoapps/student/models.py
2013-01-26 12:37:26 -05:00
Victor Shnayder
87e92644b6
Make all tests pass
...
caveat: with a bit of hackery. Need to do better testing once things are live.
2013-01-25 16:13:55 -05:00
Brian Talbot
8a6dc040a9
studio - styled first children in an overview's subsection list for drag and drop work
2013-01-25 15:26:25 -05:00
Don Mitchell
0009430b59
min height on droppable areas and add padding to top/bottom on hover.
2013-01-25 14:30:51 -05:00
Don Mitchell
45393ac6f8
Merge branch 'feature/dhm/drag' of github.com:MITx/mitx into feature/dhm/drag
2013-01-25 12:46:09 -05:00
Don Mitchell
5ef3f3ee66
Update jquery ui. Overrode draggable w/ an in place fix for scroll
...
racing condition.
2013-01-25 12:44:58 -05:00
Chris Dodge
9c3e727889
add unit test to assert that the flag is not set on course metadata
2013-01-23 15:14:36 -05:00
Don Mitchell
3e048d7072
Removed old function
2013-01-23 14:15:09 -05:00
Don Mitchell
2db0401273
Merge branch 'feature/dhm/drag' of github.com:MITx/mitx into feature/dhm/drag
...
Conflicts:
cms/envs/common.py
2013-01-23 14:13:17 -05:00
Brian Talbot
25df02fedd
studio - syncing cheatsheet language with new class name for heading 1 again
2013-01-23 13:04:16 -05:00
Brian Talbot
0e061ca726
studio - syncing cheatsheet language with new class name for heading 1
2013-01-23 13:02:33 -05:00
Don Mitchell
7cca46e691
Requirejs doesn't belong here
2013-01-23 13:00:01 -05:00
Brian Talbot
5fee7eeaec
studio - further resolved bug with .header CSS inheritance and problem editor menu UI
2013-01-23 12:58:20 -05:00
Don Mitchell
b0bbb34644
Merge pull request #1331 from MITx/feature/christina/tiny-mce
...
Feature/christina/tiny mce
2013-01-23 09:14:42 -08:00
Don Mitchell
4d0d46462c
Fixed the y axis drop problem by requiring it to be within the x bounds.
2013-01-23 12:12:40 -05:00
Don Mitchell
ad5f00f270
Drag and drop for sections, subsections, and units works with following
...
caveats: - it drops wherever the y of the cursor is no matter the x for
the cursor. I've constrained the draggables to never change x; so, the
drop doesn't care where the x of the cursor is only the y.
- if you force auto scroll, the visual thing you'll dragging gets out of
sync w/ the mouse cursor; however, the mouse cursor is the "true"
location; so, the drop's posit is the mouse cursor y not the visual
clone's y.
2013-01-23 11:16:04 -05:00
Don Mitchell
c7d9eb23f1
Merge pull request #1328 from MITx/fix/cdodge/subsection-crash-no-display-name
...
use property rather than referencing the metadata dictionary. This is be...
2013-01-23 07:40:52 -08:00
Chris Dodge
0042131588
use property rather than referencing the metadata dictionary. This is better because if there is no 'display_name' defined, then we get back a string of the location name
2013-01-23 09:12:24 -05:00
Brian Talbot
5e7726079e
studio html editor - styled <pre> and <code> elements, revised code tinyMCE icon
2013-01-22 23:32:51 -05:00
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
