cahrens
c8eaa53452
Fix typos.
2014-03-24 10:49:29 -04:00
cahrens
1cd6e1dc7e
Move code style block button.
2014-03-24 09:44:00 -04:00
cahrens
0953583d38
Change code editor icon to say HTML.
2014-03-24 09:44:00 -04:00
Frances Botsford
ed51a664f4
replaced code icon in TinyMCE editor; simplified UI on TMCE toolbar
2014-03-24 09:42:12 -04:00
cahrens
8f6980b212
Use compressed CodeMirror file.
2014-03-21 16:41:42 -04:00
cahrens
a9b918404b
Remove unnecessary helper method.
2014-03-21 15:40:53 -04:00
cahrens
a6b18dea80
Fire events before and after the link dialog is shown.
...
This allows us to convert the static links.
2014-03-21 15:39:44 -04:00
cahrens
bb0a58abf7
Code review feedback.
2014-03-21 15:00:31 -04:00
cahrens
b0c35982a6
Change the event handling for image plugin.
...
Fixes FireFox bug, and allows us to correct the image path when we show the plugin (as opposed ot only correcting path when we close the plugin).
2014-03-21 14:49:12 -04:00
cahrens
d3828f929e
Fire events before and after the image dialog is shown.
...
We use this to rewrite links.
2014-03-21 14:49:11 -04:00
cahrens
7ce576dc50
Changed name of "code" toolbar button to "Code block".
2014-03-21 14:42:00 -04:00
cahrens
677f39dd09
Change the name of the button to "Edit HTML".
...
Changed menu name for consistency, but we don't show it.
2014-03-21 14:42:00 -04:00
cahrens
e1908b5ab2
Fire an event with the link plugin closes so we can rewrite links.
2014-03-21 14:41:59 -04:00
cahrens
6c1d369b71
Remove unused testing templates and unused tabs.
2014-03-21 14:41:59 -04:00
cahrens
9797354a5e
Remove unnecessary code.
2014-03-21 14:41:59 -04:00
cahrens
cc2fec2e1a
Allow TinyMCE to create p's, else formatting doesn't work.
2014-03-21 14:41:59 -04:00
cahrens
b1f4d28e46
Test for style block being maintained.
2014-03-21 14:41:58 -04:00
cahrens
d73f65c3a8
Make sure to strip out temporary caret.
...
It can get left behind in style blocks.
2014-03-21 14:41:58 -04:00
cahrens
28dc8e0e1a
Update unit tests.
2014-03-21 14:41:58 -04:00
Frances Botsford
7ac1e7bb75
reordered the tinymce buttons
2014-03-21 14:41:58 -04:00
Frances Botsford
b1b0d16a70
made the codemirror look more studio-like
2014-03-21 14:41:58 -04:00
cahrens
f71e333357
Change how we detect that an image has been inserted.
2014-03-21 14:41:57 -04:00
Frances Botsford
1e06fd3302
fixed tinymce visual editor css
2014-03-21 14:41:57 -04:00
cahrens
9ec3a2da23
Remove CodeMirror tabbed editor.
2014-03-21 14:41:57 -04:00
cahrens
9ac94fc4ac
Fire events when CodeMirror Editor is open and closed.
...
Needed to switch static links back and forth.
2014-03-21 14:41:57 -04:00
cahrens
f6acab9d9e
Modify paths for location of CodeMirror files.
2014-03-21 14:41:57 -04:00
cahrens
a14574ecad
Version 1.3 of CodeMirror plugin.
2014-03-21 14:41:57 -04:00
cahrens
1ece49c346
Delete old Studio skin.
2014-03-21 14:41:57 -04:00
cahrens
0d0ace45fa
Get handling of static image links working again.
2014-03-21 14:41:57 -04:00
Frances Botsford
9bc0638f23
adding new studio skin for TinyMCE4
2014-03-21 14:41:56 -04:00
cahrens
0ddc3a6556
Changes to support Bulk e-mail usage.
2014-03-21 14:41:56 -04:00
cahrens
2ae2ec9427
Include all the controls on the toolbar that we previously had.
2014-03-21 14:41:56 -04:00
Abdallah
dda5866180
new tinymce
...
js changes to support new tinymce
scss changes for alignments
2014-03-21 14:41:56 -04:00
Abdallah
1c644fcf2c
deleted old tinymce
2014-03-21 14:41:56 -04:00
Usman Khalid
c086cbc38d
Merge pull request #2816 from edx/usman/lms1192-module-render-exceptions
...
Catch module render exceptions
2014-03-21 21:12:30 +05:00
David Baumgold
bba766252f
Merge pull request #3015 from louyihua/master
...
Fix a url processing error in 02_html5_video.js
2014-03-21 11:44:18 -04:00
louyihua
ce1b62311b
Fix a url processing error in 02_html5_video.js
...
As the code in this .js will break the url's integrity when there is already a query string inside the video source's url and cause the url to be invalid in some cases (for example, when working with a url from Windows Azure's Media Service, the appended '?' will cause the url being invalid).
I modified the code by first checking whether the url has already had a query string, and if so, then use '&' instead of '?' to prevent the breaking, and it works for the url from Windows Azure's Media Service.
2014-03-21 23:24:28 +08:00
David Baumgold
c4b81111f2
Merge pull request #2963 from louyihua/master
...
Fix incorrect parse of url in video_module.py
2014-03-21 10:50:40 -04:00
louyihua
d76c3dfc36
Fix the url processing error when there is a query string inside the video source's url
...
1. In video_module.py, rewrite the get_ext() function to use the built-in urlparse module to parse the input filename first and then get the file's extension name from the parsed path.
2. In test_video.py, add two test cases (one with query string while the other without) in order to test the rewritten get_ext() function.
2014-03-21 22:47:00 +08:00
frances botsford
32ea61857d
Merge pull request #3007 from edx/frances/feature/ui-loading
...
added loading pattern to studio
2014-03-21 10:15:11 -04:00
zubair-arbi
5b3a08ddcc
Merge pull request #2925 from edx/zub/bugfix/std1433-importunicodename
...
use unicode strings for slug and regex
2014-03-21 19:01:26 +05:00
Anton Stupak
4bbc470844
Merge pull request #2988 from edx/anton/fix-multiple-image-inputs
...
Fix image mapped inputs.
2014-03-21 14:03:54 +02:00
zubiar-arbi
00bf5e4fce
use unicode strings for slug and regex
...
STUD-1433
2014-03-21 15:48:29 +05:00
Dave St.Germain
05ea675f67
Merge pull request #2959 from edx/dcs/remove-junk-from-codemirror
...
Removed circuit editor setup code that had always been in codemirror-compressed.js
2014-03-20 16:45:19 -04:00
Dave St.Germain
376b040775
Removed circuit editor setup code that had always been in
...
codemirror-compressed.js
2014-03-20 14:33:32 -04:00
Dave St.Germain
3c1df5d96c
Merge pull request #2904 from edx/dcs/a11y-header
...
Remove course name from page H1, and slightly improve sequence navigation
2014-03-20 14:07:32 -04:00
Jay Zoldak
b695bceeeb
Merge pull request #2997 from edx/zoldak/fix-pragma-pep8
...
Fix pylint disable pragmas that were pep8 violations
2014-03-20 13:56:00 -04:00
polesye
1f5ae87f60
BDL-810: Fix image mapped inputs.
2014-03-20 16:55:08 +02:00
Waheed Ahmed
817df15c47
Merge pull request #2967 from edx/waheed/lms2275-fix-html-tab-in-bulk-email-feature
...
Fixed HTML tab in bulk email feature on firefox.
2014-03-20 19:31:43 +05:00
Jay Zoldak
c5a7911b87
Fix pylint disable pragmas that were pep8 violations
2014-03-20 10:18:40 -04:00
