Jun Pataleta [Wed, 28 Nov 2018 05:59:50 +0000 (13:59 +0800)]
Merge branch 'MDL-64223-master' of https://github.com/snake/moodle
Andrew Nicols [Wed, 28 Nov 2018 04:02:34 +0000 (12:02 +0800)]
Merge branch 'MDL-64224-master' of https://github.com/snake/moodle
Andrew Nicols [Wed, 28 Nov 2018 03:08:22 +0000 (11:08 +0800)]
Merge branch 'MDL-64217-master' of git://github.com/ryanwyllie/moodle
Andrew Nicols [Wed, 28 Nov 2018 02:39:38 +0000 (10:39 +0800)]
Merge branch 'MDL-64207-master' of git://github.com/mihailges/moodle
Ryan Wyllie [Wed, 28 Nov 2018 01:56:28 +0000 (09:56 +0800)]
MDL-64099 message: fix lazy load list overflow
Damyon Wiese [Wed, 28 Nov 2018 02:15:35 +0000 (10:15 +0800)]
Merge branch 'MDL-64099-master-fix' of git://github.com/junpataleta/moodle
Jun Pataleta [Wed, 28 Nov 2018 01:27:06 +0000 (09:27 +0800)]
MDL-64099 message: Show last message for individual messages
Jake Dallimore [Wed, 28 Nov 2018 00:48:14 +0000 (08:48 +0800)]
MDL-64224 core_message: fix for isfavourite in api::get_conversation()
Eloy Lafuente (stronk7) [Tue, 27 Nov 2018 15:47:10 +0000 (16:47 +0100)]
Merge branch 'MDL-64220-master' of git://github.com/damyon/moodle
Bas Brands [Tue, 27 Nov 2018 11:19:58 +0000 (12:19 +0100)]
MDL-64099 message: group conversation heading html
* Fix for IE11 group conversation header image sticking to group name
Bas Brands [Tue, 27 Nov 2018 09:36:04 +0000 (10:36 +0100)]
MDL-64099 message: last message container minimum size
* empty last message containers should have a minimum size
to ensure list-group-item element are in the right place.
Jake Dallimore [Tue, 27 Nov 2018 08:35:56 +0000 (16:35 +0800)]
MDL-64223 libraries: PHP7.1 compatibility fixes for Jabber lib
Andrew Nicols [Tue, 27 Nov 2018 07:13:16 +0000 (15:13 +0800)]
Merge branch 'MDL-64161-master' of git://github.com/abgreeve/moodle
Damyon Wiese [Tue, 27 Nov 2018 01:42:53 +0000 (09:42 +0800)]
MDL-64220 privacy: Clean path params
We need to consistently clean the path params before we use them. This
shows a difference on windows where dir separators are different.
Adrian Greeve [Tue, 27 Nov 2018 05:42:48 +0000 (13:42 +0800)]
MDL-64161 gradereport_singleview: Single updates reported correctly.
If there is an error with the update of individual entries this is
also correctly displayed as not being updated.
Jun Pataleta [Tue, 27 Nov 2018 06:44:30 +0000 (14:44 +0800)]
Merge branch 'MDL-64181-master-fix' of git://github.com/andrewnicols/moodle
Andrew Nicols [Tue, 27 Nov 2018 06:31:55 +0000 (14:31 +0800)]
MDL-64181 core: Ensure that self is included in parentage
Ryan Wyllie [Tue, 27 Nov 2018 05:51:22 +0000 (13:51 +0800)]
MDL-64217 bootstrapbase: add icon-size- class to undo.less
Andrew Nicols [Tue, 27 Nov 2018 03:51:48 +0000 (11:51 +0800)]
Merge branch 'MDL-64047-master' of https://github.com/snake/moodle
Jun Pataleta [Tue, 27 Nov 2018 03:47:15 +0000 (11:47 +0800)]
Merge branch 'MDL-64181-master' of git://github.com/damyon/moodle
Andrew Nicols [Tue, 27 Nov 2018 03:36:42 +0000 (11:36 +0800)]
Merge branch 'MDL-64161-master' of git://github.com/abgreeve/moodle
Andrew Nicols [Tue, 27 Nov 2018 03:07:13 +0000 (11:07 +0800)]
Merge branch 'MDL-64170-master-fix' of git://github.com/junpataleta/moodle
Jun Pataleta [Tue, 27 Nov 2018 02:37:05 +0000 (10:37 +0800)]
MDL-64170 block_myoverview: Behat fix
Jun Pataleta [Tue, 27 Nov 2018 02:53:04 +0000 (10:53 +0800)]
Merge branch 'MDL-64099-master' of git://github.com/ryanwyllie/moodle
Ryan Wyllie [Mon, 26 Nov 2018 06:28:10 +0000 (14:28 +0800)]
MDL-64099 message: fix last message and date in group conversations
Bas Brands [Fri, 23 Nov 2018 14:40:36 +0000 (15:40 +0100)]
MDL-64099 message: correct dropdown container html
in the bootstrapbase overridden template <ul> should
be used for the dropdown container
Bas Brands [Thu, 22 Nov 2018 17:02:19 +0000 (18:02 +0100)]
MDL-64099 message: Hide scrollbar on section collapsing
Bas Brands [Thu, 22 Nov 2018 16:33:50 +0000 (17:33 +0100)]
MDL-64099 message: Highlight the collapsible header on hover
Bas Brands [Thu, 22 Nov 2018 16:22:05 +0000 (17:22 +0100)]
MDL-64099 message: Make collapsible headers bold
Bas Brands [Thu, 22 Nov 2018 16:00:47 +0000 (17:00 +0100)]
MDL-64099 message: Move timestamps all the way to the right
Bas Brands [Thu, 22 Nov 2018 13:50:37 +0000 (14:50 +0100)]
MDL-64099 message: conversation long sender names truncate
Bas Brands [Thu, 22 Nov 2018 13:29:56 +0000 (14:29 +0100)]
MDL-64099 message: Align group image to container top
Bas Brands [Thu, 22 Nov 2018 13:08:49 +0000 (14:08 +0100)]
MDL-64099 message: Replace badge with rectangular shape
Bas Brands [Thu, 22 Nov 2018 13:03:12 +0000 (14:03 +0100)]
MDL-64099 message: Add a border in between messages and contacts
Bas Brands [Thu, 22 Nov 2018 11:09:42 +0000 (12:09 +0100)]
MDL-64099 message: Add sender name to conversation preview in overview
Ryan Wyllie [Wed, 21 Nov 2018 06:53:24 +0000 (14:53 +0800)]
MDL-64099 message: Change icons for select and selected messages
Ryan Wyllie [Wed, 21 Nov 2018 04:04:20 +0000 (12:04 +0800)]
MDL-64099 message: move delete messages icon to the right
Ryan Wyllie [Wed, 21 Nov 2018 03:29:58 +0000 (11:29 +0800)]
MDL-64099 message: Align the icons and avatar at the top of the header
Ryan Wyllie [Wed, 21 Nov 2018 02:17:46 +0000 (10:17 +0800)]
MDL-64099 message: remove conversation name link underline
Ryan Wyllie [Wed, 21 Nov 2018 02:02:23 +0000 (10:02 +0800)]
MDL-64099 message: de-emphasize participant count in group conversation
Ryan Wyllie [Wed, 21 Nov 2018 02:01:38 +0000 (10:01 +0800)]
MDL-64099 message: increase margins between messages in conversations
Ryan Wyllie [Wed, 21 Nov 2018 01:29:16 +0000 (09:29 +0800)]
MDL-64099 message: bold senders name in message
Andrew Nicols [Tue, 27 Nov 2018 01:17:18 +0000 (09:17 +0800)]
Merge branch 'MDL-64139-master' of git://github.com/ryanwyllie/moodle
Jake Dallimore [Tue, 27 Nov 2018 00:51:40 +0000 (08:51 +0800)]
MDL-64047 core_message: test get_contact_requests() with blocked users
Jake Dallimore [Mon, 26 Nov 2018 07:14:54 +0000 (15:14 +0800)]
MDL-64047 core_message: contact request count must exclude blocked users
Damyon Wiese [Mon, 26 Nov 2018 02:17:35 +0000 (10:17 +0800)]
MDL-64181 javascript: Recursive template fix
This change prevents template rendering from waiting for itself, but does
allow it to wait for another async call to render.
David Monllao [Mon, 26 Nov 2018 14:42:26 +0000 (15:42 +0100)]
Merge branch 'MDL-64205-master-sarunconfirmeduser' of git://github.com/mudrd8mz/moodle
David Mudrák [Sun, 25 Nov 2018 06:17:54 +0000 (07:17 +0100)]
MDL-64205 privacy: Delete orphaned data request records on upgrade
As a result of the bug, some requests can be orphaned - the linked user
record may not exist any more. This is a cleanup of such records.
David Monllao [Mon, 26 Nov 2018 12:27:24 +0000 (13:27 +0100)]
Merge branch 'MDL-64140-master' of https://github.com/snake/moodle
Ryan Wyllie [Wed, 21 Nov 2018 08:18:05 +0000 (16:18 +0800)]
MDL-64139 message: load conversation counts async
David Monllao [Mon, 26 Nov 2018 04:44:00 +0000 (05:44 +0100)]
MDL-64170 block_myoverview: Extend fix to aria label
David Monllao [Mon, 26 Nov 2018 04:43:02 +0000 (05:43 +0100)]
Merge branch 'MDL-64170-master' of git://github.com/bmbrands/moodle
David Monllao [Mon, 26 Nov 2018 04:36:57 +0000 (05:36 +0100)]
Merge branch 'MDL-64173-master' of git://github.com/bmbrands/moodle
David Monllao [Mon, 26 Nov 2018 03:52:34 +0000 (04:52 +0100)]
Merge branch 'MDL-64172-master' of git://github.com/bmbrands/moodle
Adrian Greeve [Mon, 26 Nov 2018 03:22:58 +0000 (11:22 +0800)]
MDL-64161 gradereport_singleview: Behat test for out of bounds grade.
Adrian Greeve [Mon, 26 Nov 2018 02:56:28 +0000 (10:56 +0800)]
MDL-64161 gradereport_singleview: Stop updating grades with errors.
Jake Dallimore [Mon, 26 Nov 2018 02:54:29 +0000 (10:54 +0800)]
MDL-64140 core_message: test unread counts with dataprovider in api
The 3 methods used to test this function are superceded by the cases in
the dataprovider, so let's remove these and use the provider instead.
Jake Dallimore [Mon, 26 Nov 2018 02:54:18 +0000 (10:54 +0800)]
MDL-64140 core_message: add get_unread_conversation_counts() web service
Mihail Geshoski [Mon, 26 Nov 2018 02:43:25 +0000 (10:43 +0800)]
MDL-64207 gradebook: Fix grader report misalignment
Andrew Nicols [Mon, 26 Nov 2018 01:07:38 +0000 (09:07 +0800)]
Merge branch 'MDL-64167-master-2' of https://github.com/snake/moodle
Jake Dallimore [Fri, 23 Nov 2018 05:45:09 +0000 (13:45 +0800)]
MDL-64167 core_message: fix counts to exclude 'self' conversations
Jake Dallimore [Fri, 23 Nov 2018 04:39:23 +0000 (12:39 +0800)]
MDL-64167 core_message: get_conversations() excludes self conversations
The UI can't handle these, so for now, let's not return them.
Jake Dallimore [Fri, 23 Nov 2018 04:28:06 +0000 (12:28 +0800)]
MDL-64167 core_message: get_conversations() handles self conversations
Those individual conversations created with one's self (via admin user
bulk actions) are now supported in get_conversations(). These had two
records with the same userid in the message_conversation_members table.
The following adjustments have been made to accomodate these:
- Member count adjusted to read 1, not 2 for 'self' conversations.
- Member information for the current user now returned for 'self'
conversations.
- The method now tracks 'self' conversations via $selfconversations.
Jake Dallimore [Fri, 23 Nov 2018 02:25:46 +0000 (10:25 +0800)]
MDL-64167 core_message: fix for sending bulk messages from site admin
This ensures the following:
- An admin/manager can send a message to all users, including themself,
without any errors.
Bas Brands [Sun, 25 Nov 2018 12:44:35 +0000 (13:44 +0100)]
MDL-64173 block_myoverview: remove heading class from course title
Using <h4> on the course name titles is symantically incorrect
To align with the other views the heading tag has been removed.
Bas Brands [Sun, 25 Nov 2018 11:44:04 +0000 (12:44 +0100)]
MDL-64172 block_myoverview: use .text-primary to colour star icons
Using the .text-primary class allows colour to be overridden easily
This will back the dashboard icons look consistent with the messaging icons.
Bas Brands [Sun, 25 Nov 2018 10:36:14 +0000 (11:36 +0100)]
MDL-64170 block myoverview: change title string to course
change language string for Sort by "Title" to "Course"
Eloy Lafuente (stronk7) [Sun, 25 Nov 2018 09:50:38 +0000 (10:50 +0100)]
Moodle release 3.6rc1
David Mudrák [Sun, 25 Nov 2018 05:55:23 +0000 (06:55 +0100)]
MDL-64205 users: Do not delete the actual records of unconfirmed users
There is an automatic data privacy request created to get rid of all the
personal data upon the user deletion. With the actual user record
absent, the data privacy requests page throws an error. Let's do here
same as we do in `delete_incomplete_users_task` and let us not delete
the actual user record.
Eloy Lafuente (stronk7) [Fri, 23 Nov 2018 23:26:18 +0000 (00:26 +0100)]
Merge branch 'MDL-64186-master-enfix' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Fri, 23 Nov 2018 15:36:55 +0000 (16:36 +0100)]
on-demand release 3.6beta+
Eloy Lafuente (stronk7) [Fri, 23 Nov 2018 15:36:53 +0000 (16:36 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Helen Foster [Fri, 23 Nov 2018 13:39:54 +0000 (14:39 +0100)]
MDL-64186 lang: Import fixed English strings (en_fix)
Significant string change:
* togglemessagemenu, core_message - messages menu -> messaging drawer
(new functionality)
Jun Pataleta [Fri, 23 Nov 2018 06:47:00 +0000 (14:47 +0800)]
Merge branch 'MDL-64057-master' of https://github.com/snake/moodle
Jake Dallimore [Fri, 23 Nov 2018 06:42:33 +0000 (14:42 +0800)]
MDL-64057 core_message: fix bug with favourite count aggregation
Damyon Wiese [Fri, 23 Nov 2018 04:21:13 +0000 (12:21 +0800)]
Merge branch 'MDL-64180_master' of git://github.com/markn86/moodle
Mark Nelson [Fri, 23 Nov 2018 02:30:02 +0000 (10:30 +0800)]
MDL-64180 core_message: added new WS for contact request count
Mark Nelson [Fri, 23 Nov 2018 02:22:51 +0000 (10:22 +0800)]
MDL-64180 core_message: change stdClass to int for count requests param
This will be used by a new web service and we do not want to fetch
the user unnecessarily in the call.
Also renamed the method for consistency.
Jun Pataleta [Fri, 23 Nov 2018 03:24:58 +0000 (11:24 +0800)]
Merge branch 'MDL-64057-master' of https://github.com/snake/moodle
Jun Pataleta [Fri, 23 Nov 2018 03:14:57 +0000 (11:14 +0800)]
Merge branch 'MDL-64030-master' of git://github.com/andrewnicols/moodle
Jake Dallimore [Thu, 22 Nov 2018 01:15:05 +0000 (09:15 +0800)]
MDL-64057 core_message: return conversations with soft-deleted users
Individual conversations with a soft-deleted user (including messages)
are now displayed in the conversation listing. This brings the behaviour
of individual conversations in line with group conversations, in that
the active user can still view messages.
Jake Dallimore [Thu, 22 Nov 2018 01:10:37 +0000 (09:10 +0800)]
MDL-64057 core_message: use get_conversation_counts() during rendering
Jake Dallimore [Thu, 22 Nov 2018 06:09:18 +0000 (14:09 +0800)]
MDL-64057 core_message: add get_conversation_counts() web service
Jake Dallimore [Tue, 20 Nov 2018 05:15:27 +0000 (13:15 +0800)]
MDL-64057 core_message: consolidate conversation counts into single call
Counts for types (individual, group) and favourites can be fetched with
a single API call.
Jake Dallimore [Thu, 22 Nov 2018 03:23:21 +0000 (11:23 +0800)]
MDL-64057 core_favourites: add get_join_sql_by_type() to service layer
This provides a way for external queries to include information about
favourited items.
AMOS bot [Fri, 23 Nov 2018 00:07:24 +0000 (00:07 +0000)]
Automatically generated installer lang files
Andrew Nicols [Thu, 22 Nov 2018 05:50:26 +0000 (13:50 +0800)]
MDL-64030 tool_dataprivacy: Process requests when system purpose not set
Eloy Lafuente (stronk7) [Thu, 22 Nov 2018 22:15:54 +0000 (23:15 +0100)]
Merge branch 'MDL-62988_master' of git://github.com/markn86/moodle
Jun Pataleta [Thu, 22 Nov 2018 12:34:06 +0000 (20:34 +0800)]
Merge branch 'MDL-64119-master' of git://github.com/junpataleta/moodle
Sara Arjona [Thu, 22 Nov 2018 10:39:10 +0000 (11:39 +0100)]
MDL-64119 output: Use context of renderer_base's page object
Jun Pataleta [Thu, 22 Nov 2018 08:18:27 +0000 (16:18 +0800)]
MDL-63571 grade_report_grader: Use correct context for capability check
Jun Pataleta [Thu, 22 Nov 2018 08:19:09 +0000 (16:19 +0800)]
MDL-63571 grade_report_grader: Set correct type for the context variable
Jun Pataleta [Thu, 22 Nov 2018 07:46:01 +0000 (15:46 +0800)]
Merge branch 'MDL-64142-master-1' of git://github.com/mihailges/moodle
Andrew Nicols [Thu, 22 Nov 2018 07:40:41 +0000 (15:40 +0800)]
Merge branch 'MDL-64165_master' of git://github.com/markn86/moodle
Mark Nelson [Thu, 22 Nov 2018 06:45:50 +0000 (14:45 +0800)]
MDL-64165 core_message: fixed contact requests web service structure
Mark Nelson [Thu, 22 Nov 2018 06:43:27 +0000 (14:43 +0800)]
MDL-64165 core_message: removed unused params from WS helper method
Mihail Geshoski [Thu, 22 Nov 2018 04:51:29 +0000 (12:51 +0800)]
MDL-64142 gradebook: Fix the left hand table column on scroll
Cory Buecker [Mon, 30 Jul 2018 21:24:02 +0000 (16:24 -0500)]
MDL-62988 LTI provider: fix missing info. for LTI 2.X tool provider
Fixes missing capabilities (user information) when membership service is called
from a LTI 2.X tool provider.
Andrew Nicols [Thu, 22 Nov 2018 03:03:58 +0000 (11:03 +0800)]
Merge branch 'MDL-64018_master' of git://github.com/markn86/moodle
Andrew Nicols [Thu, 22 Nov 2018 02:16:23 +0000 (10:16 +0800)]
Merge branch 'MDL-64092-master' of git://github.com/peterRd/moodle