Eloy Lafuente (stronk7)
f75b93c9d3
Merge branch 'MDL-59427-master' of https://github.com/sammarshallou/moodle
2017-07-04 19:44:07 +02: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
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
Mark Nelson
1370d793fc
MDL-56046 mod_quiz: do not close the sheet twice
2017-06-28 18:24:48 +02:00
Eloy Lafuente (stronk7)
1555f25b24
Merge branch 'MDL-57809-34-progressbar' of https://github.com/roperto/moodle
2017-06-28 18:24:47 +02:00
David Monllao
364ccb771a
MDL-57734 version: Bump
2017-06-28 18:24:47 +02:00
David Monllao
aa736731ba
Merge branch 'MDL-57734-master' of https://github.com/xow/moodle
2017-06-28 18:24:46 +02:00
Eloy Lafuente (stronk7)
d4bd3dbb69
Merge branch 'wip-MDL-59136-master' of git://github.com/marinaglancy/moodle
2017-06-28 18:24:46 +02:00
David Monllao
6ac5f70c01
Merge branch 'MDL-59053-downcase-username_LATEST' of git://github.com/spaceraccoon/moodle
2017-06-28 18:24:45 +02:00
David Monllao
34b3c1da70
Merge branch 'MDL-32151-master' of git://github.com/junpataleta/moodle
2017-06-28 18:24:45 +02:00
Eloy Lafuente (stronk7)
0f9bdd637a
Merge branch 'MDL-59362_master' of git://github.com/markn86/moodle
2017-06-28 18:24:44 +02:00
Simey Lameze
83f50acd53
MDL-59285 tool_mobile: add user profile page callback
2017-06-28 16:39:07 +08:00
Eloy Lafuente (stronk7)
56fc5143ad
Merge branch 'MDL-59073_workshop_prevent_submission_without_content_or_file' of https://github.com/dannyjung90/moodle
2017-06-27 16:59:44 +02:00
David Monllao
1243fce158
Merge branch 'wip-MDL-59308-master' of git://github.com/marinaglancy/moodle
2017-06-27 16:41:26 +02:00
David Monllao
93c97fdc3a
Merge branch 'MDL-59158-master' of git://github.com/junpataleta/moodle
2017-06-27 16:39:41 +02:00
David Monllao
c4b25152cc
Merge branch 'MDL-57927-master' of git://github.com/lameze/moodle
2017-06-27 15:55:17 +02:00
Eloy Lafuente (stronk7)
c32f0cd62a
Merge branch 'MDL-58844-master' of git://github.com/andrewnicols/moodle
2017-06-27 11:41:08 +02:00
Eloy Lafuente (stronk7)
ce836829e6
Merge branch 'MDL-59296-master' of git://github.com/crazyserver/moodle
2017-06-27 11:37:52 +02:00
Eloy Lafuente (stronk7)
e2aa2f25f1
Merge branch 'MDL-59123-master-3' of git://github.com/ryanwyllie/moodle
2017-06-27 09:24:24 +02:00
Jake Dallimore
8d7ae061e3
Merge branch 'MDL-59312-master' of https://github.com/xow/moodle
2017-06-27 15:07:44 +08:00
Ryan Wyllie
5dd40ec4b4
MDL-59123 admin: add cli script to compile theme CSS
...
Added a script to selectively compile theme CSS. In order to allow
compiling on per theme basis without purging all theme CSS in the
local cache I have made some changes to how CSS is compiled and
how it is accessed via local cache.
2017-06-27 06:48:45 +00:00
Jake Dallimore
cb37f200a8
Merge branch 'MDL-59275-master' of git://github.com/lameze/moodle
2017-06-27 13:57:11 +08:00
Damyon Wiese
3d185faceb
MDL-59380 fragments: Include js from templates
...
Mustache templates containing {{#js}} blocks are not returned via the
fragments API. This is because the requirements manager is assigned when the renderer is created
and not updated by the call to start collecting page requirements.
2017-06-27 13:20:32 +08:00
Jake Dallimore
196558a5d8
Merge branch 'MDL-56046_master-fix' of git://github.com/markn86/moodle
2017-06-27 13:16:42 +08:00
Simey Lameze
92c8cb9d98
MDL-59275 auth: prevent user login failed coding error
2017-06-27 13:04:02 +08:00