David Monllao
9ecf0674ff
Merge branch 'MDL-56870-master-v2' of https://github.com/snake/moodle
2016-11-17 12:18:26 +08:00
Andrew Nicols
76acac80eb
Merge branch 'MDL-56978_iconv' of https://github.com/mrmark/moodle
2016-11-17 11:20:39 +08:00
Jake Dallimore
a428cf4ac8
MDL-56870 lib: block access to deleted module in require_login
2016-11-17 10:57:13 +08:00
David Monllao
75166d0627
Merge branch 'wip-mdl-56865' of https://github.com/rajeshtaneja/moodle
2016-11-17 10:35:38 +08:00
David Monllao
6dc3a5b699
Merge branch 'MDL-56915-master' of git://github.com/FMCorz/moodle
2016-11-17 10:32:00 +08:00
Jun Pataleta
26dca05d02
MDL-56407 message: Indicate user is blocked in message area
2016-11-17 09:11:37 +08:00
Rajesh Taneja
920d7ffadd
MDL-56865 behat: Don't set error handler for behat install
2016-11-17 08:56:54 +08:00
Mark Nielsen
6670d28fbc
MDL-56978 core: fix error handling in min_fix_utf8
...
Must completely suppress notice from iconv as Behat's
shutdown function uses error_get_last() which is
unable to detect if the error was suppressed or not.
2016-11-16 08:59:15 -08:00
Eloy Lafuente (stronk7)
e7b9ea226c
Merge branch 'MDL-56911-master' of git://github.com/ankitagarwal/moodle
2016-11-16 10:33:09 +01:00
Frederic Massart
35b48c7aed
MDL-56915 webdav: Increase maximum expected header size
2016-11-16 17:19:19 +08:00
Andrew Nicols
7da7c1e24a
Merge branch 'wip-MDL-56603-master-v2' of git://github.com/abgreeve/moodle
2016-11-16 15:36:37 +08:00
Adrian Greeve
d3d0248afc
MDL-56603 message: Added see all link to message popup.
2016-11-16 14:51:17 +08:00
Andrew Nicols
faadaedb17
Merge branch 'wip-mdl-56710' of https://github.com/rajeshtaneja/moodle
2016-11-16 14:14:26 +08:00
David Monllao
12ebaf1c6b
Merge branch 'MDL-56187-master' of git://github.com/damyon/moodle
2016-11-16 13:35:38 +08:00
David Monllao
97279f8d5d
Merge branch 'MDL-56139_master' of git://github.com/markn86/moodle
2016-11-16 11:51:18 +08:00
Andrew Nicols
90677673da
Merge branch 'MDL-56958-master' of git://github.com/damyon/moodle
2016-11-16 11:07:20 +08:00
Mark Nelson
af5765b3fb
MDL-56139 core_message: removed unused constants
2016-11-16 10:22:52 +08:00
Mark Nelson
ffd7798c96
MDL-56139 core: changes after peer review
...
- No longer use the Fibonacci sequence for delaying the timeout.
It is too aggressive.
- The backoff_timer AMD module now expects the callback AND the
backoff function to be passed to the constructor.
- Added ability to specify polling frequency in config.php.
- Added helper function to return the cache key.
- Reworded the parameters for clarity.
2016-11-16 10:22:52 +08:00
Ryan Wyllie
fb1469d84f
MDL-56139 message: ajax poll for new messages in message area
2016-11-16 10:22:33 +08:00
David Monllao
8898725385
Merge branch 'MDL-56921_master' of https://github.com/nadavkav/moodle
2016-11-16 10:04:37 +08:00
Rajesh Taneja
4b371f9769
MDL-56710 editor: Fix box-sizing to context box
...
With BS4, box-sizing is border-box and this leads to
icon not shown properly. TinyMCE toolbar should use
box-sizing as context-box
2016-11-16 08:37:15 +08:00
Andrew Nicols
6aefea74a4
Merge branch 'MDL-55209' of https://github.com/NeillM/moodle
2016-11-16 08:24:39 +08:00
David Monllao
1c70e86b5e
Merge branch 'MDL-56942-master' of git://github.com/jleyva/moodle
2016-11-16 08:09:54 +08:00
David Monllao
900a2c554e
Merge branch 'm32_MDL-56917_TLS_Env_Checks_Based_On_Caps_Not_Raw_Version' of https://github.com/scara/moodle
2016-11-16 05:31:55 +08:00
Matteo Scaramuccia
ade30c673c
MDL-56917 core_upgrade: Do not use the raw version to check cURL caps.
...
Some Linux distros can backport features due to security issues
while keeping the same (old) version. See e.g.:
- RHEL 7, https://rhn.redhat.com/errata/RHSA-2015-2159.html
- RHEL 6, https://rhn.redhat.com/errata/RHBA-2016-0842.html
- Remi PHP 7.0.x, https://github.com/remicollet/remirepo/commit/87954ef9ca41
2016-11-15 21:50:07 +01:00
Michael Aherne
ef97f1a24e
MDL-56971 enrol: Use autoloading in enrol_get_plugin()
2016-11-15 12:22:54 +00:00
David Monllao
2f3ae73ab0
Merge branch 'wip-MDL-56899-master' of git://github.com/marinaglancy/moodle
2016-11-15 09:07:41 +00:00
Andrew Nicols
7afc76fbd6
Merge branch 'MDL-56952-master' of git://github.com/damyon/moodle
2016-11-15 09:07:37 +00:00
Andrew Nicols
2d45ac279d
Merge branch 'MDL-56823' of git://github.com/aolley/moodle
2016-11-15 09:07:36 +00:00
David Monllao
1cc10f3f67
Merge branch 'MDL-56895-master' of git://github.com/danpoltawski/moodle
2016-11-15 09:07:35 +00:00
David Monllao
0fef835188
Merge branch 'MDL-56739-master' of git://github.com/jleyva/moodle
2016-11-15 09:07:35 +00:00
Eloy Lafuente (stronk7)
2589802489
Merge branch 'MDL-56910-master' of git://github.com/danpoltawski/moodle
2016-11-15 09:07:33 +00:00
Ankit Agarwal
dc48cc0a79
MDL-56911 themes: Resolve settings before calling parser
2016-11-15 13:34:52 +05:30
Damyon Wiese
946281d282
MDL-56958 ajax: Prefer the general renderer
2016-11-15 12:44:59 +08:00
Damyon Wiese
204413187e
MDL-56952 plugininfo: You can uninstall theme_base
2016-11-15 08:55:41 +08:00
Dan Poltawski
f6dabb3194
MDL-56910 filepicker: give button BS styling
2016-11-14 15:46:49 +00:00
Dan Poltawski
55e54953a4
Merge branch 'MDL-56916-master-normalizedoc' of git://github.com/mudrd8mz/moodle
2016-11-14 13:09:48 +00:00
Dan Poltawski
8d857d0ecc
Merge branch 'MDL-56839-master' of git://github.com/jleyva/moodle
2016-11-14 13:06:48 +00:00
Juan Leyva
449e15f092
MDL-56942 login: Add missing required lib in complete_user_login
2016-11-14 12:07:54 +00:00
Eloy Lafuente (stronk7)
dd24216a3b
Merge branch 'MDL-56880-m' of https://github.com/micaherne/moodle
2016-11-14 12:04:25 +01:00
Dan Poltawski
6b8c8f4bc2
Merge branch 'MDL-56711-master' of git://github.com/damyon/moodle
2016-11-14 08:21:14 +00:00
Marina Glancy
f31e1e8b25
MDL-56899 filter: suppress dom parsing errors
...
Domdocument does not know about <video> and <audio> tags, also it's too strict for html style
solution from http://stackoverflow.com/questions/6090667/php-domdocument-errors-warnings-on-html5-tags
2016-11-14 15:16:09 +08:00
Damyon Wiese
c1ae9079db
MDL-56187 theme_boost: Atto fields styling for validation errors
2016-11-14 13:13:46 +08:00
Damyon Wiese
f2405a5f5c
MDL-56242 theme_boost: Fix styling for confirm boxes (js and in page)
...
They should be left aligned with a header, content and footer (right aligned with the buttons).
There should be a primary continue button and a secondary cancel button.
2016-11-14 11:11:28 +08:00
Nadav Kavalerchik
974573b4ea
MDL-56921 Atto: Image alignment should not be RTLed in RTL mode.
2016-11-13 12:31:42 +02:00
David Mudrák
6b6a2ec439
MDL-56916 docs: Fix documentation of the normalize_component return
2016-11-12 10:45:29 +01:00
Dan Poltawski
b1f3de5793
MDL-56895 porfolio: give buttons bootstrap styling
2016-11-11 12:39:35 +00:00
Dan Poltawski
e9eec33560
Merge branch 'MDL-56602-master-upgrade' of git://github.com/andrewnicols/moodle
2016-11-11 10:22:20 +00:00
Andrew Nicols
9fa6d4e04e
Merge branch 'MDL-55121-master' of git://github.com/lameze/moodle
2016-11-11 15:12:50 +08:00
Damyon Wiese
058edbafc8
MDL-56711 theme_boost: Highlight sections at activity level
...
When looking at an activity, the current section for the course should be active in the flat navigation.
2016-11-11 14:27:56 +08:00