Commits · 9054c621fcb5dbb887ea994ec559abe4ec769188 · edx / edx-platform · GitLab

21 Mar, 2014 40 commits
- keeping the component editor inside the component window · 9054c621
  Frances Botsford committed Mar 21, 2014
  
  9054c621 Browse Files
- Remove unnecessary helper method. · a9b91840
  cahrens committed Mar 21, 2014
  
  a9b91840 Browse Files
- Fire events before and after the link dialog is shown. · a6b18dea
```
This allows us to convert the static links.
```
  cahrens committed Mar 21, 2014
  a6b18dea Browse Files
- Code review feedback. · bb0a58ab
  cahrens committed Mar 21, 2014
  
  bb0a58ab Browse Files
- Change the event handling for image plugin. · b0c35982
```
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).
```
  cahrens committed Mar 21, 2014
  b0c35982 Browse Files
- Fire events before and after the image dialog is shown. · d3828f92
```
We use this to rewrite links.
```
  cahrens committed Mar 21, 2014
  d3828f92 Browse Files
- Upgrade version of TinyMCE to 4.0.16. · d89ebedc
```
Switch from tabbed Visual/HTML Editor for HTML modules to showing the code editor as a plugin within TinyMCE (triggered from toolbar). STUD-1422
```
  cahrens committed Mar 21, 2014
  d89ebedc Browse Files
- Changed name of "code" toolbar button to "Code block". · 7ce576dc
  cahrens committed Mar 21, 2014
  
  7ce576dc Browse Files
- Change the name of the button to "Edit HTML". · 677f39dd
```
Changed menu name for consistency, but we don't show it.
```
  cahrens committed Mar 21, 2014
  677f39dd Browse Files
- Updates from code review. · d623a4e4
  cahrens committed Mar 21, 2014
  
  d623a4e4 Browse Files
- pep8 · fb6afc70
  cahrens committed Mar 21, 2014
  
  fb6afc70 Browse Files
- Fire an event with the link plugin closes so we can rewrite links. · e1908b5a
  cahrens committed Mar 21, 2014
  
  e1908b5a Browse Files
- Update tinymce paths. · ffbba2ba
  cahrens committed Mar 21, 2014
  
  ffbba2ba Browse Files
- Remove unused testing templates and unused tabs. · 6c1d369b
  cahrens committed Mar 21, 2014
  
  6c1d369b Browse Files
- Remove unnecessary code. · 9797354a
  cahrens committed Mar 21, 2014
  
  9797354a Browse Files
- Add test for code format toolbar button. · 09643c87
  cahrens committed Mar 21, 2014
  
  09643c87 Browse Files
- Add tests for toolbar buttons and converting links. · 07d54be6
  cahrens committed Mar 21, 2014
  
  07d54be6 Browse Files
- Allow TinyMCE to create p's, else formatting doesn't work. · cc2fec2e
  cahrens committed Mar 21, 2014
  
  cc2fec2e Browse Files
- Test for style block being maintained. · b1f4d28e
  cahrens committed Mar 21, 2014
  
  b1f4d28e Browse Files
- Make sure to strip out temporary caret. · d73f65c3
```
It can get left behind in style blocks.
```
  cahrens committed Mar 21, 2014
  d73f65c3 Browse Files
- Update acceptance test for image plugin. · f31f9360
  cahrens committed Mar 21, 2014
  
  f31f9360 Browse Files
- Update unit tests. · 28dc8e0e
  cahrens committed Mar 21, 2014
  
  28dc8e0e Browse Files
- reordered the tinymce buttons · 7ac1e7bb
  Frances Botsford committed Mar 21, 2014
  
  7ac1e7bb Browse Files
- made the codemirror look more studio-like · b1b0d16a
  Frances Botsford committed Mar 21, 2014
  
  b1b0d16a Browse Files
- Change how we detect that an image has been inserted. · f71e3333
  cahrens committed Mar 21, 2014
  
  f71e3333 Browse Files
- fixed tinymce visual editor css · 1e06fd33
  Frances Botsford committed Mar 21, 2014
  
  1e06fd33 Browse Files
- Remove CodeMirror tabbed editor. · 9ec3a2da
  cahrens committed Mar 21, 2014
  
  9ec3a2da Browse Files
- Fire events when CodeMirror Editor is open and closed. · 9ac94fc4
```
Needed to switch static links back and forth.
```
  cahrens committed Mar 21, 2014
  9ac94fc4 Browse Files
- Modify paths for location of CodeMirror files. · f6acab9d
  cahrens committed Mar 21, 2014
  
  f6acab9d Browse Files
- Version 1.3 of CodeMirror plugin. · a14574ec
  cahrens committed Mar 21, 2014
  
  a14574ec Browse Files
- Delete old Studio skin. · 1ece49c3
  cahrens committed Mar 21, 2014
  
  1ece49c3 Browse Files
- Get handling of static image links working again. · 0d0ace45
  cahrens committed Mar 21, 2014
  
  0d0ace45 Browse Files
- adding new studio skin for TinyMCE4 · 9bc0638f
  Frances Botsford committed Mar 21, 2014
  
  9bc0638f Browse Files
- Changes to support Bulk e-mail usage. · 0ddc3a65
  cahrens committed Mar 21, 2014
  
  0ddc3a65 Browse Files
- Include all the controls on the toolbar that we previously had. · 2ae2ec94
  cahrens committed Mar 21, 2014
  
  2ae2ec94 Browse Files
- new tinymce · dda58661
```
js changes to support new tinymce
scss changes for alignments
```
  Abdallah committed Mar 21, 2014
  dda58661 Browse Files
- deleted old tinymce · 1c644fcf
  Abdallah committed Mar 21, 2014
  
  1c644fcf Browse Files
- Merge pull request #2948 from carsongee/cg/cas_attribute_callback · 767feb93
```
Adding ability to give an attribute callback for CAS
```
  Carson Gee committed Mar 21, 2014
  767feb93 Browse Files
- Merge pull request #2816 from edx/usman/lms1192-module-render-exceptions · c086cbc3
```
Catch module render exceptions
```
  Usman Khalid committed Mar 21, 2014
  c086cbc3 Browse Files
- Merge pull request #3016 from edx/valera/comment_out_some_more · 52b11495
```
Commenting out flaky acceptance tests.
```
  Valera Rozuvan committed Mar 21, 2014
  52b11495 Browse Files