91823 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
2c4463bf0f Merge branch 'MDL-64509-master-enfix' of git://github.com/mudrd8mz/moodle 2019-01-08 16:17:06 +01:00
Eloy Lafuente (stronk7)
5e57176a91 Merge branch 'MDL-64474-master-2' of git://github.com/junpataleta/moodle 2019-01-08 16:10:44 +01:00
Andrew Nicols
bbf4a7f38b Merge branch 'MDL-58596-master' of git://github.com/vmdef/moodle 2019-01-08 16:14:58 +08:00
Andrew Nicols
50466ac4e4 Merge branch 'MDL-64426-master-2' of https://github.com/snake/moodle 2019-01-08 15:58:40 +08:00
Jake Dallimore
e66e867f6e MDL-64426 core_message: fix filter support in api::get_conversations()
Conversation name and subname should support filters, so the data should
be passed through format_string, and advertised in the external params
as PARAM_TEXT.
2019-01-08 15:50:43 +08:00
Leon Stringer
8f402dbc66 MDL-58596 core_stats: fixed infinite loop cause by DST change 2019-01-08 07:37:42 +00:00
Víctor Déniz Falcón
5007d1cb04 MDL-58596 core_stats: unit test for stats_get_base_weekly 2019-01-08 07:36:48 +00:00
Jake Dallimore
662371fd65 Merge branch 'MDL-63686-master' of git://github.com/andrewnicols/moodle 2019-01-08 14:37:31 +08:00
Andrew Nicols
ccbdced987 MDL-63686 core: Preload parent contexts 2019-01-08 14:11:00 +08:00
Andrew Nicols
f0b09fe329 Merge branch 'MDL-24951-master' of git://github.com/Chocolate-lightning/moodle 2019-01-08 13:46:11 +08:00
Andrew Nicols
66f13f8f7f Merge branch 'MDL-64497-master' of https://github.com/sammarshallou/moodle 2019-01-08 12:25:34 +08:00
Andrew Nicols
024b5c5b9f Merge branch 'MDL-63722-master' of git://github.com/rezaies/moodle 2019-01-08 12:04:19 +08:00
Andrew Nicols
8feef7308a Merge branch 'MDL-64400-master' of git://github.com/aanabit/moodle 2019-01-08 08:27:06 +08:00
Andrew Nicols
792267c3b4 Merge branch 'MDL-63276' of https://github.com/stronk7/moodle 2019-01-08 06:55:37 +08:00
Eloy Lafuente (stronk7)
11825f1439 Merge branch 'MDL-63809-master-5' of git://github.com/rezaies/moodle 2019-01-07 22:12:45 +01:00
David Mudrák
a92458880c MDL-64509 lang: Use the fixed strings in tests 2019-01-07 20:07:57 +01:00
Helen Foster
65d70aa81b MDL-64509 lang: Import fixed English strings (en_fix)
Significant string change: enablerunnow_desc,tool_task - including
mention of pathtophp requirement
2019-01-07 14:40:34 +01:00
Sara Arjona
cb7b59941f Merge branch 'MDL-64419-master' of git://github.com/bmbrands/moodle 2019-01-07 14:10:36 +01:00
Andrew Nicols
3311321660 Merge branch 'MDL-57636_master' of https://github.com/dasistwas/moodle 2019-01-07 13:45:04 +08:00
Jake Dallimore
a5d2ad5dfc Merge branch 'MDL-64348-master' of git://github.com/ryanwyllie/moodle 2019-01-07 12:08:31 +08:00
Ryan Wyllie
c77ba4890a MDL-64348 javascript: change template loading to a buffer
Changed the template loading to buffer the requests for templates
so that they can be sent in batches to the server to save large
volumes of network requests.
2019-01-07 09:03:06 +08:00
Ryan Wyllie
2b92891a88 MDL-64348 javascript: change template loading to also load dependencies
Changed the getTemplate function in templates.js to use the
core_output_load_template_with_dependencies function to load the
requested template and all of the dependencies required to render it.

The dependencies are added to the relevant caches so that when the
template is rendered they aren't re-requested from the server.
2019-01-07 09:03:06 +08:00
Ryan Wyllie
fbbed5c603 MDL-64348 javascript: add cache_strings to str.js
Added a function to allow a set of strings to be added to the
str.js caches if they've been loaded outside of that module.
2019-01-07 09:03:06 +08:00
Ryan Wyllie
e0034b5da6 MDL-64348 template: add load_template_with_dependencies external func 2019-01-07 09:03:06 +08:00
David Bogner
8b9fc06993 MDL-57636 frontpage: Fix display enrolled courses 2019-01-04 11:18:47 +01:00
Ryan Wyllie
0664130b88 MDL-64348 templates: add mustache_template_source_loader class 2019-01-04 15:38:27 +08:00
sam marshall
fc570e6699 MDL-64497 GDPR: moodle_content_writer can cause endless loop
Fixes a buggy function by replacing it with a call to file_get_contents,
and adds error detection on a couple of file accesses.
2019-01-03 16:54:38 +00:00
Jake Dallimore
87bf7fa912 Merge branch 'MDL-49651-master' of git://github.com/Chocolate-lightning/moodle 2019-01-03 10:45:07 +08:00
Eloy Lafuente (stronk7)
a12207be25 MDL-63276 upgrade: clean < 3.2.0 upgrade steps
3.7 (min PHP 7.1) requires 3.2 (first version supporting PHP 7.1)

This just deletes all the upgrade steps previous to 3.2.0. Some
small adjustments, like adding missing MOODLE_INTERNAL or tweaking
globals can also be applied when needed.

Also includes an upgrade step to prevent upgrading from any
version < 2016120500 (v3.2.0) as anti-cheating measure.

Next commit will get rid of/deprecate all the upgradelib functions
not used anymore in codebase. (note there isn't any this time).
2019-01-03 01:17:17 +01:00
Eloy Lafuente (stronk7)
f580d20adf MDL-63276 travis support: Bump to PHP 7.1 required 2019-01-03 01:17:17 +01:00
Eloy Lafuente (stronk7)
422947e070 MDL-63276 install: PHP min version checker bump to PHP 7.1 2019-01-03 01:17:17 +01:00
Eloy Lafuente (stronk7)
504d1a9cc0 MDL-63276 environment: PHP 7.1 and Moodle 3.2 required 2019-01-03 01:12:50 +01:00
Eloy Lafuente (stronk7)
f37f00be53 MDL-63276 environment: 3.7 base information
This is a direct copy of the 3.6 branch to
have changes under control easier in next commits.
2018-12-30 18:05:30 +01:00
Jun Pataleta
e2b812fc40 MDL-64474 auth_oauth2: Properly update user profile data
* Updating of user profile data from OAuth2 issuer should only be
performed for fields that can be synced externally (fields defined in
\auth_plugin_base::$userfields)
* Only update user profile data for users which use OAuth2 as their
default authentication mechanism.
2018-12-28 16:52:37 +08:00
Amaia Anabitarte
0f38e62970 MDL-64400 core_messages: Mark notifications sent via email as read 2018-12-27 09:15:53 +01:00
Amaia Anabitarte
57afd82ab0 MDL-64400 core_messages: Allow cron to delete unread notifications too 2018-12-27 09:15:53 +01:00
Mathew
0dbe9025b5 MDL-24951 mod_forum: Check user capability to know what message to show.
If the user has the following capabilty: mod/forum:canposttomygroups then show them
the more technical of the strings. Otherwise we use something a bit easier for them to ask their
tutor or teacher about.
2018-12-24 09:15:34 +08:00
Mathew
299dc536aa MDL-49651 mod_forum: Respect course visibility in cron
This checks the courses' current visibility and the users permissions.
If they have the permission to view the course when it is hidden they'll get messages.

We already have checks for the users enrolled & subscription status.
2018-12-24 09:11:15 +08:00
Adrian Greeve
38a1b4f203 weekly release 3.7dev 2018-12-20 11:09:10 +01:00
Adrian Greeve
c10e9970e1 NOBUG: Fixed SVG browser compatibility 2018-12-20 11:09:08 +01:00
Adrian Greeve
03573e1a58 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2018-12-20 11:09:07 +01:00
Andrew Nicols
13bd9babb4 Merge branch 'MDL-64038-master' of git://github.com/bmbrands/moodle 2018-12-20 13:53:51 +08:00
Andrew Nicols
4617420250 Merge branch 'MDL-63512-master' of git://github.com/peterRd/moodle 2018-12-20 13:03:31 +08:00
Peter
94dafd0c06 MDL-63512 mod_lesson: Update the lesson css to exclude mediaplugin div 2018-12-20 12:49:10 +08:00
Andrew Nicols
bf197c166c Merge branch 'MDL-62223-master' of git://github.com/Kathrin84/moodle 2018-12-20 11:32:50 +08:00
Andrew Nicols
116b7c089a MDL-58855 glossary: Remove behat logout line 2018-12-20 10:27:57 +08:00
Andrew Nicols
1cd08af7f4 Merge branch 'MDL-58855-master' of git://github.com/peterRd/moodle 2018-12-20 10:26:24 +08:00
Adrian Greeve
21fc1b9682 Merge branch 'MDL-64392-master' of git://github.com/bmbrands/moodle 2018-12-19 12:02:43 +01:00
Jun Pataleta
43db4e9c56 Merge branch 'MDL-61767-master' of git://github.com/andrewnicols/moodle 2018-12-19 18:36:21 +08:00
Andrew Nicols
c9f2a8c2cf MDL-61767 auth_oauth: Reduce updated fields 2018-12-19 18:15:39 +08:00