mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-30 05:22:35 +02:00
Code Issues Projects Releases Wiki Activity
72,448 Commits 36 Branches 527 Tags
Commit Graph

1089 Commits

Author SHA1 Message Date
Paul Nicholls
10fae2779e MDL-48973 Atto: Atto does not listen to the drop event 
The 'drop' event fires before the native ContentEditable drop handler, so
in order to update the underlying textarea we need to call updateOriginal
with a brief delay so that the dropped content has actually been added to
the editor.
 2015-02-13 14:48:12 +13:00
David Monllao
4879ea0e18 MDL-47159 atto_link: Adding prefix when url doesn't specify one 2015-02-04 10:23:04 +08:00
Eloy Lafuente (stronk7)
c5c34b4019 Revert "Merge branch 'MDL-47159_master' of git://github.com/dmonllao/moodle" 
This reverts commit 73bf1119ddc19181f02fac81c7d7c3def9f5e28f, reversing
changes made to 7615deba22cfae9076a79fc8ce902b24815c1fff.
 2015-01-28 21:13:42 +01:00
Eloy Lafuente (stronk7)
8181ab5865 Merge branch 'MDL-48620-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/editor/atto/plugins/undo/yui/build/moodle-atto_undo-button/moodle-atto_undo-button-min.js
 2015-01-28 01:02:54 +01:00
Eloy Lafuente (stronk7)
73bf1119dd Merge branch 'MDL-47159_master' of git://github.com/dmonllao/moodle 2015-01-27 21:18:24 +01:00
David Monllao
58f2c3ca5c MDL-47159 atto_link: Adding prefix when url doesn't specify one 2015-01-27 10:43:29 +08:00
Eloy Lafuente (stronk7)
c07962d56d Merge branch 'MDL-48916' of https://github.com/wesleysitu/moodle 2015-01-27 01:06:43 +01:00
Eloy Lafuente (stronk7)
d82ab7bf22 Merge branch 'MDL-48616-master' of git://github.com/jethac/moodle 2015-01-26 23:47:14 +01:00
Andrew Nicols
557f44d970 MDL-48620 JavaScript: Updated shifted files to comply with coding style 2015-01-23 14:51:24 +08:00
Wesley Situ
7be4cf1873 MDL-48916 atto_undo: Clarify text for "Undo/Redo" 2015-01-20 16:21:35 -08:00
Narissa Bayler
1e65cb2557 MDL-48616 editor_atto: add macrons to atto charmap 2015-01-21 01:12:22 +08:00
Eloy Lafuente (stronk7)
782ea98c59 Merge branch 'MDL-47166-master' of git://github.com/andrewnicols/moodle 2015-01-20 16:14:26 +01:00
Dave Cooper
369a63ac1c MDL-47935 Atto: Moved atto notification message position 2015-01-09 15:53:19 +08:00
Andrew Nicols
455c8cdee6 MDL-47166 atto_indent: Swap Outdent and Indent 2015-01-09 09:21:13 +08:00
Daniel Thies
eb8b2425a6 MDL-48062 atto_image: Add image select on single click 2014-12-18 18:26:28 -06:00
Sam Hemelryk
7622b02f4c Merge branch 'MDL-43996-master' of git://github.com/jethac/moodle 2014-12-09 10:56:53 +13:00
Paul Nicholls
1461aee88a MDL-43996 editor_atto: add image drag and drop capability 
Adds the ability to drag and drop images directly into Atto, uploading the image and embedding it
correctly. Contains fixes from 1.0.2, as well as a policy change - images dragged and dropped into
Atto now have role=presentation by default.
 2014-12-05 11:32:32 +08:00
Sam Hemelryk
d125c7d238 MDL-47133 editor_atto: fixed lint errors 2014-12-01 10:36:23 +13:00
Sam Hemelryk
231cb5e3d4 Merge branch 'MDL-47133-master' of git://github.com/FMCorz/moodle 2014-12-01 10:34:18 +13:00
Andrew Nicols
64e7aa4de1 MDL-28286 JavaScript: Convert all uses of M.str to M.util.get_string 2014-12-01 08:32:04 +13:00
Frederic Massart
04b12fc1b3 MDL-47133 editor_atto: Use strict validation of keyboard shortcuts 2014-11-26 17:41:05 +08:00
Dan Poltawski
1d9eb92ff3 Merge branch 'MDL-45867-master' of https://github.com/dthies/moodle 2014-11-24 17:11:14 +00:00
Dan Poltawski
17d4ff23ee Revert "MDL-46531 Make atto foreground colors and background colors configurable" 
This reverts commit cb6e1d527093bb955946498850ef8a51276a13a4.

This reverts commit 7a5e6054248ef18f05a228ab0db4d05e5d782180, reversing
changes made to 7b9fb265d20e53580a64dcd2be8546ff5b49bd26.

This reverts commit 06404b01180a2965804fab9e47715fdc2b6bdfb4, reversing
changes made to 0f87473fed2da15a8ba72ac9a578734fe2548f10.

Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-11-20 07:04:41 +00:00
Andrew Nicols
cb6e1d5270 MDL-46531 editor_atto: fontcolor -> backcolor 2014-11-20 10:46:04 +08:00
Andrew Nicols
db97ff0ee6 MDL-46531 editor_atto: Handle a null selection better on colour change 
Sadly, there is no easy way to do this. When a range is empty, we need to
create a new span, make the changes there, and then select it. Rangy does
not provide a helper to do this yet (will be in 1.3) so we have to do it
manually in the mean time.
 2014-11-19 15:45:37 +08:00
Daniel Thies
3086c8cedb MDL-45867 atto_equation: Change preview update to asynchronous 2014-11-18 13:26:13 -06:00
Sam Hemelryk
06404b0118 Merge branch 'MDL-46531-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-11-18 10:48:31 +13:00
Daniel Thies
8bca3609ee MDL-48064 atto_editor: Expand event subscription for saving selection 2014-11-17 11:15:45 -06:00
Daniel Thies
9b9a3abf9b MDL-48064 atto_editor: Check if activeElement is child node in isActive 2014-11-14 11:49:15 -06:00
Eloy Lafuente (stronk7)
147bae8f7c MDL-48144 upgrade: add v2.8.0 sep lines 2014-11-10 18:08:15 +01:00
Eloy Lafuente (stronk7)
415fc3d2f9 Merge branch 'MDL-47943-master' of https://github.com/dthies/moodle 2014-11-06 18:44:38 +01:00
Eloy Lafuente (stronk7)
6fdd4633a7 Merge branch 'MDL-48035-master-enfix' of git://github.com/mudrd8mz/moodle 2014-11-06 11:14:52 +01:00
David Mudrák
6887e2e53e MDL-48035 Fix Behat tests regressions after merging en_fix strings 2014-11-06 10:54:27 +01:00
Daniel Thies
8160d004ce MDL-47943 editor_atto: Save selection on mouseleave for Chrome 2014-11-05 09:34:20 -06:00
Dan Poltawski
5a6c9f1cfb Merge branch 'MDL-48021' of git://github.com/stronk7/moodle 
Conflicts:
	admin/tool/monitor/version.php
	mod/lesson/version.php
 2014-11-05 12:11:16 +00:00
Helen Foster
ba033b861e MDL-48035 Merge English strings from the en_fix language pack 2014-11-04 21:55:26 +01:00
Eloy Lafuente (stronk7)
de881693f7 MDL-48021 bump: Bump all versions to planned release 
This bumps all versions to planned 2.8 release
(2014111000) version and all the dependencies to
current 2.8rc1 (2014110400)
 2014-11-04 17:52:35 +01:00
Damyon Wiese
c942fddf93 MDL-48006 Atto autosave: Never restore text that is empty. 2014-11-03 11:30:30 +08:00
Frederic Massart
aad194b19a MDL-47397 editor_atto: Properly close confirm dialogue in Behat test 2014-10-24 15:09:06 +01:00
Mark Nelson
7b62567e85 MDL-47736 editor_atto: added fix for IE 9 and 10 2014-10-21 00:46:35 -07:00
Mark Nelson
3c15d25bcf MDL-47736 editor_atto: exclude <br> from being restored 2014-10-20 23:24:08 -07:00
Mark Nelson
e924e1b33a MDL-47736 editor_atto: only save/restore draft when necessary 2014-10-19 22:14:15 -07:00
Frederic Massart
53cca2274e MDL-47737 editor_atto: Prevent false negative when saving draft on IE9 2014-10-17 20:48:43 +08:00
Frederic Massart
5aafc6f425 MDL-47733 editor_atto: Do not prompt error when draft is empty 2014-10-17 18:19:11 +08:00
Damyon Wiese
5d70f2303a Merge branch 'wip-MDL-47583-master' of git://github.com/marinaglancy/moodle 2014-10-15 13:46:28 +08:00
Helen Foster
a1b152f5db MDL-47140 atto: improved wording of error message 2014-10-14 12:20:58 +01:00
Dan Poltawski
7c50998039 Merge branch 'MDL-47140-master' of git://github.com/gurgus/moodle 2014-10-13 09:54:02 +01:00
Dave Cooper
b6da971b4a MDL-47140 editor_atto: Improved error handling 2014-10-13 10:51:17 +08:00
Marina Glancy
8c2fc797a0 MDL-47583 atto_managefiles: correctly decode filename 2014-10-09 10:59:33 +08:00
Marina Glancy
c84d8cc452 MDL-47583 tinymce_managefiles: correctly decode filename 2014-10-09 10:59:21 +08:00