Sam Hemelryk
9b1a4cde78
Merge branch 'MDL-44834-master' of git://github.com/FMCorz/moodle
...
Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
2014-04-02 09:28:49 +13:00
Marina Glancy
5bb81ad437
Merge branch 'MDL-44770-master' of git://github.com/jethac/moodle
2014-04-01 15:50:14 +08:00
Jetha Chan
b1421abdb6
MDL-44770 editor_atto: moved table context menu
2014-04-01 15:46:37 +08:00
Marina Glancy
1a1049990f
Merge branch 'MDL-44759-master' of git://github.com/FMCorz/moodle
2014-04-01 15:42:21 +08:00
Marina Glancy
99342b5197
Merge branch 'MDL-43999-master' of git://github.com/damyon/moodle
2014-04-01 15:35:05 +08:00
Marina Glancy
7fff0290eb
Merge branch 'MDL-44777-master' of git://github.com/FMCorz/moodle
2014-04-01 15:34:44 +08:00
Damyon Wiese
43a737d1b5
MDL-43999 Atto : Make image dialogue open on double click of an image.
2014-04-01 15:22:12 +08:00
Frederic Massart
1eb5839cf9
MDL-44777 atto_equation: More consistent width of buttons
2014-04-01 15:21:11 +08:00
Marina Glancy
364411b123
MDL-44747 editor_atto: coding error fixed
2014-04-01 14:55:39 +08:00
Marina Glancy
3accdbff60
Merge branch 'MDL-44234-master' of git://github.com/FMCorz/moodle
2014-04-01 14:44:13 +08:00
Frederic Massart
dfd5127531
MDL-44234 atto_table: Reduce the size of the caption field
2014-04-01 14:37:33 +08:00
Marina Glancy
e50a6fa5fb
Merge branch 'MDL-44747-master' of git://github.com/FMCorz/moodle
2014-04-01 14:26:08 +08:00
Marina Glancy
2f7949cd57
Merge branch 'MDL-44755-master' of git://github.com/FMCorz/moodle
2014-04-01 13:32:03 +08:00
Marina Glancy
814f40ba31
Merge branch 'MDL-44763_preview_int' of https://github.com/andyjdavis/moodle
2014-04-01 11:19:26 +08:00
Marina Glancy
d767af7c2d
Merge branch 'MDL-44754-master' of git://github.com/phalacee/moodle
2014-04-01 11:08:40 +08:00
Andrew Nicols
c390774ade
MDL-44752 atto: Correct spelling of color => colour in plugin languages
2014-04-01 11:08:18 +08:00
Andrew Davis
5491fd7f07
MDL-44763 editor_atto: removed unnecessary "preview" label
2014-04-01 10:57:16 +08:00
Frederic Massart
76748496d8
MDL-44869 atto_noautolink: Highlight button when noautolink is active
2014-03-31 17:50:08 +08:00
Frederic Massart
ac0f8617d4
MDL-44870 atto_noautolink: Remove plugin from default toolbar settings
2014-03-31 17:24:02 +08:00
Frederic Massart
33bb15eb80
MDL-44808 atto_table: Removing unused language string for JS
2014-03-31 17:21:15 +08:00
Frederic Massart
b9d065edc4
MDL-44868 editor_atto: Prevent disable buttons to keep tabIndex
...
Now, if a button gets disabled but the tabIndex and the focus
are on that button, the focus and tabIndex are moves to its
closest neighbour.
2014-03-31 16:47:32 +08:00
Frederic Massart
af31595b4b
MDL-44868 editor_atto: Toolbar navigation ignores disabled buttons
2014-03-31 16:40:29 +08:00
Marina Glancy
de19c44c82
Merge branch 'MDL-44808-master' of git://github.com/FMCorz/moodle
2014-03-31 16:36:12 +08:00
Damyon Wiese
ffb8aff65c
MDL-44000 Atto: Add option to constrain image size
...
(Keep aspect ratio)
Also some small improvements to the edit image dialogue.
2014-03-31 16:28:57 +08:00
Marina Glancy
b13f4e8e7c
Merge branch 'MDL-44764-master' of git://github.com/FMCorz/moodle
2014-03-31 15:55:29 +08:00
Damyon Wiese
5081de00d7
MDL-44748 Atto: Make it the default on upgrade.
2014-03-31 15:47:32 +08:00
Frederic Massart
8e608fff83
MDL-44784 atto: Show settings link on plugins list
2014-03-31 12:44:16 +08:00
Frederic Massart
36beb828de
MDL-44757 atto_equation: Use Moodle Docs URL for TeX doc
2014-03-31 12:07:34 +08:00
Frederic Massart
73afb59759
MDL-44747 editor_atto: Renamed subplugin setting class
2014-03-31 11:28:43 +08:00
Frederic Massart
356ec27f08
MDL-44747 editor_atto: Improved validation of toolbar config
...
This ensures that:
- Plugins are only used once,
- Group names are unique,
- Lines match: group = plugin[, plugin[, plugin ...]],
- There are some groups and plugins defined,
- The plugins used are installed.
2014-03-31 11:28:43 +08:00
Frederic Massart
a3fa796118
MDL-44755 atto_editor: Remove hardcoded icons from settings
...
Previously, we hardcoded a list of icons for Atto plugins. This is not
a good idea as it would be very quickly outdated, or incomplete. Now,
we proceed as we often do: if the image pix/icon exists in the plugin
it is displayed, else nothing is displayed.
2014-03-31 11:26:53 +08:00
Frederic Massart
89331bc217
MDL-44764 atto_image: Reword the alt related labels
2014-03-31 11:25:46 +08:00
Frederic Massart
7887b47524
MDL-44767 atto_editor: Browser hangs when making a selection
2014-03-31 11:13:15 +08:00
Marina Glancy
c531e2e632
Merge branch 'MDL-44804-master' of git://github.com/FMCorz/moodle
2014-03-31 11:03:31 +08:00
Jetha Chan
f8c3af1321
MDL-44770 editor-atto: table context menu opens from button
...
Context menu now opens from button, rather than table cell. Modified wording of table strings.
2014-03-31 10:56:36 +08:00
Frederic Massart
adb2473a2b
MDL-44759 atto_undo: Buttons are only enabled when needed
...
Before the patch it was happening that the undo or redo buttons
were enabled even though clicking on them didn't produce anything.
This is partly because we were not storing the initial value, we
allowed for the stack to be empty, and we were using not clean
HTML.
2014-03-31 10:49:59 +08:00
Andrew Davis
13f432976a
MDL-44756 editor_atto: changed a string
2014-03-31 10:25:39 +08:00
Jason Fowler
38528fa40a
MDL-44806 Atto: Prevent Accessibility Checker dialog from being needlessly large
2014-03-31 09:55:29 +08:00
Frederic Massart
23cead686e
MDL-44808 atto_table: Remove accessibility information from dialogue
2014-03-28 17:27:57 +08:00
Jason Fowler
87c0e4e06b
MDL-44754 Atto: Explaining what group names are used for in toolbars
2014-03-28 14:48:38 +08:00
Frederic Massart
5ce4583a46
MDL-44834 editor_atto: Delegate change event to one editor
2014-03-27 19:48:37 +08:00
Marina Glancy
6474439d55
NOBUG: Fixed file access permissions
2014-03-27 16:52:07 +08:00
Marina Glancy
a13c2addee
NOBUG: Fixed SVG browser compatibility
2014-03-27 16:52:06 +08:00
Frederic Massart
2f0a1236a7
MDL-44772 editor_atto: Initial height of editor matches textarea's
...
We set a min-height and a height in JavaScript to force the editor
to start at a certain height, but then it can be expanded thanks
to the CSS property resize. Though as IE does not support the resize
property we ignore we do not set a height so that the editor expands
as we type.
2014-03-27 15:17:49 +08:00
Frederic Massart
125cf72361
MDL-44762 editor_atto: Closing dropdowns when item is clicked
2014-03-27 12:17:00 +08:00
Petr Škoda
f805fd1203
MDL-44824 add missing subplugin type names
2014-03-27 11:46:20 +08:00
Frederic Massart
6cb48e0424
MDL-44804 editor_atto: JS error when filepicker is disabled
2014-03-26 17:20:31 +08:00
Marina Glancy
205c6db50d
MDL-44084 atto: correct standard plugins list and namespace bug fix
2014-03-26 10:01:49 +08:00
Damyon Wiese
f81d318332
MDL-43883 Atto Behat: Remove deprecated step
2014-03-26 10:01:49 +08:00
Damyon Wiese
9f07f05a48
MDL-43883 Behat: Make Atto the default text editor and adjust behat to use it.
2014-03-26 10:01:49 +08:00