Eloy Lafuente (stronk7)
92acc71388
Merge branch 'MDL-59395_master' of git://github.com/markn86/moodle
2017-07-05 12:00:12 +02:00
Eloy Lafuente (stronk7)
aef0609316
Merge branch 'MDL-59398-master-enfix' of git://github.com/mudrd8mz/moodle
2017-07-05 11:51:05 +02:00
Eloy Lafuente (stronk7)
a590ff736c
Merge branch 'MDL-59294-master' of git://github.com/junpataleta/moodle
2017-07-05 09:42:41 +02:00
Eloy Lafuente (stronk7)
9a334cb444
Merge branch 'MDL-58286-master' of https://github.com/xow/moodle
2017-07-05 09:39:21 +02:00
Eloy Lafuente (stronk7)
29dcef0b65
Merge branch 'wip-MDL-59412-master' of git://github.com/marinaglancy/moodle
2017-07-05 09:34:19 +02:00
Helen Foster
f08d4da505
MDL-59398 lang: Merge English strings from the en_fix language pack
2017-07-05 09:27:29 +02:00
Mark Nelson
ba6645daa0
MDL-59395 core_user: added unit tests for new participation functions
...
Part of MDL-59290.
2017-07-05 14:51:41 +08:00
Mark Nelson
bc47b70667
MDL-59395 core_user: move participants table to own class
...
Removed the edit link variable which was used in the heading
'Users with the role ..' but was never displayed due to filters.
Other minor tidy ups as well.
Part of MDL-59290.
2017-07-05 14:51:41 +08:00
Jake Dallimore
e166657532
Merge branch 'MDL-58716-master-fix' of git://github.com/junpataleta/moodle
2017-07-05 13:03:56 +08:00
Jun Pataleta
64755ee800
MDL-58716 core: Define core_login_testsuite in phpunit.xml.dist
2017-07-05 12:39:18 +08:00
Marina Glancy
1c885118fc
MDL-59412 course: do not display completion icon for unavailable mod
2017-07-05 09:48:18 +08:00
John Okely
d349b0f0f8
MDL-58286 enrol_ldap: Pass connection to ldap_paged_results_supported
...
Thanks to Bianco Veigel for the original patch.
2017-07-05 09:46:27 +08:00
Jun Pataleta
a50089bac5
Merge branch 'MDL-58716-master' of git://github.com/jleyva/moodle
2017-07-05 09:36:41 +08:00
Eloy Lafuente (stronk7)
39f8a9636e
Merge branch 'MDL-59413_master' of git://github.com/markn86/moodle
2017-07-05 02:35:26 +02:00
Eloy Lafuente (stronk7)
8eb4f41f1d
Merge branch 'MDL-59396_master' of git://github.com/markn86/moodle
2017-07-05 02:33:09 +02:00
Eloy Lafuente (stronk7)
5133e30da3
Merge branch 'MDL-59364_master' of git://github.com/markn86/moodle
2017-07-05 02:31:48 +02:00
Eloy Lafuente (stronk7)
acbcffd342
Merge branch 'MDL-58651' of git://github.com/aolley/moodle
2017-07-05 01:21:13 +02:00
Eloy Lafuente (stronk7)
77c8eb94c3
Merge branch 'wip-MDL-59336-master' of git://github.com/marinaglancy/moodle
2017-07-04 19:58:51 +02:00
Eloy Lafuente (stronk7)
f75b93c9d3
Merge branch 'MDL-59427-master' of https://github.com/sammarshallou/moodle
2017-07-04 19:44:07 +02:00
Juan Leyva
b6f70a3745
MDL-58716 auth: New ajax WS core_auth_request_password_reset
2017-07-04 11:40:12 +01:00
Juan Leyva
cca01ddace
MDL-58716 login: API changes to accommodate web services
2017-07-04 11:40:11 +01:00
Jake Dallimore
542933e30a
Merge branch 'MDL-59380-master' of git://github.com/damyon/moodle
2017-07-04 16:27:30 +08:00
Marina Glancy
6e861be6b7
MDL-59409 admin: set admin user in unittest
2017-07-04 11:04:54 +08:00
Ankit Agarwal
8d8d00ef42
MDL-56565 forum: Add sitename as heading when there is nothing to display
2017-07-04 10:11:34 +08:00
Ankit Agarwal
73d78820c8
MDL-56565 forum: Make sure userfullname is not disclosed
2017-07-04 10:11:34 +08:00
Jake Dallimore
012555492e
MDL-56565 navigation: fix for cap checks in nav and context header
...
Fix to:
- Make sure we properly check both user and course contexts in
the load_for_user function in navigation lib and user the
user_can_view_profile function for same-course access checks.
- Use user_can_view_profile in the renderer's context_header to
properly decide whether a user can view another user's picture
and messaging options in the page header.
2017-07-04 10:11:34 +08:00
Jake Dallimore
02e5a9d766
MDL-56565 navigation: fix user details disclosure in nav tree
...
Fixes a bug in which a user's full name might be disclosed via the
nav tree. Nav generation now checks the current user's access to the
user before adding the node, else adds a dummy node.
2017-07-04 10:11:34 +08:00
Jake Dallimore
08692e9736
MDL-56565 core: fix user details disclosure in page context header
...
Fixes a bug with context_header function in which user details were
displayed regardless of the current user's capabilities.
2017-07-04 10:11:34 +08:00
Mark Nelson
2fe7f706d7
MDL-59304 core_calendar: check if course is hidden in bailout callback
2017-07-04 10:11:34 +08:00
Marina Glancy
915f801546
MDL-59409 admin: check access to every setting in category
2017-07-04 10:00:26 +08:00
Jake Dallimore
ccf1c6e621
Merge branch 'MDL-59165-master-2' of git://github.com/andrewnicols/moodle
2017-07-04 09:16:11 +08:00
Andrew Nicols
1e68076e5d
MDL-59165 tool_mobile: Display mobile setup link in footer
2017-07-04 09:14:34 +08:00
Jake Dallimore
5141266546
Merge branch 'MDL-59008-master' of git://github.com/lameze/moodle
2017-07-03 15:55:38 +08:00
Simey Lameze
64c385a293
MDL-59008 repository: add reload parent window support to callback
2017-07-03 13:41:58 +08:00
Simey Lameze
1ba1412fa3
MDL-59008 repository_onedrive: add method to serve login on a popup
2017-07-03 13:41:58 +08:00
Simey Lameze
fd8790d5cf
MDL-59008 repository_googledocs: add method to serve login on a popup
...
This commit also add a new string logintoaccount to make the login
button more clear.
2017-07-03 13:41:58 +08:00
Andrew Nicols
7bd28dffc2
MDL-59165 output: Add standard footer html callback
2017-07-03 13:35:28 +08:00
Simey Lameze
1fad6ff3f5
MDL-59008 mod_resource: add option to serve external files embed
2017-07-03 10:19:33 +08:00
sam marshall
4998d3a5be
MDL-59427 MUC: cache_helper::purge_all should reset adhoc caches
2017-06-30 11:15:30 +01:00
Jake Dallimore
5a651b43fb
weekly release 3.4dev
2017-06-29 16:23:42 +08:00
Jake Dallimore
4c68642926
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2017-06-29 16:23:41 +08:00
Mark Nelson
e727e91c38
MDL-59413 core_user: removed broken group information table
...
Part of MDL-59290.
2017-06-29 14:19:08 +08:00
Jun Pataleta
56249d8710
MDL-59294 block_login: Make display of ID provider buttons consistent
2017-06-29 09:29:26 +08:00
David Monllao
f9e4731c86
MDL-59148 css: Remove legacy param from php-doc
...
Version bump as well.
2017-06-28 18:24:50 +02:00
David Monllao
185455dcc3
Merge branch 'MDL-59148-master-7' of git://github.com/andrewnicols/moodle
2017-06-28 18:24:50 +02:00
Andrew Nicols
0e9911e143
MDL-59148 theme: Use fallback if compiled version unavailable
2017-06-28 18:24:50 +02:00
David Monllao
0248d16801
MDL-59285 version: Bump
2017-06-28 18:24:49 +02:00
Simey Lameze
3b9b47312c
MDL-59148 core: save css file totemp directory
...
Save a copy of the css file on the temp directory
to be used as a fallback when waiting for a theme to be compiled
and is not versioned in any way.
2017-06-28 18:24:49 +02:00
David Monllao
7f382c05b0
Merge branch 'MDL-59285-master' of git://github.com/lameze/moodle
2017-06-28 18:24:48 +02:00
Jake Dallimore
1bff0a1d97
Merge branch 'MDL-56046_master-fix2' of git://github.com/markn86/moodle
2017-06-28 18:24:48 +02:00