Andrew Nicols [Tue, 8 Jan 2019 07:58:40 +0000 (15:58 +0800)]
Merge branch 'MDL-64426-master-2' of https://github.com/snake/moodle
Jake Dallimore [Tue, 18 Dec 2018 09:24:53 +0000 (17:24 +0800)]
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.
Jake Dallimore [Tue, 8 Jan 2019 06:37:31 +0000 (14:37 +0800)]
Merge branch 'MDL-63686-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Wed, 17 Oct 2018 05:36:39 +0000 (13:36 +0800)]
MDL-63686 core: Preload parent contexts
Andrew Nicols [Tue, 8 Jan 2019 05:46:11 +0000 (13:46 +0800)]
Merge branch 'MDL-24951-master' of git://github.com/Chocolate-lightning/moodle
Andrew Nicols [Tue, 8 Jan 2019 04:25:34 +0000 (12:25 +0800)]
Merge branch 'MDL-64497-master' of https://github.com/sammarshallou/moodle
Andrew Nicols [Tue, 8 Jan 2019 04:04:19 +0000 (12:04 +0800)]
Merge branch 'MDL-63722-master' of git://github.com/rezaies/moodle
Andrew Nicols [Tue, 8 Jan 2019 00:27:06 +0000 (08:27 +0800)]
Merge branch 'MDL-64400-master' of git://github.com/aanabit/moodle
Andrew Nicols [Mon, 7 Jan 2019 22:55:37 +0000 (06:55 +0800)]
Merge branch 'MDL-63276' of https://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Mon, 7 Jan 2019 21:12:45 +0000 (22:12 +0100)]
Merge branch 'MDL-63809-master-5' of git://github.com/rezaies/moodle
Sara Arjona [Mon, 7 Jan 2019 13:10:36 +0000 (14:10 +0100)]
Merge branch 'MDL-64419-master' of git://github.com/bmbrands/moodle
Andrew Nicols [Mon, 7 Jan 2019 05:45:04 +0000 (13:45 +0800)]
Merge branch 'MDL-57636_master' of https://github.com/dasistwas/moodle
Jake Dallimore [Mon, 7 Jan 2019 04:08:31 +0000 (12:08 +0800)]
Merge branch 'MDL-64348-master' of git://github.com/ryanwyllie/moodle
Ryan Wyllie [Tue, 11 Dec 2018 06:53:00 +0000 (14:53 +0800)]
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.
Ryan Wyllie [Tue, 11 Dec 2018 03:09:32 +0000 (11:09 +0800)]
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.
Ryan Wyllie [Tue, 11 Dec 2018 03:08:33 +0000 (11:08 +0800)]
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.
Ryan Wyllie [Tue, 11 Dec 2018 03:04:43 +0000 (11:04 +0800)]
MDL-64348 template: add load_template_with_dependencies external func
David Bogner [Fri, 23 Nov 2018 16:58:51 +0000 (17:58 +0100)]
MDL-57636 frontpage: Fix display enrolled courses
Ryan Wyllie [Mon, 10 Dec 2018 06:47:44 +0000 (14:47 +0800)]
MDL-64348 templates: add mustache_template_source_loader class
sam marshall [Thu, 3 Jan 2019 16:49:46 +0000 (16:49 +0000)]
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.
Jake Dallimore [Thu, 3 Jan 2019 02:45:07 +0000 (10:45 +0800)]
Merge branch 'MDL-49651-master' of git://github.com/Chocolate-lightning/moodle
Eloy Lafuente (stronk7) [Sun, 30 Dec 2018 18:39:56 +0000 (19:39 +0100)]
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).
Eloy Lafuente (stronk7) [Wed, 2 Jan 2019 10:19:15 +0000 (11:19 +0100)]
MDL-63276 travis support: Bump to PHP 7.1 required
Eloy Lafuente (stronk7) [Thu, 3 Jan 2019 00:14:44 +0000 (01:14 +0100)]
MDL-63276 install: PHP min version checker bump to PHP 7.1
Eloy Lafuente (stronk7) [Sun, 30 Dec 2018 17:08:35 +0000 (18:08 +0100)]
MDL-63276 environment: PHP 7.1 and Moodle 3.2 required
Eloy Lafuente (stronk7) [Sun, 30 Dec 2018 17:05:30 +0000 (18:05 +0100)]
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.
Amaia Anabitarte [Wed, 19 Dec 2018 10:40:16 +0000 (11:40 +0100)]
MDL-64400 core_messages: Mark notifications sent via email as read
Amaia Anabitarte [Fri, 14 Dec 2018 15:14:32 +0000 (16:14 +0100)]
MDL-64400 core_messages: Allow cron to delete unread notifications too
Mathew [Mon, 10 Dec 2018 08:03:37 +0000 (16:03 +0800)]
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.
Mathew [Mon, 10 Dec 2018 03:04:10 +0000 (11:04 +0800)]
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.
Adrian Greeve [Thu, 20 Dec 2018 10:09:10 +0000 (11:09 +0100)]
weekly release 3.7dev
Adrian Greeve [Thu, 20 Dec 2018 10:09:08 +0000 (11:09 +0100)]
NOBUG: Fixed SVG browser compatibility
Adrian Greeve [Thu, 20 Dec 2018 10:09:07 +0000 (11:09 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Andrew Nicols [Thu, 20 Dec 2018 05:53:51 +0000 (13:53 +0800)]
Merge branch 'MDL-64038-master' of git://github.com/bmbrands/moodle
Andrew Nicols [Thu, 20 Dec 2018 05:03:31 +0000 (13:03 +0800)]
Merge branch 'MDL-63512-master' of git://github.com/peterRd/moodle
Peter [Thu, 20 Dec 2018 04:49:10 +0000 (12:49 +0800)]
MDL-63512 mod_lesson: Update the lesson css to exclude mediaplugin div
Andrew Nicols [Thu, 20 Dec 2018 03:32:50 +0000 (11:32 +0800)]
Merge branch 'MDL-62223-master' of git://github.com/Kathrin84/moodle
Andrew Nicols [Thu, 20 Dec 2018 02:27:57 +0000 (10:27 +0800)]
MDL-58855 glossary: Remove behat logout line
Andrew Nicols [Thu, 20 Dec 2018 02:26:24 +0000 (10:26 +0800)]
Merge branch 'MDL-58855-master' of git://github.com/peterRd/moodle
Adrian Greeve [Wed, 19 Dec 2018 11:02:43 +0000 (12:02 +0100)]
Merge branch 'MDL-64392-master' of git://github.com/bmbrands/moodle
Jun Pataleta [Wed, 19 Dec 2018 10:36:21 +0000 (18:36 +0800)]
Merge branch 'MDL-61767-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Thu, 13 Dec 2018 03:48:25 +0000 (11:48 +0800)]
MDL-61767 auth_oauth: Reduce updated fields
Adrian Greeve [Wed, 19 Dec 2018 09:51:42 +0000 (10:51 +0100)]
Merge branch 'MDL-59954-master' of git://github.com/peterRd/moodle
Shamim Rezaie [Tue, 18 Dec 2018 07:04:00 +0000 (18:04 +1100)]
MDL-63722 javascript: misinterpret as outside click if DOM is modified
Jake Dallimore [Wed, 19 Dec 2018 03:37:15 +0000 (11:37 +0800)]
Merge branch 'MDL-64229_master' of git://github.com/markn86/moodle
Peter [Mon, 1 Oct 2018 04:48:23 +0000 (12:48 +0800)]
MDL-58855 mod_glossary: Add pending approval identifier glossary
Add a new label to indicate whether a tagged glossary item is pending approval or not
Jake Dallimore [Wed, 19 Dec 2018 03:07:41 +0000 (11:07 +0800)]
Merge branch 'MDL-64216-m' of https://github.com/micaherne/moodle
Jun Pataleta [Wed, 19 Dec 2018 02:14:13 +0000 (10:14 +0800)]
Merge branch 'MDL-60474-master' of git://github.com/damyon/moodle
Damyon Wiese [Wed, 25 Jul 2018 09:12:10 +0000 (17:12 +0800)]
MDL-60474 assign: Consistent user filters
Use the current filters and sorting on the user grading table in the single
page grading app when it is possible.
This replaces the popover used to configure the filters to one that closely matches the
one from the grading table. It supports standard filters, workflow filters and allocated marker filters.
It will also support group filtering and suspended user filtering but we don't show the controls for those in
the single grading page.
Andrew Nicols [Wed, 19 Dec 2018 01:48:46 +0000 (09:48 +0800)]
Merge branch 'MDL-63512-master' of git://github.com/peterRd/moodle
Andrew Nicols [Wed, 19 Dec 2018 01:10:09 +0000 (09:10 +0800)]
Merge branch 'MDL-64061-master-amdload' of git://github.com/mudrd8mz/moodle
Peter [Fri, 7 Dec 2018 04:26:46 +0000 (12:26 +0800)]
MDL-59954 mod_course: Remove file size restriction on D&D on course page
Remove file size restrictions for teachers on course page.
Use user_max_upload_file_size instead of the max_file_size
AMOS bot [Wed, 19 Dec 2018 00:08:52 +0000 (00:08 +0000)]
Automatically generated installer lang files
Adrian Greeve [Tue, 18 Dec 2018 17:11:38 +0000 (18:11 +0100)]
Merge branch 'MDL-63844-master' of git://github.com/aanabit/moodle
Amaia Anabitarte [Tue, 18 Dec 2018 16:57:57 +0000 (17:57 +0100)]
MDL-63844 enrol: Reordering status_field constructor parameters
Rohan Khajuria [Tue, 27 Nov 2018 20:42:18 +0000 (12:42 -0800)]
MDL-63844 enrolmentdetails: add time-enrolled field
Adrian Greeve [Tue, 18 Dec 2018 14:58:06 +0000 (15:58 +0100)]
Merge branch 'MDL-64025-master' of https://github.com/christianwolters/moodle
Adrian Greeve [Tue, 18 Dec 2018 11:13:35 +0000 (12:13 +0100)]
Merge branch 'MDL-63794-master-2' of git://github.com/mihailges/moodle
Shamim Rezaie [Tue, 18 Dec 2018 04:05:37 +0000 (15:05 +1100)]
MDL-63809 question: handling bad questions in question_has_capability_on
Tim Hunt [Tue, 18 Dec 2018 03:53:31 +0000 (14:53 +1100)]
MDL-63809 question bank: ensure question_has_capability_on can be called
Jake Dallimore [Tue, 18 Dec 2018 03:11:23 +0000 (11:11 +0800)]
Merge branch 'MDL-64309_master' of git://github.com/markn86/moodle
Jake Dallimore [Tue, 18 Dec 2018 02:51:37 +0000 (10:51 +0800)]
Merge branch 'master_MDL-49673' of git://github.com/danmarsden/moodle
Andrew Nicols [Tue, 18 Dec 2018 01:38:33 +0000 (09:38 +0800)]
Merge branch 'MDL-63773_assign_hideif' of git://github.com/davosmith/moodle
Dan Marsden [Tue, 30 Oct 2018 22:34:42 +0000 (11:34 +1300)]
MDL-49673 mod_assign: Tidy up hidegrader patch
Bas Brands [Mon, 17 Dec 2018 14:02:38 +0000 (15:02 +0100)]
MDL-64419 core_message: fix user info in bootstrapbase message drawer
* updated the bootstrapbase template for the messaging conversation menu
info option to match the menu in
"/core_message/message_drawer_view_conversation_header_content_type_private.mustache"
Jun Pataleta [Mon, 17 Dec 2018 07:57:52 +0000 (15:57 +0800)]
Merge branch 'MDL-59629-master' of git://github.com/peterRd/moodle
Andrew Nicols [Mon, 17 Dec 2018 07:38:09 +0000 (15:38 +0800)]
Merge branch 'MDL-52966_static_cache_core_filetypes_get_types' of https://github.com/enovation/moodle
Andrew Nicols [Mon, 17 Dec 2018 07:34:50 +0000 (15:34 +0800)]
Merge branch 'MDL-60019-master' of git://github.com/peterRd/moodle
Andrew Nicols [Mon, 17 Dec 2018 07:28:29 +0000 (15:28 +0800)]
Merge branch 'MDL-61633-master' of https://github.com/lucisgit/moodle
Andrew Nicols [Mon, 17 Dec 2018 06:59:22 +0000 (14:59 +0800)]
Merge branch 'MDL-60518-master' of git://github.com/aanabit/moodle
Jun Pataleta [Mon, 17 Dec 2018 06:10:21 +0000 (14:10 +0800)]
Merge branch 'MDL-63260' of https://github.com/timhunt/moodle
Mihail Geshoski [Mon, 10 Dec 2018 02:48:41 +0000 (10:48 +0800)]
MDL-63794 block_myoverview: Display the course category name in block
Mihail Geshoski [Fri, 7 Dec 2018 03:06:20 +0000 (11:06 +0800)]
MDL-63794 block_myoverview: Add behat tests
Jun Pataleta [Mon, 17 Dec 2018 03:48:45 +0000 (11:48 +0800)]
Merge branch 'MDL-60008-master' of git://github.com/damyon/moodle
Jake Dallimore [Mon, 17 Dec 2018 03:20:01 +0000 (11:20 +0800)]
Merge branch 'MDL-62756_master' of https://github.com/miotto/moodle
Andrew Nicols [Mon, 17 Dec 2018 01:12:58 +0000 (09:12 +0800)]
Merge branch 'MDL-64388-master' of git://github.com/bmbrands/moodle
Christian Wolters [Sun, 16 Dec 2018 14:43:49 +0000 (15:43 +0100)]
MDL-64025 admin_bookmarks: Enable bookmarking of admin categories
Bas Brands [Fri, 14 Dec 2018 15:28:36 +0000 (16:28 +0100)]
MDL-64392 core_question: flexbox compatible separator for question types
* the br tag does not work well in a flexbox context, a 100% with div
works in both clean and boost.
Bas Brands [Tue, 11 Dec 2018 17:45:02 +0000 (18:45 +0100)]
MDL-64038 core_message: add default group image
add default group image to improve the alignment
of group names in the message drawer group messages section
Bas Brands [Thu, 13 Dec 2018 14:00:27 +0000 (15:00 +0100)]
MDL-64388 core_themes: update docs on new required output method
* Method standard_after_main_region_html was added to the core_renderer
used by the messaging ui to message drawer
Amaia Anabitarte [Tue, 11 Dec 2018 18:06:52 +0000 (19:06 +0100)]
MDL-60518 core_competency: Set $USER global variable for tests
Frédéric Massart [Fri, 20 Oct 2017 09:24:08 +0000 (17:24 +0800)]
MDL-60518 core_user: A user with ID 0 is never a real user
Mirko Otto [Wed, 12 Dec 2018 09:12:49 +0000 (10:12 +0100)]
MDL-62756 form: Remove any click handler first.
The handler has the old state variable. Remove any click handler first.
Peter [Thu, 13 Dec 2018 02:14:43 +0000 (10:14 +0800)]
MDL-59629 mod_block: Set the default region in add_region
Check and update default region in add_region if none set.
Peter [Mon, 10 Dec 2018 23:56:50 +0000 (07:56 +0800)]
MDL-63512 mod_lesson: Fix video links provided in feedback
Alex Walker [Wed, 1 Jun 2016 14:21:41 +0000 (15:21 +0100)]
MDL-49673 mod_assign: option to hide grader
Jake Dallimore [Thu, 13 Dec 2018 23:51:42 +0000 (07:51 +0800)]
weekly release 3.7dev
Tony Butler [Mon, 5 Mar 2018 15:26:46 +0000 (15:26 +0000)]
MDL-61633 assignfeedback_editpdf: Scroll back to top when changing pages
Mark Nelson [Thu, 13 Dec 2018 04:01:05 +0000 (12:01 +0800)]
MDL-64229 core_message: ensure profile pic links to profile
Martin Mastny [Tue, 27 Mar 2018 14:32:16 +0000 (16:32 +0200)]
MDL-61767 auth_oauth2: Updating user fields on successful login
Jake Dallimore [Wed, 12 Dec 2018 08:13:28 +0000 (16:13 +0800)]
Merge branch 'MDL-62624-master' of git://github.com/mihailges/moodle
Jun Pataleta [Wed, 12 Dec 2018 03:18:02 +0000 (11:18 +0800)]
Merge branch 'MDL-41507-master' of git://github.com/rezaies/moodle
Shamim Rezaie [Mon, 10 Dec 2018 06:03:50 +0000 (17:03 +1100)]
MDL-41507 core_group: Consistent default value for FEATURE_GROUPS
Jake Dallimore [Wed, 12 Dec 2018 02:02:55 +0000 (10:02 +0800)]
Merge branch 'MDL-64003-master' of https://github.com/aanabit/moodle
Jake Dallimore [Wed, 12 Dec 2018 00:53:35 +0000 (08:53 +0800)]
MDL-63887 auth_ldap: fix unclean exit from sync when users not found
We should return, not exit, and we should clean up before we do.
Jake Dallimore [Wed, 12 Dec 2018 01:41:34 +0000 (09:41 +0800)]
Merge branch 'MDL-63887_master' of git://github.com/markn86/moodle
Jake Dallimore [Wed, 12 Dec 2018 00:32:16 +0000 (08:32 +0800)]
Merge branch 'MDL-63150-master' of git://github.com/peterRd/moodle
Jake Dallimore [Wed, 12 Dec 2018 00:29:40 +0000 (08:29 +0800)]
Merge branch 'MDL-63145-master' of git://github.com/peterRd/moodle
Jake Dallimore [Wed, 12 Dec 2018 00:25:02 +0000 (08:25 +0800)]
Merge branch 'MDL-63147-master' of git://github.com/peterRd/moodle
Peter [Tue, 23 Oct 2018 05:17:43 +0000 (13:17 +0800)]
MDL-63145 mod_page: Accept userid param as override
Accept a userid as an override in the lib function instead of
relying on $USER