moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-10 11:26:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
103782 commits 37 branches 544 tags 1.3 GiB
Commit graph

1502 commits

Author SHA1 Message Date
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
Sam Chaffee
5090d26b3a MDL-50936 Atto: Add upgrade path for updating equations setting 2015-09-16 08:24:26 +08:00
Jason Hardin
4f758d7716 MDL-50936 Atto: Add missing math equation buttons 2015-09-16 08:23:20 +08:00
Daniel Thies
d0ec31716b MDL-51228 atto_editor: Add documententation for inlineFormat flag 2015-09-13 14:29:07 -05:00
Adrian Greeve
40a154551f MDL-48371 editors: Option for removing managefiles 
We want to remove the managefiles button from the
editors in the wiki so that students don't delete
each others files.
 2015-09-07 09:59:35 +01:00
David Monllao
9f6a55f7ea Merge branch 'MDL-51179-master' of git://github.com/damyon/moodle 
Conflicts:
	lib/upgrade.txt
 2015-09-01 15:57:21 +08:00
Damyon Wiese
988592c556 MDL-51179 Atto: Extend autosave fix to cover text changes 
Added new functions to editor api - set/get_text so the
original form text can be determined from an editor.

When calling use_editor() you should first call set_text() with
the text that will be inserted in the form element.

There is also a new scheduled task for cleaning Atto autosave drafts.
 2015-09-01 12:23:00 +08:00
Damyon Wiese
6f0dfdd969 MDL-51179 Atto: Add a behat test for autosave 2015-08-28 12:09:34 +08:00
Daniel Thies
2975411139 MDL-51228 editor_atto: Apply style in plugins if selection is collapsed 2015-08-27 12:15:16 -05:00
Damyon Wiese
572e00928a MDL-51179 Atto: When a resume is aborted - create a fresh draft for future saves. 2015-08-26 14:15:53 +08:00
Damyon Wiese
2e96b001c4 MDL-51179 Atto: Abort autosave if there are more recent changes to the files 
If the files in the draft area have been modified more recently than the timestamp
of the draft - do not restore the files, or you will delete any newer files. We
cannot really guess here - merging the 2 lists of files will be wrong.
 2015-08-25 16:09:57 +08:00
David Monllao
bcd58d9ff7 MDL-50801 atto_table: Caption node might not be present 
Users may not use atto table (which always adds a caption) to set
HTML tables, this patch addresses that case.
 2015-08-20 15:25:44 +08:00
Eloy Lafuente (stronk7)
05f97c615c Merge branch 'MDL-50801_master' of git://github.com/dmonllao/moodle 2015-08-19 19:14:00 +02:00
Dan Poltawski
215c5cf5c2 MDL-46387 shifter: missing built changes 2015-08-19 18:30:32 +02:00
David Monllao
556decf159 MDL-50801 atto_table: Allow caption position to be set 2015-08-19 09:02:45 +08:00
Daniel Thies
2f62ae82a1 MDL-46387 editor_atto: Add behat test for sub/sup 2015-08-16 15:10:02 -05:00
Daniel Thies
dc9ca4acea MDL-46387 editor-atto: Toggle sub/sup tags using rangy 
In order to have a consistant browser behavior and prevent nesting of
subscripts and superscripts, tags are converted to CSS classes and then
the CSS classes in the selection are toggeled using the rangy crossbrowser
selection library already included in Atto without using an execCommand.
 2015-08-13 15:46:29 -05:00
Eloy Lafuente (stronk7)
525dce0ade Merge branch 'MDL-49732_master' of https://github.com/jinhofer/moodle 2015-07-07 19:18:19 +02:00
jinhofer
aa65ecea98 MDL-50304 atto/plugins/table: Fixed _addRowAfter function 2015-05-28 07:53:10 -05:00
jinhofer
36231b6cd5 MDL-49732 atto/plugins/link: Added CTRL+K for creating a link 2015-05-26 15:45:05 -05:00
Eric Merrill
0f7f2134a7 MDL-48467 atto: Clean the textarea during submission when in HTML mode 2015-05-19 01:39:22 +02:00
Eloy Lafuente (stronk7)
b758ab3053 MDL-50183 upgrade: add 2.9.0 separation line to all upgrade scripts 2015-05-12 00:21:05 +02:00
Eloy Lafuente (stronk7)
26ea380d24 MDL-50102 versions: bump all versions and requires near release 
version = planned 2015051100 release version
requires= current 2015050500 rc1 version

Note: On purpose, the course format social wrong version (2015102100)
has been kept unmodified. Looking forward a solution right now.
 2015-05-05 17:43:19 +02:00
John Okely
4887d15228 MDL-49983 navigation: Remove 'my' from user context navigation 2015-05-04 12:38:50 +08:00
Helen Foster
0634dc3b76 MDL-50033 lang: Merge English strings from the en_fix language pack 2015-04-29 21:43:00 +02:00
Dan Poltawski
0627d5802c Merge branch 'wip-MDL-45774-master' of git://github.com/abgreeve/moodle 2015-04-14 15:32:13 +08:00
Damyon Wiese
5d25a2cbe9 MDL-49412 User Navigation: Behat fixes for editors 
Part of MDL-45774
 2015-04-10 17:18:24 +08:00
Nadav Kavalerchik
b555d94d60 MDL-49762 Atto: Set HTML directionality to LTR, in RTL mode. 2015-04-09 16:09:01 +03:00
Eloy Lafuente (stronk7)
82cf09885c Merge branch 'MDL-49686-master' of git://github.com/merrill-oakland/moodle 
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
 2015-04-02 11:08:11 +02:00
Andrew Nicols
df15759724 Merge branch 'wip-mdl-49513' of https://github.com/rajeshtaneja/moodle 2015-04-02 11:06:27 +02:00
Eloy Lafuente (stronk7)
b485fb20dd Merge branch 'MDL-49693-master' of git://github.com/merrill-oakland/moodle 
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
 2015-04-02 11:05:32 +02:00
Rajesh Taneja
bed97c39eb MDL-49513 behat: Set admin config using php api 
Added a new set to set config using set_config() api
to make steps faster and more efficient
 2015-04-01 14:25:23 +08:00
Damyon Wiese
2112dd44e8 MDL-49578 TinyMCE: Update to 3.5.11 2015-03-31 19:38:53 +01:00
Dan Poltawski
3d8b835aec Merge branch 'MDL-49564-master' of git://github.com/merrill-oakland/moodle 
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
 2015-03-31 19:25:10 +01:00
Eric Merrill
9029ce75eb MDL-49693 atto: Clean textarea contents before inserting into editor 2015-03-27 12:27:00 -04:00
Eric Merrill
8e202bd80a MDL-49686 atto: Process style and class attributes in sub-functions 
To ensure we only clean style and classes, first we select the inside
of those attributes and "replace" them with handler functions. Those
functions scan the actual attribute values for class or styles that
we want to exclude.

The first level regex has 3 groups. group1 selects everything in the
tag leading up to the attribute values, group2 has the attributes,
group3 has the trailing quote mark. We work on group2 then return
the combination of group1, group2, and group3.
 2015-03-27 11:36:05 -04:00