Commit Graph

1187 Commits

Author SHA1 Message Date
Dan Poltawski
e92a39cf0c Revert "Merge branch 'MDL-52944-master' of git://github.com/cameron1729/moodle"
This reverts commit 61a0465ce7, reversing
changes made to 2408f8fe2b.
2016-04-13 10:48:59 +01:00
Dan Poltawski
61a0465ce7 Merge branch 'MDL-52944-master' of git://github.com/cameron1729/moodle 2016-04-12 14:13:36 +01:00
Dan Poltawski
5702a8289b Merge branch 'MDL-52954-master' of git://github.com/damyon/moodle 2016-04-11 09:52:40 +01:00
Cameron Ball
a6a59bcaa4 MDL-52944 atto: Use event-key to handle enter key 2016-04-08 12:25:27 +08:00
Panagiotis Nikoloutsopoulos
92a8ca4ba2 MDL-52944 atto: Contenteditable command 'FormatBlock' set to 'p' 2016-04-08 12:13:23 +08:00
Damyon Wiese
b803df8170 MDL-52954 atto: Stop autosave timer, when editor no-longer exists. 2016-03-30 11:48:40 +08:00
Adrian Greeve
387c8026a5 MDL-50795 atto: Pasting into atto removes background colour style.
Copying from one atto editor to another comes with a lot of style
information. This removes the color attributes which make the page
look ugly when competing with different themes.
2016-03-24 10:53:59 +08:00
Rajesh Taneja
e01012e96d MDL-46891 behat: Driver specific fixes.
1. Browserkit doesn't handle [] in name
2. Grades are not visible in viewport and might fail
   with few drivers, increasing size of window to ensure
   grades are visible and can be modified.
3. Click edit first to see grade link
4. Expand fields before setting value
5. Updated xpath, as crawler update it.
6. Hover fails to show icon
2016-03-11 10:51:16 +08:00
Eric Merrill
1f0d77f7cd MDL-53249 atto: Make sure all editors see end move event 2016-02-25 21:37:16 -05:00
Rajesh Taneja
7b61603406 MDL-52996 Atto: Only check if plugins are loaded
Atto bold using behat with phantomjs doesn't work.
In this case there is no need to test plugin functionality.
Only checking if plugin is loaded in toolbar is sufficient.
2016-02-24 10:09:15 +08:00
Andrew Nicols
0ea14dd849 Merge branch 'MDL-52996-master' of https://github.com/sammarshallou/moodle 2016-02-23 12:44:06 +08:00
Rajesh Taneja
9b4903c8fd MDL-52970 behat: Wait for page to be ready after click
After click enusre to wait so text fields are not
use autosize
2016-02-19 15:23:49 +08:00
Eloy Lafuente (stronk7)
e8c82aac82 MDL-51580 upgrade: clean < 2.7.0 upgrade steps
This just deletes all the upgrade steps previous to 2.7.0. Some
small adjustments, like adding missing MOODLE_INTERNAL or tweaking
globals can also be applied when needed.

Next commit will get rid of/deprecate all the upgradelib functions
not used anymore in codebase.
2016-02-15 18:38:09 +01:00
sam marshall
f66da45fa5 MDL-52996 Atto: Allow plugins to customise toolbar 2016-02-04 12:42:27 +00:00
David Monllao
90902953a8 MDL-52825 atto: Listen to gesturemovestart to discard some events 2016-01-29 10:15:26 +08:00
David Monllao
923589d759 MDL-52825 atto: Ignore out of bounds event targets 2016-01-19 15:37:00 +08:00
Eloy Lafuente (stronk7)
c38bdd62c7 Merge branch 'MDL-51719-master' of git://github.com/danpoltawski/moodle 2015-12-22 13:07:01 +01:00
David Monllao
9e313e798f MDL-51784 general: Adding missing php4 style constructors
Adding them to warn people calling the php4 constructor.
2015-12-11 14:02:42 +08:00
Marina Glancy
c4d0b752a2 MDL-51784 various: use __construct() for PHP7 compatibility 2015-12-11 12:48:24 +08:00
Dan Poltawski
e746afacef MDL-51719 atto_rtl: RTL/LTR buttons now indicate state
Previously the RTL buttons did not indiciate wether RTL or LTR was
selected. Thanks to Andrew Nicols for guiding how to do this.
2015-11-27 14:03:53 +00:00
Andrew Nicols
b27d4eac7f MDL-45364 atto_rtl: Fix JS lint 2015-11-26 19:09:03 +00:00
Eloy Lafuente (stronk7)
6d29c4acdd MDL-52140 upgrade: add 3.0.0 separation line to all upgrade scripts 2015-11-17 17:08:56 +01:00
Frederic Massart
3b10fa25bc MDL-50564 atto: Require atto_menu in atto_plugin 2015-11-13 14:38:33 -06:00
David Monllao
212dc418d4 Merge branch 'MDL-51991-master' of git://github.com/ryanwyllie/moodle 2015-11-11 09:18:52 +08:00
Eloy Lafuente (stronk7)
2e144835bb MDL-52059 versions: bump all versions and requires near release
version = planned 2015111600 release version
requires= current 2015111000 rc3 version
2015-11-10 12:33:52 +01:00
Ryan Wyllie
d26d0d9b7e MDL-51991 atto_table: simplify settings
Cleaned up the language strings on the Atto table settings page
and reduced the number of settings options for border styling.
2015-11-10 08:15:01 +00:00
David Monllao
3f08e9b98a MDL-51000 editor_atto: No autosave for guests 2015-11-04 18:46:27 +08:00
Dan Poltawski
728754de6b Merge branch 'MDL-52018-master-enfix' of git://github.com/mudrd8mz/moodle 2015-11-03 17:56:21 +01:00
Helen Foster
da6ecfd8c1 MDL-52018 lang: Merge English strings from the en_fix language pack 2015-11-02 22:12:06 +01:00
Dan Poltawski
deec056650 Merge branch 'MDL-51854-master' of https://github.com/pauln/moodle 2015-11-02 09:08:01 +00:00
Ryan Wyllie
1c53bc813e MDL-51956 atto_table: fix bg colour bug
The table editor will now set the backgorund colour on the
table in Firefox version 34 and below.

Also expanded the dialogue slightly because the colour choices
were wrapping and I added some styling to put a gap in for the
metric markers for border width and table width.
2015-10-29 02:51:06 +00:00
Andrew Nicols
af39ce0f8d MDL-51880 atto_table: Coding style fix 2015-10-28 11:39:17 +08:00
Ryan Wyllie
f45937e17d MDL-51880 atto/plugins/table: improve table borders
* Removed the "No borders" option from general borders setting
  since it's a style choice.
* Added inherit, initial and unset as border style options.
* Made the border settings disabled if "Theme default" is selected.
* Changed the transparent colour to be "Theme default" which means
  apply no colour at all.
2015-10-28 03:28:36 +00:00
jinhofer
f067581828 MDL-45515 lib/editor/atto/plugins/table: added behat 2015-10-23 02:57:51 +00:00
jinhofer
b87e11c849 MDL-45515 atto/plugins: Added border style and BG colour to table
This commit adds the option for borders to be added and
styled, background colours to be set, and width to be set for tables
in the Atto HTML Editor. For those that desire to restrict
use of this, the plugin settings allow the admins to restrict
how much freedom their users have with borders.
2015-10-23 02:57:50 +00:00
Paul Nicholls
ca50279d4e MDL-51854 atto_image: Allow other plugins to handle drop events
The drop handler should only return false if it has actually handled the
drop event (i.e. it was an image) - otherwise, Atto plugins loaded after
this one don't get an opportunity to handle other drop events.
2015-10-22 11:58:57 +13:00
Andrew Nicols
8775bc4d40 Merge branch 'MDL-50079-master' of git://github.com/danpoltawski/moodle 2015-10-13 09:24:31 +08:00
Dan Poltawski
30b86ccb68 Merge branch 'MDL-51605-master' of git://github.com/damyon/moodle 2015-10-12 09:46:00 +01:00
Andrew Nicols
99690e0fa8 MDL-46497 atto: Whitespace/coding style fix 2015-10-12 13:37:29 +08:00
Lior Gil
2209309e2c MDL-46497 Atto: Fix adding redundant p elements in rtl/ltr actions 2015-10-10 01:36:48 +03:00
Dan Poltawski
cc75779fb4 MDL-50079 atto_link: respect new window option when creating from repo
Previously users had to go back and edit their link to set the new
window option.
2015-10-09 11:23:32 +01:00
Damyon Wiese
b3c10f9fb2 MDL-51605 Atto: Fix deprecation warnings from upgraded rangy 2015-10-09 15:42:10 +08:00
Andrew Nicols
ed845fa7fe Merge branch 'MDL-51228-master' of https://github.com/dthies/moodle 2015-10-06 16:31:34 +01:00
Eloy Lafuente (stronk7)
6a0deee441 Merge branch 'MDL-51227-master' of https://github.com/dthies/moodle 2015-10-01 00:25:31 +02:00
Damyon Wiese
fc07d950ea MDL-51605 Rangy: Patch out AMD support (we can't use it from YUI). 2015-09-30 13:17:28 +08:00
Damyon Wiese
0fde7efad1 MDL-51605 atto: Update rangy to 1.3.0 2015-09-30 13:08:15 +08:00
Dan Poltawski
2764d7a597 Merge branch 'wip-mdl-51424' of https://github.com/dthies/moodle 2015-09-29 20:33:28 +01:00
Daniel Thies
7bb2069bfa MDL-51227 editor_atto: Stop Chrome losing selection when formating 2015-09-25 09:32:46 -05:00
Damyon Wiese
28de777199 MDL-51222 Javascript: Trigger events for filters on DOM insertion
When nodes are added to the dom, they may need to be re-processed by a JS based
filter. To do this we need to trigger the legacy YUI event filter-content-updated.

To make this easier I added some wrappers to template that will insert the node, run any
JS and trigger the event.

I also changed existing yui code to call the amd function to trigger the event. This way
all jquery and yui listeners will always be notified.
2015-09-22 15:40:51 +08:00
Daniel Thies
c8719db169 MDL-51424 editor_atto: Save selection and editor contents after change 2015-09-21 08:53:16 -05:00