Eloy Lafuente (stronk7) [Thu, 15 Nov 2018 10:01:24 +0000 (11:01 +0100)]
Merge branch 'MDL-63303-master-fix' of git://github.com/andrewnicols/moodle
Andrew Nicols [Thu, 15 Nov 2018 09:56:31 +0000 (17:56 +0800)]
MDL-63303 message: Stop WS from removing optional keys
Jun Pataleta [Thu, 15 Nov 2018 09:10:54 +0000 (17:10 +0800)]
Merge branch 'MDL-62287-master' of git://github.com/andrewnicols/moodle
Jun Pataleta [Thu, 15 Nov 2018 09:09:28 +0000 (17:09 +0800)]
Merge branch 'MDL-63811' of git://github.com/aolley/moodle
Damyon Wiese [Thu, 15 Nov 2018 08:30:20 +0000 (16:30 +0800)]
Merge branch 'MDL-64009-master' of git://github.com/abgreeve/moodle
Andrew Nicols [Thu, 15 Nov 2018 08:23:49 +0000 (16:23 +0800)]
MDL-63303 behat: Behat fixes
Andrew Nicols [Thu, 15 Nov 2018 08:25:20 +0000 (16:25 +0800)]
Merge branch 'MDL-63303-master' of git://github.com/ryanwyllie/moodle
Andrew Nicols [Thu, 15 Nov 2018 08:23:49 +0000 (16:23 +0800)]
MDL-63303 behat: Behat fixes
Damyon Wiese [Thu, 15 Nov 2018 08:10:21 +0000 (16:10 +0800)]
Merge branch 'MDL-64011-master' of git://github.com/abgreeve/moodle
Ryan Wyllie [Thu, 15 Nov 2018 06:32:24 +0000 (14:32 +0800)]
MDL-63303 message: move message drawer to end of <body>
Fix some of the behat tests that are looking for generic button
names that match some of the buttons in the message drawer which
happen to appear earlier in the DOM.
Ryan Wyllie [Thu, 15 Nov 2018 05:52:44 +0000 (13:52 +0800)]
MDL-63303 message: fix bugs in message drawer part 3
* Fix bug for newly created conversations being added to overview page
* Fixed bug with use enter to send preference not updating correctly
* Fix unit tests
* Fix race condition loading new messages while conversation resetting
* Fix ordering and rendering of messages with same timestamp
* Fix missing privacy info in get_conversation web service
* Fix linting errors
* Improve bulk message rendering
Ryan Wyllie [Wed, 14 Nov 2018 00:33:34 +0000 (08:33 +0800)]
MDL-63303 message: fix bugs in message drawer part 2
* Added missing icon mappings for font-awesome
* Fixed focus on dialogue button when it opens
* Fixed UI updates on user block / unblock
* Fix jQuery syntax error when sending message with quotes
* Fix message/index.php opening drawer when no conversation found
* Fix placeholders rendered for new requests
Ryan Wyllie [Tue, 13 Nov 2018 05:24:46 +0000 (13:24 +0800)]
MDL-63303 message: fix bugs in message drawer
* Fix navigation from view_contact to view_conversation on an action
such as blocking
* Fix default open message section on overview page depending on which
section has conversations
* Fix message/index.php for users who haven't yet started a
conversation
Ryan Wyllie [Thu, 8 Nov 2018 07:26:21 +0000 (15:26 +0800)]
MDL-63303 message: add enter to send user preference
Ryan Wyllie [Wed, 31 Oct 2018 07:40:55 +0000 (15:40 +0800)]
MDL-63303 message: remove behat tests for messaging
Ryan Wyllie [Tue, 16 Oct 2018 03:53:32 +0000 (11:53 +0800)]
MDL-63303 message: message/index.php open conversation in message drawer
Ryan Wyllie [Tue, 16 Oct 2018 03:52:54 +0000 (11:52 +0800)]
MDL-63303 message: message/edit.php opens setttings in message drawer
Ryan Wyllie [Thu, 8 Nov 2018 07:38:33 +0000 (15:38 +0800)]
MDL-63303 message: change nav popover to toggle message drawer
Ryan Wyllie [Fri, 26 Oct 2018 06:07:56 +0000 (14:07 +0800)]
MDL-63303 theme_bootstrapbase: add message drawer
Ryan Wyllie [Mon, 5 Nov 2018 06:17:18 +0000 (14:17 +0800)]
MDL-63303 message: add message drawer (boost only)
Ryan Wyllie [Tue, 16 Oct 2018 03:45:59 +0000 (11:45 +0800)]
MDL-63303 message: add functions to message_repository.js
Ryan Wyllie [Fri, 9 Nov 2018 06:18:15 +0000 (14:18 +0800)]
MDL-63303 message: add lastmessagedate to messagearea contact
Ryan Wyllie [Fri, 9 Nov 2018 05:20:04 +0000 (13:20 +0800)]
MDL-63303 message: add count_contacts api function
Ryan Wyllie [Mon, 5 Nov 2018 06:12:25 +0000 (14:12 +0800)]
MDL-63303 message: fix get_conversations external func
Ryan Wyllie [Tue, 6 Nov 2018 04:05:11 +0000 (12:05 +0800)]
MDL-63303 message: add get_conversation_between_users external func
Ryan Wyllie [Mon, 5 Nov 2018 08:11:26 +0000 (16:11 +0800)]
MDL-63303 message: add get_conversation to message api
Ryan Wyllie [Tue, 16 Oct 2018 03:44:55 +0000 (11:44 +0800)]
MDL-63303 message: add count_conversations to api
Ryan Wyllie [Tue, 16 Oct 2018 03:44:02 +0000 (11:44 +0800)]
MDL-63303 message: add fields to send_instant_message
Ryan Wyllie [Tue, 30 Oct 2018 07:10:05 +0000 (15:10 +0800)]
MDL-63303 message: add fields to contact requests
Ryan Wyllie [Mon, 5 Nov 2018 07:30:59 +0000 (15:30 +0800)]
MDL-63303 message: add get_member_info external function
Ryan Wyllie [Tue, 6 Nov 2018 06:14:29 +0000 (14:14 +0800)]
MDL-63303 message: fix get_member_info iscontact check
Ryan Wyllie [Tue, 6 Nov 2018 06:03:11 +0000 (14:03 +0800)]
MDL-63303 message: fix mark_all_conversation_messages_as_read ext func
Ryan Wyllie [Mon, 5 Nov 2018 06:13:54 +0000 (14:13 +0800)]
MDL-63303 message: fix get_conversation_messages
Ryan Wyllie [Mon, 29 Oct 2018 06:57:48 +0000 (14:57 +0800)]
MDL-63303 core_favourites: add get and count functions
Ryan Wyllie [Tue, 16 Oct 2018 03:32:12 +0000 (11:32 +0800)]
MDL-63303 theme_bootstrapbase: add bs4 compat classes
Ryan Wyllie [Tue, 16 Oct 2018 03:31:27 +0000 (11:31 +0800)]
MDL-63303 theme_boost: add switch styling for checkbox
Ryan Wyllie [Tue, 16 Oct 2018 03:30:22 +0000 (11:30 +0800)]
MDL-63303 core: add new icons for messaging
Ryan Wyllie [Tue, 16 Oct 2018 03:27:50 +0000 (11:27 +0800)]
MDL-63303 core: allow subsystems to add nav bar and top of body content
Ryan Wyllie [Thu, 25 Oct 2018 02:07:52 +0000 (10:07 +0800)]
MDL-63303 core: add debug info to exceptions
Ryan Wyllie [Tue, 16 Oct 2018 03:24:07 +0000 (11:24 +0800)]
MDL-63303 javascript: fix bug in auto_rows.js allowing it to shrink
Adrian Greeve [Thu, 15 Nov 2018 06:32:15 +0000 (14:32 +0800)]
MDL-64011 badges: Changed the date format of endorsements.
Adrian Greeve [Thu, 15 Nov 2018 06:04:51 +0000 (14:04 +0800)]
MDL-64009 badges: Removed additional badge information when null.
On the badge display page if the badge does not have an endorsement,
related badges, or competency allignments, then these sections are
not shown.
Jun Pataleta [Thu, 15 Nov 2018 03:22:16 +0000 (11:22 +0800)]
Merge branch 'MDL-63974-master' of https://github.com/snake/moodle
Damyon Wiese [Thu, 15 Nov 2018 02:43:03 +0000 (10:43 +0800)]
Merge branch 'MDL-63283-master-2' of https://github.com/snake/moodle
Jake Dallimore [Wed, 14 Nov 2018 03:01:26 +0000 (11:01 +0800)]
MDL-63283 core_message: skip processors in non-individual conversations
Disable the processor for messages being sent to conversation types
other than individual.
Jake Dallimore [Mon, 12 Nov 2018 09:51:33 +0000 (17:51 +0800)]
MDL-63974 core_message: fix logic for non-contacts in user search
This should depend on the messagingallusers setting and, if false,
should only return those users having a profile the searcher can see.
If true, then any user can be returned. There is no requirement to
have a conversation with the user.
Jake Dallimore [Mon, 12 Nov 2018 08:12:08 +0000 (16:12 +0800)]
MDL-63974 core_message: restore legacy behaviour for search_users()
Jun Pataleta [Thu, 15 Nov 2018 01:49:56 +0000 (09:49 +0800)]
Merge branch 'MDL-53566-master-fix' of git://github.com/andrewnicols/moodle
Andrew Nicols [Wed, 14 Nov 2018 23:33:30 +0000 (07:33 +0800)]
MDL-53566 core: Make context freeze test compat with clean
Eloy Lafuente (stronk7) [Wed, 14 Nov 2018 15:22:44 +0000 (16:22 +0100)]
Merge branch 'MDL-63653-master' of https://github.com/lucaboesch/moodle
Eloy Lafuente (stronk7) [Wed, 14 Nov 2018 15:03:16 +0000 (16:03 +0100)]
Merge branch 'MDL-63842-master' of git://github.com/andrewnicols/moodle
David Monllao [Wed, 14 Nov 2018 11:09:34 +0000 (12:09 +0100)]
Merge branch 'MDL-61990' of https://github.com/timhunt/moodle
David Monllao [Wed, 14 Nov 2018 10:57:57 +0000 (11:57 +0100)]
Merge branch 'MDL-63991-master' of git://github.com/crazyserver/moodle
David Monllao [Wed, 14 Nov 2018 10:22:06 +0000 (11:22 +0100)]
Merge branch 'MDL-63488-master' of git://github.com/peterRd/moodle
Damyon Wiese [Wed, 14 Nov 2018 08:00:14 +0000 (16:00 +0800)]
Merge branch 'MDL-64005-master' of git://github.com/abgreeve/moodle
Damyon Wiese [Wed, 14 Nov 2018 07:04:01 +0000 (15:04 +0800)]
Merge branch 'MDL-53566-master' of git://github.com/andrewnicols/moodle
Jun Pataleta [Wed, 14 Nov 2018 06:23:06 +0000 (14:23 +0800)]
Merge branch 'MDL-63926-master' of git://github.com/mickhawkins/moodle
Andrew Nicols [Wed, 14 Nov 2018 00:22:52 +0000 (08:22 +0800)]
MDL-62287 tool_usertours: Pull v0.12.3 for background click fix
Andrew Nicols [Wed, 14 Nov 2018 04:37:56 +0000 (12:37 +0800)]
MDL-53566 core: Rename locking to freezing in UI
Damyon Wiese [Wed, 14 Nov 2018 04:11:12 +0000 (12:11 +0800)]
Merge branch 'MDL-63868-master' of git://github.com/abgreeve/moodle
Michael Hawkins [Mon, 12 Nov 2018 06:33:09 +0000 (14:33 +0800)]
MDL-63926 block_recentlyaccesseditems: Add privacy provider unit tests
Michael Hawkins [Mon, 12 Nov 2018 04:19:51 +0000 (12:19 +0800)]
MDL-63926 block_recentlyaccesseditems: Support user removal by context
Also fixed the provider interface type. This is self contained, so is
not a subsystem provider. It was also already set up as a plugin
provider, just not defined as such.
Damyon Wiese [Wed, 14 Nov 2018 03:14:18 +0000 (11:14 +0800)]
Merge branch 'MDL-63901-master' of git://github.com/sarjona/moodle
Michael Hawkins [Mon, 12 Nov 2018 04:24:52 +0000 (12:24 +0800)]
MDL-63926 block_recentlyaccesseditems: Improved get_contexts_for_userid
Updated the provider::get_contexts_for_userid method, to prevent false
positives. Previously, the user context would always be returned, now
the method checks data exists for the block first.
Adrian Greeve [Wed, 14 Nov 2018 02:39:57 +0000 (10:39 +0800)]
MDL-64005 gradebook: Fix to remove debugging message.
The progress bar is being used when there are a large amount
of grades being recalculated. This was throwing a debugging message
about NO_OUTPUT_BUFFERING being unset.
Andrew Nicols [Wed, 14 Nov 2018 01:54:40 +0000 (09:54 +0800)]
Merge branch 'MDL-63923-master' of git://github.com/bmbrands/moodle
Peter [Wed, 7 Nov 2018 05:32:22 +0000 (13:32 +0800)]
MDL-63488 core_grade: Use the rewrite_pluginurls to handle files
* Use the rewrite_plugin_urls to handled embedded files
* Add phpunit tests for default and updated functionality of format_text
Andrew Nicols [Mon, 12 Nov 2018 06:54:36 +0000 (14:54 +0800)]
MDL-63488 grade: Add tests for format_feedback
Signed-off-by: Peter <peter@moodle.com>
Eloy Lafuente (stronk7) [Wed, 14 Nov 2018 00:04:46 +0000 (01:04 +0100)]
MDL-53566 core: add back upgrade code removed @
0616f04 by mistake
Eloy Lafuente (stronk7) [Tue, 13 Nov 2018 22:55:38 +0000 (23:55 +0100)]
Merge branch 'MDL-53566-master' of git://github.com/andrewnicols/moodle
Luca Bösch [Sun, 14 Oct 2018 11:01:29 +0000 (13:01 +0200)]
MDL-63653 tool_xmldb: style form elements
Tim Hunt [Tue, 13 Nov 2018 17:11:17 +0000 (17:11 +0000)]
MDL-61990 outputrequirementslib: improve debug message
David Monllao [Tue, 13 Nov 2018 15:07:14 +0000 (16:07 +0100)]
Merge branch 'MDL-63882-master' of git://github.com/damyon/moodle
Pau Ferrer Ocaña [Tue, 13 Nov 2018 14:51:53 +0000 (15:51 +0100)]
MDL-63991 badges: Translate notification on endorsement
Pau Ferrer Ocaña [Tue, 13 Nov 2018 11:09:03 +0000 (12:09 +0100)]
MDL-63991 badges: Fix links on badge render
Andrew Nicols [Tue, 13 Nov 2018 13:15:10 +0000 (21:15 +0800)]
MDL-53566 tool_monitor: Fix context preload
Andrew Nicols [Tue, 13 Nov 2018 01:14:34 +0000 (09:14 +0800)]
MDL-53566 core: Allow admins more control over locking
This change allows sites to configure locking such that it does not
apply to administrators at all.
Andrew Nicols [Tue, 13 Nov 2018 00:06:25 +0000 (08:06 +0800)]
MDL-53566 core: Move managecontextlocking to module
This will allow the capability to be applied at a range of contexts and
not just the system, making the system much more definable to a range of
users.
Andrew Nicols [Tue, 13 Nov 2018 00:03:49 +0000 (08:03 +0800)]
MDL-53566 core: Remove unused ancestorlocked field
This was originalyl intended as a performance improvement, but the
parent is already stored, and once calculated the value of locked is
already returned.
Andrew Nicols [Fri, 2 Nov 2018 07:31:51 +0000 (15:31 +0800)]
MDL-53566 core: Add behat test for context loking
Andrew Nicols [Thu, 7 Jun 2018 06:35:45 +0000 (14:35 +0800)]
MDL-53566 mod_forum: Correct captype for writeable capabilities
Andrew Nicols [Fri, 8 Jun 2018 03:37:43 +0000 (11:37 +0800)]
MDL-53566 core: Add UI for context locking
Andrew Nicols [Thu, 7 Jun 2018 06:35:26 +0000 (14:35 +0800)]
MDL-53566 core: Add support for context locking
This chagne adds support for a new feature known as Context Locking.
This allows a context to be locked, thereby removing all write
capabilities for all users (including admin) for that context, and all
child contexts.
David Monllao [Tue, 13 Nov 2018 12:11:07 +0000 (13:11 +0100)]
on-demand release 3.6dev+
David Monllao [Tue, 13 Nov 2018 12:11:05 +0000 (13:11 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
David Monllao [Tue, 13 Nov 2018 10:13:37 +0000 (11:13 +0100)]
Merge branch 'MDL-63729-master' of git://github.com/dpalou/moodle
dpalou [Tue, 13 Nov 2018 09:40:27 +0000 (10:40 +0100)]
MDL-63729 badges: Fix course badge test
Sara Arjona [Fri, 9 Nov 2018 11:15:36 +0000 (12:15 +0100)]
MDL-63901 core_message: Avoid duplicate last message
Adrian Greeve [Tue, 13 Nov 2018 07:28:03 +0000 (15:28 +0800)]
MDL-63868 core_calendar: Clicking link leads to events.
The mini calendar did not link to the daily events properly.
Damyon Wiese [Tue, 13 Nov 2018 03:57:12 +0000 (11:57 +0800)]
Merge branch 'MDL-63927' of git://github.com/stronk7/moodle
Andrew Nicols [Tue, 13 Nov 2018 03:20:54 +0000 (11:20 +0800)]
Merge branch 'MDL-63716-master' of git://github.com/damyon/moodle
Damyon Wiese [Tue, 6 Nov 2018 06:06:49 +0000 (14:06 +0800)]
MDL-63882 core_message: Use validate_parameters
external_api::validate_parameters() sets defaults, and does cleaning and sanitisation of the
inputs. It returns the cleaned params. We can't be re-using the arguments to this function
instead of the results, because they have not been cleaned.
Jun Pataleta [Tue, 13 Nov 2018 01:35:23 +0000 (09:35 +0800)]
Merge branch 'MDL-63834_master' of git://github.com/markn86/moodle
Mark Nelson [Tue, 13 Nov 2018 00:37:09 +0000 (08:37 +0800)]
MDL-63834 core_message: validate conversation type before creating
AMOS bot [Tue, 13 Nov 2018 00:07:31 +0000 (00:07 +0000)]
Automatically generated installer lang files
Andrew Nicols [Mon, 12 Nov 2018 23:47:45 +0000 (07:47 +0800)]
Merge branch 'master_MDL-63953' of https://github.com/danmarsden/moodle
David Monllao [Mon, 12 Nov 2018 16:44:18 +0000 (17:44 +0100)]
Merge branch 'MDL-63729-master' of git://github.com/dpalou/moodle
David Monllao [Mon, 12 Nov 2018 15:26:14 +0000 (16:26 +0100)]
MDL-63724 messaging: Prefix field with the table alias
David Monllao [Mon, 12 Nov 2018 12:27:08 +0000 (13:27 +0100)]
Merge branch 'MDL-63855-master' of git://github.com/bmbrands/moodle
Eloy Lafuente (stronk7) [Mon, 12 Nov 2018 11:07:45 +0000 (12:07 +0100)]
Merge branch 'MDL-63907-master' of git://github.com/cescobedo/moodle
