mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
84,768 Commits 36 Branches 519 Tags
Commit Graph

84768 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jun Pataleta
d938d1b6e2 Merge branch 'MDL-57770-master' of git://github.com/lameze/moodle 2017-06-20 16:27:48 +08:00
Dan Poltawski
0ba61c3bf8 Merge branch 'MDL-59160-master' of git://github.com/jleyva/moodle 2017-06-20 09:10:25 +01:00
Jake Dallimore
6f2950cf59 Merge branch 'wip-MDL-58729-master' of git://github.com/abgreeve/moodle 2017-06-20 15:18:16 +08:00
Jun Pataleta
b70b7df6d3 Merge branch 'MDL-58766-clean-tree-item-indent' of https://github.com/lucaboesch/moodle 2017-06-20 15:09:41 +08:00
Jun Pataleta
65f1cac814 Merge branch 'MDL-59270-master' of git://github.com/lameze/moodle 2017-06-20 09:58:37 +08:00
Simey Lameze
07782e10f1 MDL-59270 block_myoverview: tab setting logic to main template on clean 2017-06-20 08:45:18 +08:00
Jake Dallimore
78013a17c7 Merge branch 'MDL-58808-master' of git://github.com/damyon/moodle 2017-06-20 08:22:16 +08:00
Juan Leyva
0f398b500d MDL-59160 core_group: Return if the user can access all groups in WS 
The core_group_get_activity_allowed_groups WS should be returning not
only the groups but also if the user is allowed to access all the
activity groups.
 2017-06-19 15:53:38 +01:00
Dan Poltawski
dd6848c1b0 Merge branch 'MDL-59048' of https://github.com/timhunt/moodle 2017-06-19 15:43:28 +01:00
Dan Poltawski
214962f964 Merge branch 'MDL-26976-master' of git://github.com/jleyva/moodle 2017-06-19 14:55:55 +01:00
Dan Poltawski
6252f44d84 Merge branch 'MDL-58712-master' of git://github.com/jleyva/moodle 2017-06-19 14:20:06 +01:00
Dan Poltawski
6659c5ffba Merge branch 'MDL-59173-master' of git://github.com/tobiasreischmann/moodle 2017-06-19 12:27:43 +01:00
Dan Poltawski
4469ae96b6 Merge branch 'wip-MDL-51917-master' of git://github.com/marinaglancy/moodle 2017-06-19 12:21:45 +01:00
Juan Leyva
b5ef326c03 MDL-26976 files: Display space usage message in private files 2017-06-19 11:01:48 +01:00
Dan Poltawski
0a4d8ea1a5 Merge branch 'MDL-56979-master-2' of git://github.com/junpataleta/moodle 2017-06-19 10:46:09 +01:00
Dan Poltawski
275b5fa8ce Merge branch 'MDL-46418-master-hiddenrepos' of git://github.com/mudrd8mz/moodle 2017-06-19 10:33:37 +01:00
Jun Pataleta
8cc4e1c0cd Merge branch 'MDL-44961-master' of git://github.com/ankitagarwal/moodle 2017-06-19 16:24:51 +08:00
Damyon Wiese
57ea73d02c MDL-58808 fontawesome: nav and settings blocks 2017-06-19 15:51:15 +08:00
Jun Pataleta
d745f174a2 Merge branch 'MDL-58310-master' of https://github.com/xow/moodle 2017-06-19 13:25:10 +08:00
John Okely
671be2bedb MDL-58310 ajax: suppress errors upon page unload 2017-06-19 11:31:24 +08:00
John Okely
46f68f026e MDL-58310 message: No longer need to supress errors from messaging 2017-06-19 09:34:34 +08:00
Jake Dallimore
66b8ad8642 Merge branch 'MDL-59230-master' of git://github.com/lameze/moodle 2017-06-19 09:12:30 +08:00
Luca Bösch
fc684bce4b MDL-58766 css: clean theme block alignment 2017-06-16 16:12:00 +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
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
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