Commit graph

19034 commits

Author SHA1 Message Date
Mark Nelson
db456ec1a5 MDL-40908 core_tag: created a 'tag_deleted' event 2014-04-03 18:15:32 -07:00
Mark Nelson
097bd4cdae MDL-40908 core_tag: created a 'tag_unflagged' event 2014-04-03 18:15:32 -07:00
Mark Nelson
6298494d73 MDL-40908 core_tag: replaced 'flag' add_to_log call with an event 2014-04-03 18:15:32 -07:00
Mark Nelson
cfa2c6e198 MDL-40908 core_tag: replaced 'add' add_to_log call with an event 2014-04-03 18:15:31 -07:00
Mark Nelson
09fce43469 MDL-40908 core_tag: replaced 'update' add_to_log calls with an event 2014-04-03 18:15:31 -07:00
Mathieu Petit-Clair
e4697e1fc9 MDL-44295 auth: Update truncate_userinfo to match current DB fields size. 2014-04-03 10:20:22 -04:00
Frederic Massart
06a9e10350 MDL-44933 themes: Allow chunking of CSS in designer mode 2014-04-03 17:12:10 +08:00
Frederic Massart
da28376022 MDL-44933 themes: LESS file was served in designer mode and IE 2014-04-03 17:12:09 +08:00
Damyon Wiese
441f94b263 MDL-43856 MathJax: Coding style cleanups. 2014-04-03 14:36:42 +08:00
Damyon Wiese
cc90cedc85 MDL-43856 MathJax: Improvements to the MathJax filter
* Remove all traces of mathjax from the atto equation editor - it is filter agnostic
* Add a M.core.event module for core events that can be published/subscribed to by plugins (loose coupling)
* Add a FILTER_CONTENT_UPDATED event so plugins can tell the filter system when nodes are added to the page
* Implement a listener for this event in the MathJax filter
* Fire this event from the equation editor and from the glossary filter
* Add a nolink tag to the mathjax filter, so equations will not be processed by the other filters
* Add a smarter throttle function to the equation editor preview updates (Y.throttle is dumb)
2014-04-03 14:36:36 +08:00
Damyon Wiese
289ed254a7 MDL-43856 MathJax: Add to standard plugins list 2014-04-03 14:36:33 +08:00
Damyon Wiese
8939ebac77 MDL-43856 MathJax: alter the equation editor to make it use MathJax if it is available.
If MathJax is loaded by any means, the editor should use it instead of the filter. This prevents
slow ajax requests and gives much better rendering. MathJax could be loaded by the filter,
or it could just be done the old way by sticking the include in the page header.
2014-04-03 14:36:25 +08:00
Frederic Massart
52329a32f1 MDL-44747 editor_atto: Improved configuration error messages 2014-04-03 11:24:05 +08:00
Frederic Massart
24650c78bb MDL-44235 atto_table: A long table caption does not overlap the table content 2014-04-03 11:05:38 +08:00
Damyon Wiese
af6a2e9459 MDL-44846 Atto: Make the color plugins reliable.
The problem is that in IE, the browser implements color commands with font tags (<font color=...>).

We specifically strip font tags to avoid abuse when pasting from word (the world has seen enough of Tahoma).

This solution instead uses Rangy to set inline styles on the selection. This works in all browsers nicely.

I also updated the toggleInlineSelectionClass function to use the same rangy function. This solves problems with
whitespace squashing in ie.
2014-04-03 10:52:41 +08:00
Eloy Lafuente (stronk7)
fc7557677d MDL-44720 modinfo: whitespace fix 2014-04-02 23:17:10 +02:00
Eloy Lafuente (stronk7)
6b8798dedb Merge branch 'wip-MDL-44720-master' of git://github.com/marinaglancy/moodle 2014-04-02 21:32:42 +02:00
Frederic Massart
907a6737fc MDL-44912 libraries: Allow empty values in admin setting colour picker 2014-04-02 17:20:58 +08:00
Marina Glancy
ac32e42827 Merge branch 'MDL-42891-master' of git://github.com/ankitagarwal/moodle 2014-04-02 14:54:59 +08:00
Ankit Agarwal
2b0c88e2f6 MDL-42891 adminstration: update strings and display for login fails 2014-04-02 14:18:25 +08:00
Eloy Lafuente (stronk7)
c790670d77 Merge branch 'MDL-30085_grade_ws' of git://github.com/jleyva/moodle 2014-04-02 04:05:19 +02:00
Andrew Nicols
9ad87e7900 MDL-44749 atto_collapse: Skip button inclusion if it will impact UX
Do not show the collapse button if:
* it's specified after the cut-off and would therefore be unusable; or
* the total number of groups matches the number of groups to display anyway.
2014-04-02 09:52:22 +08:00
Eloy Lafuente (stronk7)
0555761203 Merge branch 'w14_MDL-44843_m27_localedash' of https://github.com/skodak/moodle 2014-04-02 02:22:51 +02:00
Sam Hemelryk
3ed2a4b2cc Merge branch 'w14_MDL-44824_m27_subplugins' of https://github.com/skodak/moodle 2014-04-02 13:04:46 +13:00
Eloy Lafuente (stronk7)
57c92af7ad Merge branch 'MDL-42816-master' of https://github.com/StudiUM/moodle 2014-04-02 01:52:41 +02:00
Eloy Lafuente (stronk7)
929e32489f Merge branch 'MDL-28261-master' of git://github.com/andrewnicols/moodle 2014-04-02 01:12:52 +02:00
Eloy Lafuente (stronk7)
e154e9d8cd Merge branch 'MDL-44000-master' of git://github.com/damyon/moodle
Conflicts:
	lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js
2014-04-02 00:27:30 +02:00
Sam Hemelryk
de878a38c8 Merge branch 'MDL-44719-master' of git://github.com/FMCorz/moodle
Conflicts:
	lib/deprecatedlib.php
2014-04-02 09:54:13 +13:00
Sam Hemelryk
8412561a3d Merge branch 'MDL-44756_help' of https://github.com/andyjdavis/moodle 2014-04-02 09:51:47 +13:00
Sam Hemelryk
53361c3087 Merge branch 'MDL-44772-master' of git://github.com/FMCorz/moodle
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
2014-04-02 09:43:25 +13:00
Sam Hemelryk
3b07cc1c4e Merge branch 'MDL-44762-master' of git://github.com/FMCorz/moodle 2014-04-02 09:29:11 +13:00
Sam Hemelryk
9b1a4cde78 Merge branch 'MDL-44834-master' of git://github.com/FMCorz/moodle
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
2014-04-02 09:28:49 +13:00
Sam Hemelryk
0ea11b7cee Merge branch 'MDL-32729-master' of git://github.com/andrewnicols/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-04-02 09:27:23 +13:00
sam marshall
e645b4d580 MDL-43975 Sessions: Should support memcache, not just memcached
This commit adds a session handler which works using memcache (without
requiring the memcached extension), similar to the support for
memcache within MUC.

This may be less reliable than memcached but we have been using a
similar approach on our system without problems. In case, I added a
warning in config-dist.php.
2014-04-01 13:34:50 +01:00
Marina Glancy
b3d75528de Merge branch 'w14_MDL-40910_m27_usergraded' of git://github.com/skodak/moodle 2014-04-01 17:40:35 +08:00
Ankit Agarwal
53b9e63b80 MDL-42891 administration: Replace use of logtable in notify_login_failures() with new logging apis 2014-04-01 17:35:01 +08:00
Ankit Agarwal
52dc1de746 MDL-42891 administration: Re-implement incorrect login notification, without using the logtable. 2014-04-01 17:18:15 +08:00
Marina Glancy
5bb81ad437 Merge branch 'MDL-44770-master' of git://github.com/jethac/moodle 2014-04-01 15:50:14 +08:00
Jetha Chan
b1421abdb6 MDL-44770 editor_atto: moved table context menu 2014-04-01 15:46:37 +08:00
Marina Glancy
1a1049990f Merge branch 'MDL-44759-master' of git://github.com/FMCorz/moodle 2014-04-01 15:42:21 +08:00
Marina Glancy
99342b5197 Merge branch 'MDL-43999-master' of git://github.com/damyon/moodle 2014-04-01 15:35:05 +08:00
Marina Glancy
7fff0290eb Merge branch 'MDL-44777-master' of git://github.com/FMCorz/moodle 2014-04-01 15:34:44 +08:00
Marina Glancy
9632cad16b Merge branch 'MDL-44717-master' of git://github.com/ankitagarwal/moodle 2014-04-01 15:34:28 +08:00
Marina Glancy
9746748e04 Merge branch 'W14_MDL-44862_m27_pgsocket' of git://github.com/skodak/moodle 2014-04-01 15:33:38 +08:00
Damyon Wiese
43a737d1b5 MDL-43999 Atto : Make image dialogue open on double click of an image. 2014-04-01 15:22:12 +08:00
Frederic Massart
1eb5839cf9 MDL-44777 atto_equation: More consistent width of buttons 2014-04-01 15:21:11 +08:00
Ankit Agarwal
b63f773296 MDL-44717 events: Fix multiple issues in events
Fix various incorrect urls
Fix incorrect phpdocs and other minor code style issues
Fix missing/incorrect strings

AMOS BEGIN
 MOV [eventblogassociationcreated, core_blog],[eventblogassociationadded, core_blog]
AMOS END
2014-04-01 15:08:34 +08:00
Marina Glancy
364411b123 MDL-44747 editor_atto: coding error fixed 2014-04-01 14:55:39 +08:00
Ankit Agarwal
85a4b8a3ce MDL-44717 events: Event restore process must call the init() method 2014-04-01 14:51:02 +08:00
Marina Glancy
3accdbff60 Merge branch 'MDL-44234-master' of git://github.com/FMCorz/moodle 2014-04-01 14:44:13 +08:00