moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 17:36:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
85084 commits 37 branches 540 tags 1.3 GiB
Commit graph

1258 commits

Author SHA1 Message Date
Damyon Wiese
6363588b72 MDL-43312 TinyMCE: Version bump to 3.5.10. Remove all the hacks. 
I retested the old bugs that required custom hacks to tinymce and could not reproduce them,
so I have not reimplemented the hacks.
 2014-05-07 12:54:43 +08:00
Helen Foster
f15fa7a281 MDL-45410 Merge English strings from the en_fix language pack 2014-05-07 00:16:51 +02:00
Andrew Nicols
eb497e26fb MDL-45338 editor_atto: Correct gesturemoveend listening 
Delegate gesturemoveend rather than listen to ensure adequate event filters
and that we apply to only the correct editor.
 2014-05-06 16:10:31 +08:00
Dan Poltawski
02c482704b Merge branch 'MDL-45403-master' of git://github.com/FMCorz/moodle 
Conflicts:
	lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js
 2014-05-06 11:48:38 +08:00
Dan Poltawski
73c2ae4bff Merge branch 'MDL-45253-master' of git://github.com/FMCorz/moodle 
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
 2014-05-06 11:34:17 +08:00
Dan Poltawski
63469ab11d Merge branch 'MDL-45338-master' of git://github.com/andrewnicols/moodle 2014-05-06 11:27:41 +08:00
Frederic Massart
664c851755 MDL-45403 editor_atto: Change default for tagMarchRequiresAll to true 2014-05-05 17:47:54 +08:00
Frederic Massart
e76ae8077a MDL-45253 editor_atto: Async the highlighting of buttons 2014-05-05 17:46:13 +08:00
Frederic Massart
fafeb5a293 MDL-45253 editor_atto: Check for button highlights on change event 
This will allow a button to be highlighted when a plugin has updated
the content, not only when the selection has changed.
 2014-05-05 17:46:13 +08:00
Frederic Massart
e988383645 MDL-45253 editor_atto: Prevent selection of all nodes when selection is empty 2014-05-05 17:46:13 +08:00
Frederic Massart
d78920bdba MDL-45253 editor_atto: selectionFilterMatches includes parents 2014-05-05 17:46:13 +08:00
Marina Glancy
d0144cd38e Merge branch 'MDL-44972-master' of git://github.com/damyon/moodle 2014-05-05 17:17:11 +08:00
Damyon Wiese
c1660772b1 MDL-44972 Atto dialogues: Change M.core.dialogue attribute name to "focusOnShowSelector" 
And some minor cleanups.
 2014-05-05 16:27:36 +08:00
Damyon Wiese
e5ddec38cd MDL-44972 Atto: Focus on the first input field in forms in dialogues. 2014-05-05 15:21:11 +08:00
Damyon Wiese
2372366f58 MDL-44224: outdent plugin - handle divs that have been silently switched for ps 
Also - fix a shifter warning.
 2014-05-05 14:07:02 +08:00
Sam Hemelryk
b16c2ec5c8 MDL-44224 atto_indent: converts blockquotes to div indents 2014-05-05 14:07:01 +08:00
Andrew Nicols
e30506416b MDL-45338 editor_atto: Check for selection changes on touch-based devices too 2014-05-02 14:03:16 +08:00
Frederic Massart
16c6440dcb MDL-45382 atto_link: Missing context when finding anchors 2014-05-02 12:02:36 +08:00
Damyon Wiese
6e4c18522d Revert "MDL-45239 editor_atto: The editor cannot be active if it is not the active element" 
This reverts commit 05a7f9e749.
 2014-05-01 16:22:41 +08:00
Dan Poltawski
9482292af2 Merge branch 'MDL-45254-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/editor/atto/plugins/equation/yui/build/moodle-atto_equation-button/moodle-atto_equation-button-min.js
 2014-05-01 11:53:28 +08:00
Damyon Wiese
45b4f8734a Merge branch 'MDL-44867-m2' of git://github.com/andrewnicols/moodle 2014-05-01 10:29:42 +08:00
Andrew Nicols
241836683a MDL-44867 atto_equation: Adjust the help string describing cursor info 2014-05-01 10:18:03 +08:00
Damyon Wiese
1b3f9ea1ba Merge branch 'MDL-44867-master' of git://github.com/andrewnicols/moodle 2014-04-30 15:40:36 +08:00
Damyon Wiese
da8a720d75 Merge branch 'MDL-45239-master' of git://github.com/andrewnicols/moodle 2014-04-30 12:13:49 +08:00
Andrew Nicols
d8e2dc99b7 MDL-44867 atto_equation: Switch to the Downarrow for cursor position 
The \square macro is not available in standard MimeTeX.
 2014-04-30 11:14:36 +08:00
Andrew Nicols
d926ce7173 MDL-45254 atto_equation: Allow insertion of macros at the beginning of words 2014-04-24 15:13:19 +08:00
Marina Glancy
7b99722e93 Merge branch 'MDL-45207-master' of git://github.com/andrewnicols/moodle 2014-04-24 14:00:46 +08:00
Sam Hemelryk
d4f0e345ab Merge branch 'MDL-45169-master' of git://github.com/FMCorz/moodle 2014-04-24 11:33:34 +12:00
Andrew Nicols
05a7f9e749 MDL-45239 editor_atto: The editor cannot be active if it is not the active element 
FireFox thinks that you can have an active selection on an element which
currently does not have focus. How this can be the case is a mystery.
 2014-04-23 16:59:40 +08:00
Andrew Nicols
ea382deaaf MDL-45207 atto_equation: Handle multiple equations on the same line 2014-04-23 15:34:26 +08:00
Frederic Massart
8aa64bab43 MDL-45169 atto_image: Translatable string for 'size' 
AMOS BEGIN
 CPY [size,core],[size,atto_image]
AMOS END
 2014-04-23 14:43:28 +08:00
Andrew Nicols
6411513518 MDL-45008 atto_link: Standardise unlinking for non-selections 
When placing the cursor within a link, but not making a selection, we
should unlink the whole link.
 2014-04-22 12:37:27 +08:00
Dan Poltawski
d2907f5cb9 Merge branch 'MDL-44778_atto_border' of https://github.com/andyjdavis/moodle 2014-04-18 14:07:53 +08:00
Dan Poltawski
aee01173f7 Merge branch '45123-27' of git://github.com/samhemelryk/moodle 2014-04-18 11:54:48 +08:00
Dan Poltawski
d2b8b67a9c Merge branch 'MDL-44674-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-min.js
 2014-04-18 11:49:39 +08:00
Dan Poltawski
3ff2fae230 Merge branch 'MDL-44906-master' of git://github.com/andrewnicols/moodle 2014-04-18 11:42:36 +08:00
Andrew Davis
fcc19a2ff4 MDL-44778 editor_atto: added a border around the equation preview 2014-04-17 08:45:10 +08:00
Dan Poltawski
287fc6ce68 Merge branch 'MDL-44798-master' of git://github.com/andrewnicols/moodle 2014-04-16 15:21:08 +08:00
Marina Glancy
2522b260e6 Merge branch 'MDL-44758-master' of git://github.com/jethac/moodle 2014-04-16 14:42:15 +08:00
Andrew Nicols
234ead3461 MDL-44798 editor_atto: Backport a fix for HTML5Shiv 
This is a backport of the Rangy workaround for a bug in HTML5Shiv, which
breaks document.createElement by returning nodes which have parent nodes.

HTML5Shiv refuses to fix this bug so Rangy has had to work around it.

For more information see:
* https://code.google.com/p/rangy/issues/detail?id=104; and
* https://github.com/aFarkas/html5shiv/issues/64.
 2014-04-16 12:14:28 +08:00
Sam Hemelryk
7747557d03 MDL-45123 atto_equation: improvements to ajax.php 2014-04-16 15:12:03 +12:00
Sam Hemelryk
d668060fdc Merge branch 'MDL-45034-master' of git://github.com/damyon/moodle 
Conflicts:
	lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js
 2014-04-16 09:23:30 +12:00
Marina Glancy
4ba9490813 MDL-44826 atto: re-shifted js 2014-04-15 18:07:10 +08:00
Marina Glancy
2e68bf6136 Merge branch 'MDL-44826-master' of git://github.com/damyon/moodle 2014-04-15 17:55:30 +08:00
Damyon Wiese
d3931a7d4d MDL-45034 Atto: Image dialogue improvements. 
1. Fix Nan bugs in auto width / height
2. Allow percentages in auto width / height
3. Change dialogue title
4. Prevent preview image resizing from changing the height of the dialogue.
5. Change wording to "Auto size"
6. Auto adjust size when the "Auto size" checkbox is toggled.
7. Add img-responsive to images with the original aspect ratio.
8. If the width and height fields are left blank, revert them to the image size.
 2014-04-15 16:43:27 +08:00
Damyon Wiese
7bbc64b88f MDL-44826 Atto: Set default image alignment to 'bottom' 2014-04-15 15:47:52 +08:00
Sam Hemelryk
00719eefd7 Merge branch 'MDL-44826-master' of git://github.com/damyon/moodle 2014-04-15 16:42:12 +12:00
Damyon Wiese
d28af3d4aa MDL-44826 Atto: Image alignment options 
If an image has custom alignment or margins - don't overwrite
them unless a new alignment option is chosen.
 2014-04-15 12:23:31 +08:00
Jetha Chan
f0ddce4df1 MDL-44758 editor-atto: prevent table-in-table creation 
Prevent new table creation, displaying table context menu instead when cursor is within caption, when multiple cells are selected, when selection contains both nodes within and outside of the table, and when selection contains nodes from multiple tables.
 2014-04-15 11:39:57 +08:00
Sam Hemelryk
564a413367 Merge branch 'MDL-45040-master' of git://github.com/jethac/moodle 2014-04-15 12:31:44 +12:00