Jake Dallimore
66b8ad8642
Merge branch 'MDL-59230-master' of git://github.com/lameze/moodle
2017-06-19 09:12:30 +08:00
Vladimir Zhirov
ff2dab4566
MDL-59005 resource: fixed zip extraction for filenames in CP-1251/CP-866
2017-06-19 08:50:23 +08:00
Luca Bösch
fc684bce4b
MDL-58766 css: clean theme block alignment
2017-06-16 16:12:00 +02:00
David Mudrák
64b6651cfa
MDL-59269 lang: Fix ability to uninstall certain language packs
...
In the issue MDL-39319 (6ddf92c77), the ability to uninstall multiple
language packs at once was added. By a mistake, the PARAM_ALPHAEXT was
used as paramater type for the dash-separated list of language packs to
be uninstalled. Language packs with a number in the name (such as
en_us_k12) do not pass the ALPHAEXT cleaning.
This patch changes the parameter cleaning to PARAM_SAFEPATH which is
more appropriate for the given scenario as language code themselves must
be SAFEDIRs.
2017-06-16 14:15:25 +02:00
Simey Lameze
e00e673195
MDL-59230 block_myoverview: add missing core notification module
2017-06-16 16:39:19 +08:00
Tobias Reischmann
4acb33f67b
MDL-59173 tablelib.php: changed default of $params in set_sql to array()
...
Default of $params = null leads to a problem in query_db().
There this value is used in array_merge, which can not handle null
values. If null is passed for one of the params the outcome will be null
independent of the value of the second param!
2017-06-16 10:26:31 +02:00
Marina Glancy
450d15d159
MDL-59125 filter_urltolink: respect nolink span, unittest
2017-06-16 15:57:23 +08:00
Mark Sharp
2a477bf08e
MDL-59125 filter_urltolink: ignoretags on nolink span
2017-06-16 15:57:23 +08:00
Jun Pataleta
3b5865396e
MDL-56979 group: Make group index page Boost-y
2017-06-16 13:58:15 +08:00
Jake Dallimore
6bb80a1917
weekly release 3.4dev
2017-06-16 13:29:33 +08:00
Jake Dallimore
a249188531
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2017-06-16 13:29:32 +08:00
Jean-Roch Meurisse - University of Namur - Belgium
509679e203
MDL-59263 roles: Wrong order of parameters in calls to pix_icon function
2017-06-16 10:02:52 +08:00
David Mudrák
30e891e08f
MDL-46418 repositories: Fix how enabled repositories are populated
...
Repository instances are stored in the 'repository' table. Repositories
in the table are either 'Enabled and visible' or 'Enabled but hidden'.
Hidden repositories still serve their files, but are not visible in the
filepicker UI. Disabling a repository instance removes its record from
the table.
In the original implementation of the plugin manager (see b9934a17), the
method plugintype_repository::get_enabled_repositories() correctly
returned all records from the repository table. Then as a part of the
bigger refactoring in MDL-41437, the commit bde002b8 replaced the
original method with the new get_enabled_plugins() one which started to
return visible repositories only.
As a consequence, the admin tree stopped populating setting page nodes
for hidden repository instances. So attempting to visit their setting
page threw a section error. Credit goes to Ike Quigley for debugging and
tracing this down.
This patch fixes the way how the list of enabled repositories is
populated by the plugin manager so that both visible and hidden
repositories are returned again. This does not affect the filepicker
itself as it is using its own methods for obtaining the list.
2017-06-15 21:22:43 +02:00
Jun Pataleta
20456abffc
Merge branch 'MDL-58248-master-iconfix' of github.com:snake/moodle
2017-06-15 17:08:03 +08:00
Juan Leyva
f74ac6e704
MDL-58712 core_user: New WS core_user_get_private_files_info
2017-06-15 09:40:30 +01:00
Simey Lameze
7af8b56ab4
MDL-57770 tool_lp: style fixes for the competency rule dialog
2017-06-15 15:02:42 +08:00
Jake Dallimore
af12c81d51
Merge branch 'MDL-59140_master-fix-v2' of https://github.com/markn86/moodle
2017-06-15 13:34:24 +08:00
Mark Nelson
3dabb083ad
MDL-59140 core: apply limit only on courses to be shown in specific nav
...
There can be a different number of courses displayed in the
'Navigation' block and in the 'Flat' navigation. This patch
decides what courses we want to display on each, then
applies the 'navcourselimit' setting individually.
2017-06-15 13:10:14 +08:00
Jake Dallimore
0cd6e1bfec
MDL-58248 theme: use pix icon for side panel menu icon instead of char
...
Replaces the trigram for heaven char with the fa-bars pix icon for
improved support with all screen readers.
2017-06-15 09:57:52 +08:00
Jake Dallimore
bb931788cc
Merge branch 'MDL-59142-master' of git://github.com/lameze/moodle
2017-06-14 12:38:11 +01:00
Dan Poltawski
7419853951
Merge branch 'MDL-59171-master' of git://github.com/junpataleta/moodle
2017-06-14 12:36:39 +01:00
Dan Poltawski
e66905375e
Merge branch 'MDL-55548_master-fix' of https://github.com/markn86/moodle
2017-06-14 12:36:38 +01:00
Mark Nelson
f25e2b1dc7
MDL-55548 core: fixed misleading comment in upgrade code
2017-06-14 12:36:38 +01:00
Dan Poltawski
569907002f
Merge branch 'MDL-59140_master' of git://github.com/markn86/moodle
2017-06-14 12:36:37 +01:00
Mark Nelson
c8f2e0e96b
MDL-59140 core: upgrade 'navcourselimit' if set to old default value
2017-06-14 12:32:05 +01:00
Mark Nelson
fa238237a0
MDL-59140 core: limit the number of courses shown in the navigation
...
If the user is enrolled in more courses than the limit then a 'More...'
link is displayed which takes the user to the course/index.php page.
2017-06-14 12:32:04 +01:00
Mark Nelson
c0a9edbd18
MDL-59140 core: changes to the 'navcourselimit' setting
...
Changed the default and description.
2017-06-14 12:32:04 +01:00
Eloy Lafuente (stronk7)
736973d604
Merge branch 'wip-MDL-58523-master' of git://github.com/marinaglancy/moodle
2017-06-14 12:32:03 +01:00
Jun Pataleta
e037a6a126
Merge branch 'MDL-59012-master-linkurl' of git://github.com/mudrd8mz/moodle
2017-06-14 12:32:03 +01:00
Eloy Lafuente (stronk7)
6c79f56fe0
Merge branch 'MDL-58820-master' of https://github.com/nwp90/moodle
2017-06-14 12:32:03 +01:00
Jun Pataleta
ef9b236d8a
Merge branch 'MDL-58991-master' of git://github.com/lameze/moodle
2017-06-14 12:32:02 +01:00
Dan Poltawski
5dbb6b74a9
Merge branch 'MDL-41426-block-completionstatus-spaces' of https://github.com/lucaboesch/moodle
2017-06-14 12:32:02 +01:00
Dan Poltawski
f1ec088e84
Merge branch 'MDL-46322' of https://github.com/stronk7/moodle
2017-06-14 12:32:01 +01:00
Eloy Lafuente (stronk7)
84e3c97bb0
MDL-46322 database: alias sort fields to avoid ambiguous naming
2017-06-14 12:32:01 +01:00
Jake Dallimore
63aa8c27be
Merge branch 'MDL-58136-master' of git://github.com/damyon/moodle
2017-06-14 12:31:56 +01:00
Jake Dallimore
235df202c4
Merge branch 'MDL-51691-master' of https://github.com/jebarviabb/moodle
2017-06-14 12:30:43 +01:00
Jun Pataleta
abb8b5e147
Merge branch 'MDL-58248-theme_boost-label-for-expand-button' of https://github.com/marcusgreen/moodle
2017-06-14 12:30:43 +01:00
Eloy Lafuente (stronk7)
1e34274846
Merge branch 'MDL-59032-master' of git://github.com/damyon/moodle
2017-06-14 12:30:42 +01:00
Eloy Lafuente (stronk7)
29a063a13f
Merge branch 'MDL-59133-master' of git://github.com/jleyva/moodle
2017-06-14 12:30:42 +01:00
Eloy Lafuente (stronk7)
e0f8686f39
Merge branch 'MDL-40015-master' of git://github.com/jleyva/moodle
2017-06-14 12:30:41 +01:00
Eloy Lafuente (stronk7)
8a55a41f88
Merge branch 'mdl58161-master' of https://github.com/tlock/moodle
2017-06-14 12:30:41 +01:00
Eloy Lafuente (stronk7)
4009603025
Merge branch 'MDL-59056-admin-allowstealth-select-checkbox' of https://github.com/lucaboesch/moodle
2017-06-14 12:30:41 +01:00
Eloy Lafuente (stronk7)
bf3b9e57b8
Merge branch 'MDL-58907_master' of git://github.com/markn86/moodle
2017-06-14 12:30:40 +01:00
Eloy Lafuente (stronk7)
0c272e07e2
Merge branch 'MDL-59132-master' of git://github.com/jleyva/moodle
2017-06-14 12:30:40 +01:00
Eloy Lafuente (stronk7)
f30af085a9
Merge branch 'MDL-58318-master' of git://github.com/damyon/moodle
2017-06-14 12:30:39 +01:00
Dan Poltawski
fd5772e691
Merge branch 'wip_MDL-36501_master' of https://github.com/mtpmcdermott/moodle
2017-06-14 12:30:39 +01:00
Dan Poltawski
ff3c693b58
Merge branch 'MDL-50011-master' of https://github.com/nwp90/moodle
2017-06-14 12:30:38 +01:00
Eloy Lafuente (stronk7)
03b0cb584c
Merge branch 'MDL-59112-master' of git://github.com/jleyva/moodle
2017-06-14 12:30:38 +01:00
Dan Poltawski
dd4208e6ec
Merge branch 'mdl46322-master' of https://github.com/AndresMelo/moodle
2017-06-14 12:30:37 +01:00
Ankit Agarwal
a4beef4e31
MDL-44961 logs: Keep log dates constant during restore
2017-06-14 15:20:58 +05:30