Commit Graph

1305 Commits

Author SHA1 Message Date
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
Sam Hemelryk 15a4139506 Merge branch 'MDL-47484' of git://github.com/aolley/moodle 2014-10-08 11:40:49 +13:00
Andrew Nicols ee7432b32c MDL-46531 editor_atto: Color plugins should use classes rather than hardcoded colours 2014-10-06 12:07:31 +08:00
Adam Olley 8180281b73 MDL-47484 atto_indent: Prevent loss of rangy markers in some cases 2014-10-01 13:53:23 +09:30
Sam Hemelryk 2957fdddd5 Merge branch 'm28_MDL-47170' of https://github.com/totara/moodle 2014-09-30 10:03:06 +13:00
Brian Barnes e02d3cf2a0 MDL-47170 tiny_mce: Fixed display of bullets in rtl languages 2014-09-09 15:37:23 +12:00
Damyon Wiese 3a7887baa4 MDL-47060 Atto: Autosave - play nicely with HTML source view.
There are 2 fixes here:
1. do not overwrite the changes to the HTML source when we do an autosave.
2. Move the Atto notifications alert to the containing div so it aligns properly for either view.
2014-09-03 15:00:02 +08:00
Eloy Lafuente (stronk7) 934a22a333 Merge branch 'm28_MDL-46875' of https://github.com/totara/moodle 2014-08-27 01:41:58 +02:00
Damyon Wiese 6d9a83c294 Revert "Merge branch 'MDL-46917-master' of git://github.com/andrewnicols/moodle"
This reverts commit acbcea5101, reversing
changes made to 91f31c097d.
2014-08-26 17:18:03 +08:00
Brian Barnes 24af352b40 MDL-46875 tinymce: Fixed issue with full screen and spelling 2014-08-26 13:19:43 +12:00
Andrew Nicols 1b8f073de3 MDL-46917 atto: Focus on the editor when the form label is selected 2014-08-22 08:58:21 +08:00
Marina Glancy ea1a0ff85a NOBUG: Fixed file access permissions 2014-08-21 10:18:37 +08:00
uhunkler 6dccf359a0 MDL-46302 correct atto img float right
Correct the atto image "float right" margin CSS
2014-08-20 00:59:31 +02:00
Damyon Wiese 9eea856632 MDL-18014 Atto autosave: Add a timemodified field to the auto save drafts
Do not restore any draft older than 4 days to (sort of) sync with the draft file
lifetime.
2014-08-19 12:30:13 +08:00
Damyon Wiese 942501f318 MDL-18014 Atto autosave: When text is recovered, force it into the undo stack
This allows you to use "Undo" to go back to the unaltered text in the form.
2014-08-19 12:13:41 +08:00
Damyon Wiese c07f86ce26 MDL-18014 Atto autosave: Use the $PAGE->url to differentiate autosave instances 2014-08-14 13:23:05 +08:00
Damyon Wiese d8733567ee MDL-18014 Atto autosave: Redo version bump after rebase 2014-08-14 12:44:01 +08:00
Damyon Wiese 56579fb68b MDL-18014 Atto autosave: Change ajax script path to an attribute 2014-08-14 12:44:00 +08:00
Damyon Wiese e7a8977ef4 MDL-18014 Atto: Fix for error handling bug on autosave 2014-08-14 12:43:47 +08:00
Damyon Wiese f1018cd615 MDL-18014 Atto: Make notifications fade in/out. 2014-08-14 12:43:32 +08:00
Damyon Wiese a10c6ea8fc MDL-18014 Atto: Language change for auto save text.
Make this text shorter so it's less distracting.
2014-08-14 12:43:14 +08:00
Damyon Wiese 19549f8bed MDL-18014 Atto: Assorted coding style changes from peer review 2014-08-14 12:43:14 +08:00
Damyon Wiese 6bfd450a6d MDL-18014 Atto: Make the autosave frequency configurable 2014-08-14 12:43:04 +08:00
Damyon Wiese a108fbeecf MDL-18014 Atto: Add a notification when text is autosaved. 2014-08-14 12:42:55 +08:00
Damyon Wiese 8593521f4c MDL-18014 Atto autosave: Fix coding style issues 2014-08-14 12:42:46 +08:00
Damyon Wiese e3502577b8 MDL-18014 Atto: Reset auto save frequency to 60 seconds. 2014-08-14 12:42:45 +08:00
Damyon Wiese c195bbffab MDL-18014 Atto autosave: Correct detection of autosaving error when session expired 2014-08-14 12:42:37 +08:00
Damyon Wiese 8a5db5472e MDL-18014 Atto autosave: Show warning when the server cannot be contacted for autosave. 2014-08-14 12:42:27 +08:00
Damyon Wiese ddaeae21fd MDL-18014 Atto autosave: Change default autosave frequency to 60 seconds 2014-08-14 12:42:17 +08:00
Damyon Wiese 75c86d13c7 MDL-18014 Atto: Add notification support to Atto. 2014-08-14 12:42:06 +08:00
Damyon Wiese 2ba6706d12 MDL-18014 Atto: Autosave text every N seconds. 2014-08-14 12:41:55 +08:00
Andrew Nicols 4dbc02f664 MDL-45780 editor_atto: Update the textarea more often
This change updates the frequency of the textarea update to additionally
update it:
* on keypress; and
* on content paste.
2014-08-11 12:31:36 +08:00
Damyon Wiese 016bbe2c2c MDL-44116 Atto: Improve new accessibility sniffs.
Check for empty text it row, column headers and captions on tables.
Link to "Entire document" text instead of repeating the entire document if the text is long and has no headings.
2014-07-30 12:06:20 +08:00
Damyon Wiese e5b5b5be4d MDL-44116 Atto Accessbility checker: Additional sniffs. 2014-07-21 15:18:22 +08:00
Dan Poltawski e1673b58ec MDL-46240 atto_collapse: fix icon url 2014-07-04 14:33:39 +01:00