mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
71,173 Commits 36 Branches 519 Tags
Commit Graph

1063 Commits

Author SHA1 Message Date
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
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
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
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 acbcea51013bdf5d0101dc5856d8aca97bf1c036, reversing
changes made to 91f31c097dd46674d8535096e020ffa42536e854.
 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