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

18692 commits

Author SHA1 Message Date
Marina Glancy
585ff7eaec Merge branch 'MDL-45462-master' of git://github.com/FMCorz/moodle 2014-05-08 19:50:13 +08:00
Andrew Nicols
83e8f495f2 MDL-45472 AJAX: Whitelist prototype values form JS Error in exception dialogue 2014-05-08 16:44:11 +08:00
Andrew Nicols
079c3a9446 MDL-45444 editor_atto: Fix vertical alignment of editor buttons 2014-05-08 12:33:12 +08:00
Frederic Massart
6f6345e327 MDL-45462 flickr: Requests are now done over HTTPS 2014-05-08 11:27:36 +08:00
Dan Poltawski
d1a316373f Merge branch 'MDL-45425-master' of git://github.com/andrewnicols/moodle 2014-05-08 11:05:20 +08:00
Dan Poltawski
327c382c47 MDL-43312 tinymce: bump plugin version 2014-05-08 10:52:36 +08:00
Dan Poltawski
dac2e286da Merge branch 'MDL-43312-master' of git://github.com/damyon/moodle 2014-05-08 10:51:51 +08:00
Sam Hemelryk
1c17e19a5c MDL-45457 phpdoc: fixed up a couple of @package typos 2014-05-08 08:14:10 +12:00
Eloy Lafuente (stronk7)
83b25b12ff Merge branch '45231-27-3' of git://github.com/samhemelryk/moodle 2014-05-07 15:50:15 +02:00
Dan Poltawski
917ceadbd7 Merge branch 'wip-MDL-45319-master' of git://github.com/marinaglancy/moodle 2014-05-07 17:51:31 +08:00
Frederic Massart
ba4e81d249 MDL-45447 editor_atto: Highlight collapse and html icons when toggled 2014-05-07 17:44:06 +08:00
Dan Poltawski
fb3f578f41 Merge branch 'MDL-45410-en_fix' of git://github.com/mudrd8mz/moodle 2014-05-07 16:38:00 +08:00
Mark Nelson
425e761712 MDL-45319 events: added debugging messages for missing relateduserid value 2014-05-07 16:28:59 +08:00
Mark Nelson
f1e0f66ca8 MDL-45319 events: set the relateduserid when triggering the user_created/updated/deleted events 2014-05-07 16:28:59 +08:00
Mark Nelson
e687396a1e MDL-45319 events: trivial changes 2014-05-07 16:28:59 +08:00
Andrew Nicols
ee37639542 MDL-45425 editor_atto: Check for change selections asynchronously 2014-05-07 14:30:28 +08:00
Damyon Wiese
6363588b72 MDL-43312 TinyMCE: Version bump to 3.5.10. Remove all the hacks. 
I retested the old bugs that required custom hacks to tinymce and could not reproduce them,
so I have not reimplemented the hacks.
 2014-05-07 12:54:43 +08:00
Jetha Chan
c9b94fb0d4 MDL-45387 core_form: erroneous escaping on reference list 
Fixed erroneous escaping in JS.
 2014-05-07 10:52:51 +08:00
Helen Foster
f15fa7a281 MDL-45410 Merge English strings from the en_fix language pack 2014-05-07 00:16:51 +02:00
Sam Hemelryk
cfd97e02f7 MDL-45231 theme_clean: navbar is absolute when running behat in IE 2014-05-07 09:42:07 +12:00
Andrew Nicols
02915dfc23 MDL-45357 events: Remove unnecessary the before 'id' in event descriptions 2014-05-06 16:45:05 +08:00
Andrew Nicols
f32629c7ea MDL-45357 events: Improve clarity of allow role change descriptions 2014-05-06 16:43:56 +08:00
Mark Nelson
196d227f21 MDL-45357 events: removed unnecessary verb from description 2014-05-06 16:43:29 +08:00
Andrew Nicols
eb497e26fb MDL-45338 editor_atto: Correct gesturemoveend listening 
Delegate gesturemoveend rather than listen to ensure adequate event filters
and that we apply to only the correct editor.
 2014-05-06 16:10:31 +08:00
Marina Glancy
e7efd59b51 Merge branch 'MDL-45409-master' of git://github.com/ankitagarwal/moodle 2014-05-06 12:19:58 +08:00
Dan Poltawski
02c482704b Merge branch 'MDL-45403-master' of git://github.com/FMCorz/moodle 
Conflicts:
	lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js
 2014-05-06 11:48:38 +08:00
Dan Poltawski
73c2ae4bff Merge branch 'MDL-45253-master' of git://github.com/FMCorz/moodle 
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
 2014-05-06 11:34:17 +08:00
Dan Poltawski
63469ab11d Merge branch 'MDL-45338-master' of git://github.com/andrewnicols/moodle 2014-05-06 11:27:41 +08:00
Dan Poltawski
5bf52355ea Merge branch 'MDL-30106' of git://github.com/jleyva/moodle 2014-05-06 10:25:48 +08:00
Juan Leyva
e2ede4262f MDL-30106 forum: New web service mod_forum_get_forum_discussion_posts 2014-05-05 11:55:43 +02:00
Frederic Massart
664c851755 MDL-45403 editor_atto: Change default for tagMarchRequiresAll to true 2014-05-05 17:47:54 +08:00
Frederic Massart
e76ae8077a MDL-45253 editor_atto: Async the highlighting of buttons 2014-05-05 17:46:13 +08:00
Frederic Massart
fafeb5a293 MDL-45253 editor_atto: Check for button highlights on change event 
This will allow a button to be highlighted when a plugin has updated
the content, not only when the selection has changed.
 2014-05-05 17:46:13 +08:00
Frederic Massart
e988383645 MDL-45253 editor_atto: Prevent selection of all nodes when selection is empty 2014-05-05 17:46:13 +08:00
Frederic Massart
d78920bdba MDL-45253 editor_atto: selectionFilterMatches includes parents 2014-05-05 17:46:13 +08:00
Damyon Wiese
6d8617bed9 Merge branch 'MDL-45359-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
 2014-05-05 17:24:08 +08:00
Marina Glancy
d0144cd38e Merge branch 'MDL-44972-master' of git://github.com/damyon/moodle 2014-05-05 17:17:11 +08:00
Marina Glancy
b9c5bae5b1 Merge branch '45231-27-2' of git://github.com/samhemelryk/moodle 2014-05-05 17:16:52 +08:00
Damyon Wiese
c1660772b1 MDL-44972 Atto dialogues: Change M.core.dialogue attribute name to "focusOnShowSelector" 
And some minor cleanups.
 2014-05-05 16:27:36 +08:00
Ankit Agarwal
5793538a59 MDL-45409 conditional_activity: Do not iterate over deprecated properties 2014-05-05 16:26:35 +08:00
Marina Glancy
16feb870d4 Merge branch 'MDL-45357_master' of git://github.com/markn86/moodle 2014-05-05 16:09:53 +08:00
Mark Nelson
c5cfb3ca98 MDL-45357 events: changed event descriptions to ensure consistency in core 2014-05-05 00:55:50 -07:00
Damyon Wiese
e5ddec38cd MDL-44972 Atto: Focus on the first input field in forms in dialogues. 2014-05-05 15:21:11 +08:00
Damyon Wiese
2372366f58 MDL-44224: outdent plugin - handle divs that have been silently switched for ps 
Also - fix a shifter warning.
 2014-05-05 14:07:02 +08:00
Sam Hemelryk
b16c2ec5c8 MDL-44224 atto_indent: converts blockquotes to div indents 2014-05-05 14:07:01 +08:00
Sam Hemelryk
31a8eddc24 MDL-45231 theme_clean: default navbar to absolute when running behat 2014-05-05 08:11:46 +12:00
Andrew Nicols
e30506416b MDL-45338 editor_atto: Check for selection changes on touch-based devices too 2014-05-02 14:03:16 +08:00
Frederic Massart
16c6440dcb MDL-45382 atto_link: Missing context when finding anchors 2014-05-02 12:02:36 +08:00
Damyon Wiese
6e4c18522d Revert "MDL-45239 editor_atto: The editor cannot be active if it is not the active element" 
This reverts commit 05a7f9e749.
 2014-05-01 16:22:41 +08:00
Dan Poltawski
9d39960028 Merge branch 'MDL-43570' of https://github.com/KristerV/moodle 
Conflicts:
	version.php
 2014-05-01 14:43:22 +08:00