David Monllao [Mon, 19 Nov 2018 18:42:06 +0000 (19:42 +0100)]
Merge branch 'MDL-63394-master' of git://github.com/jleyva/moodle
Adrian Greeve [Thu, 15 Nov 2018 07:08:16 +0000 (15:08 +0800)]
MDL-64008 badges: Stop displaying empty fields in badge display.
David Monllao [Mon, 19 Nov 2018 10:18:39 +0000 (11:18 +0100)]
MDL-64060 message: Replace error code by language str
David Monllao [Mon, 19 Nov 2018 10:16:09 +0000 (11:16 +0100)]
Merge branch 'MDL-64060-master' of git://github.com/jleyva/moodle
David Monllao [Mon, 19 Nov 2018 10:12:09 +0000 (11:12 +0100)]
Merge branch 'MDL-64010-master' of git://github.com/abgreeve/moodle
David Monllao [Mon, 19 Nov 2018 09:57:13 +0000 (10:57 +0100)]
MDL-63817 block_timeline: Consistent activities limit default
David Monllao [Mon, 19 Nov 2018 09:49:15 +0000 (10:49 +0100)]
Merge branch 'MDL-63817-master' of git://github.com/peterRd/moodle
Damyon Wiese [Mon, 19 Nov 2018 08:28:13 +0000 (16:28 +0800)]
Merge branch 'MDL-63973-master' of https://github.com/snake/moodle
Jun Pataleta [Mon, 19 Nov 2018 07:51:38 +0000 (15:51 +0800)]
Merge branch 'MDL-63994-master-castoken' of git://github.com/mudrd8mz/moodle
Andrew Nicols [Mon, 19 Nov 2018 07:08:22 +0000 (15:08 +0800)]
Merge branch 'MDL-64035-master' of https://github.com/snake/moodle
David Monllao [Mon, 19 Nov 2018 07:07:05 +0000 (08:07 +0100)]
Merge branch 'MDL-63487-master' of https://github.com/lucaboesch/moodle
Andrew Nicols [Mon, 19 Nov 2018 06:59:39 +0000 (14:59 +0800)]
Merge branch 'MDL-63913-master' of https://github.com/snake/moodle
Peter [Fri, 2 Nov 2018 06:45:38 +0000 (14:45 +0800)]
MDL-63817 block_timeline: Persist page limits when sorting by dates
* Included privacy provider for new pref with unit test
* JS changes
Damyon Wiese [Mon, 19 Nov 2018 06:51:46 +0000 (14:51 +0800)]
Merge branch 'MDL-63696-master' of https://github.com/Dagefoerde/moodle
Jake Dallimore [Mon, 19 Nov 2018 05:51:40 +0000 (13:51 +0800)]
MDL-63913 core_message: fix to ensure favourites is exclusive
If a conversation is included in the favourites unread count, it
cannot be included in any other type-based counts.
David Monllao [Mon, 19 Nov 2018 05:06:20 +0000 (06:06 +0100)]
Merge branch 'MDL-63768-master' of https://github.com/lucaboesch/moodle
Jun Pataleta [Mon, 19 Nov 2018 04:59:22 +0000 (12:59 +0800)]
Merge branch 'MDL-64034-master' of https://github.com/snake/moodle
Andrew Nicols [Mon, 19 Nov 2018 04:27:37 +0000 (12:27 +0800)]
Merge branch 'MDL-63969-master-4' of git://github.com/mihailges/moodle
Jake Dallimore [Mon, 19 Nov 2018 03:19:12 +0000 (11:19 +0800)]
MDL-63973 core_badges: exclude related badges when adding related badges
The form which allows a user to add related badges should exclude any
related badges, regardless of the direction of the relationship.
Jake Dallimore [Mon, 19 Nov 2018 03:06:15 +0000 (11:06 +0800)]
MDL-63973 core_badges: fix related badges count in the badges tabs
If A is related to B, this should show a 1 count for either A or B.
Jake Dallimore [Thu, 15 Nov 2018 07:54:54 +0000 (15:54 +0800)]
MDL-63973 core_badges: related badges query now works both ways
If A is related to B, then we should be able to view this relationship
from both badge A and badge B. The following badge methods were updated:
- get_related_badges()
- has_related()
- delete_related_badge()
Andrew Nicols [Mon, 19 Nov 2018 02:33:23 +0000 (10:33 +0800)]
Merge branch 'MDL-63468-master-v1' of git://github.com/lameze/moodle
Jake Dallimore [Fri, 16 Nov 2018 04:27:24 +0000 (12:27 +0800)]
MDL-64034 core_message: return conversationid in search_messages()
Simey Lameze [Wed, 14 Nov 2018 03:07:43 +0000 (11:07 +0800)]
MDL-63468 mod_quiz: fix stats report visual style
Andrew Nicols [Mon, 19 Nov 2018 01:57:50 +0000 (09:57 +0800)]
Merge branch 'MDL-63793-master' of git://github.com/peterRd/moodle
Andrew Nicols [Mon, 19 Nov 2018 01:56:48 +0000 (09:56 +0800)]
Merge branch 'MDL-63913-master' of https://github.com/snake/moodle
Jake Dallimore [Wed, 14 Nov 2018 05:58:18 +0000 (13:58 +0800)]
MDL-63913 core_message: add method to get unread conversation counts
Peter [Tue, 30 Oct 2018 05:42:14 +0000 (13:42 +0800)]
MDL-63793 block_myoverview: Persist the user's paging limit preference
* providers for paging preferences
* Moved the user pref persistence to the factory
* Added client defined namespace in config
* Define custom client events in the client instead of passing to the
factory
Eloy Lafuente (stronk7) [Sun, 18 Nov 2018 11:38:48 +0000 (12:38 +0100)]
Moodle release 3.6beta
Jun Pataleta [Sat, 17 Nov 2018 17:02:24 +0000 (01:02 +0800)]
Merge branch 'MDL-64066' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Sat, 17 Nov 2018 11:11:05 +0000 (12:11 +0100)]
MDL-64066 behat: increase data export sizes, we were hitting them
With MDL-63660 we changed to a bundled moodle.css approach, that
made dowloaded exports size to increase. Although the expected
sizes already were raised in the issue, it seems that some of
them were not enough, so increasing a little bit more.
Side note, we have MDL-63399 about to try to change these tests...
Eloy Lafuente (stronk7) [Sat, 17 Nov 2018 00:10:01 +0000 (01:10 +0100)]
MDL-64066 behat: more fixes to dialog names, old "add" steps
Eloy Lafuente (stronk7) [Fri, 16 Nov 2018 23:16:18 +0000 (00:16 +0100)]
MDL-64066 behat: fix missing quote preventing jobs to complete
Luca Bösch [Thu, 25 Oct 2018 07:54:01 +0000 (09:54 +0200)]
MDL-63768 atto_link: dialog auto width.
Luca Bösch [Sat, 29 Sep 2018 10:56:22 +0000 (12:56 +0200)]
MDL-63487 badges: Style "◀ Award badge" and "Revoke badge ▶" buttons
Juan Leyva [Fri, 16 Nov 2018 15:37:09 +0000 (16:37 +0100)]
MDL-63394 mod_quiz: Do not fail overdue if there is a grace period
Juan Leyva [Fri, 16 Nov 2018 12:20:11 +0000 (13:20 +0100)]
MDL-64060 message: Use error string identifier instead full message
The conversationdoesntexist string does not exists but it is better to use an error string catchable by an external client.
Eloy Lafuente (stronk7) [Fri, 16 Nov 2018 11:03:18 +0000 (12:03 +0100)]
on-demand release 3.6dev+
Eloy Lafuente (stronk7) [Fri, 16 Nov 2018 11:03:16 +0000 (12:03 +0100)]
NOBUG: Fixed SVG browser compatibility
Jan Dageförde [Fri, 19 Oct 2018 17:44:02 +0000 (19:44 +0200)]
MDL-63696 oauth2: Store system account access tokens in DB
Jun Pataleta [Fri, 16 Nov 2018 06:36:14 +0000 (14:36 +0800)]
Merge branch 'MDL-63999-master' of git://github.com/lameze/moodle
Andrew Nicols [Fri, 16 Nov 2018 06:15:16 +0000 (14:15 +0800)]
Merge branch 'MDL-63303-master' of git://github.com/ryanwyllie/moodle
Ryan Wyllie [Fri, 16 Nov 2018 06:10:10 +0000 (14:10 +0800)]
MDL-63303 message: fix bugs in message drawer part 4
* Add clarification to delete messages lang strings
* Stop message polling when sending a message to fix UI bug
* Publish update last message event when polling finds more messages
* Remove logged in user from group conversation participants list
* Use user object to fetch user preferences to reduce DB calls
* Remove animated slide transitions because the browser breaks when
showing some conversations
Simey Lameze [Wed, 14 Nov 2018 04:30:35 +0000 (12:30 +0800)]
MDL-63999 calendar: double escape event name on templates
Mihail Geshoski [Fri, 16 Nov 2018 04:20:17 +0000 (12:20 +0800)]
MDL-63969 core_course: Store favourite courses in the course context
The course favourites were previously set in the system context which
is not right as they should be stored in the course context.
Mihail Geshoski [Fri, 16 Nov 2018 04:19:46 +0000 (12:19 +0800)]
MDL-63969 core_course: Update course privacy provider unit tests
Mihail Geshoski [Fri, 16 Nov 2018 04:18:58 +0000 (12:18 +0800)]
MDL-63969 core_course: Include core_favourites subsystem in provider
Mihail Geshoski [Fri, 16 Nov 2018 04:18:22 +0000 (12:18 +0800)]
MDL-63969 core_favourites: Add support for removal of context users
Jake Dallimore [Fri, 16 Nov 2018 00:23:34 +0000 (08:23 +0800)]
MDL-64035 core_message: get_conversations() excludes disabled chats
Linked conversations which have been disabled must be excluded from
the results.
Jun Pataleta [Fri, 16 Nov 2018 02:54:25 +0000 (10:54 +0800)]
Merge branch 'MDL-63660-master' of git://github.com/junpataleta/moodle
Damyon Wiese [Fri, 16 Nov 2018 02:35:37 +0000 (10:35 +0800)]
Merge branch 'wip-MDL-63854-master' of https://github.com/kwiliarty/moodle
Jun Pataleta [Fri, 16 Nov 2018 02:30:14 +0000 (10:30 +0800)]
MDL-63660 tool_dataprivacy: Increase expected export file size
Adrian Greeve [Fri, 16 Nov 2018 02:23:00 +0000 (10:23 +0800)]
MDL-64010 badges: Validate URL form fields.
Eloy Lafuente (stronk7) [Fri, 16 Nov 2018 00:02:44 +0000 (01:02 +0100)]
Merge branch 'MDL-64012' of https://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Thu, 15 Nov 2018 23:35:33 +0000 (00:35 +0100)]
Merge branch 'MDL-53035-master' of git://github.com/vmdef/moodle
Kevin Wiliarty [Fri, 2 Nov 2018 14:30:53 +0000 (10:30 -0400)]
MDL-63854 competencies, themes: misplaced dropdown arrows
David Mudrák [Thu, 15 Nov 2018 19:44:03 +0000 (20:44 +0100)]
MDL-63994 auth_cas: Include the login token in the simulated login form
The CAS login process relies on the standard authenticate_user_login()
call to set up the user. So we need to inject the login token to pass
the validation.
David Mudrák [Thu, 15 Nov 2018 19:35:46 +0000 (20:35 +0100)]
MDL-63994 login: Improve the logintoken param input
The logintoken is supposed to arrive as a part of the login form ($frm)
together with the username and password. So it should be handled the
same way - including the opportunity for the auth plugins to provide the
form data via the loginpage_hook().
This also implies that only logintoken coming as a part of the POST
request are taken into account, which is a good thing and another thin
layer in this security mechanism.
David Mudrák [Thu, 15 Nov 2018 19:27:58 +0000 (20:27 +0100)]
MDL-63994 login: Clarify inline comments on loginpage_hook() usage
While working on the issue, I found these inline comments outdated and
confusing. The auth plugin types can implement a loginpage_hook()
method, the purpose of which is to inject the $user and/or $frm into
this login/index.php script. The new comments should make it more clear.
Note the second comment mentioned a prelogin_hook() which was an old
name of what is now called loginpage_hook(). It had nothing to do with
the existing pre_loginpage_hook() and was only confusing.
Jun Pataleta [Thu, 15 Nov 2018 15:12:14 +0000 (23:12 +0800)]
Merge branch 'MDL-63832-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Thu, 15 Nov 2018 10:20:36 +0000 (11:20 +0100)]
Merge branch 'MDL-63303_master-deleteduserfix' of https://github.com/markn86/moodle
Mark Nelson [Thu, 15 Nov 2018 09:05:39 +0000 (17:05 +0800)]
MDL-63303 core_message: dont check online status for deleted users
Eloy Lafuente (stronk7) [Thu, 15 Nov 2018 10:04:12 +0000 (11:04 +0100)]
Merge branch 'MDL-63303-master' of git://github.com/ryanwyllie/moodle
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
Ryan Wyllie [Thu, 15 Nov 2018 09:57:44 +0000 (17:57 +0800)]
MDL-63303 message: add member formatting to conversation
Make sure the members are formatted when adding to the state in
a conversation so that any missing data is normalised.
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