91663 Commits

Author SHA1 Message Date
Andrew Nicols
73fda8faeb Merge branch 'MDL-63913-master' of https://github.com/snake/moodle 2018-11-19 09:56:48 +08:00
Jake Dallimore
33022ee1d5 MDL-63913 core_message: add method to get unread conversation counts 2018-11-19 09:48:58 +08:00
Peter
11988d74b4 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
2018-11-19 09:43:00 +08:00
Eloy Lafuente (stronk7)
01acb1ea90 Moodle release 3.6beta v3.6.0-beta 2018-11-18 12:38:48 +01:00
Jun Pataleta
9d10c33989 Merge branch 'MDL-64066' of git://github.com/stronk7/moodle 2018-11-18 01:02:24 +08:00
Eloy Lafuente (stronk7)
85ad2e6dff 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...
2018-11-17 12:41:26 +01:00
Eloy Lafuente (stronk7)
6905c1c3fe MDL-64066 behat: more fixes to dialog names, old "add" steps 2018-11-17 12:10:37 +01:00
Eloy Lafuente (stronk7)
1a82729734 MDL-64066 behat: fix missing quote preventing jobs to complete 2018-11-17 00:16:18 +01:00
Luca Bösch
104cc0e3b1 MDL-63768 atto_link: dialog auto width. 2018-11-16 17:29:28 +01:00
Luca Bösch
2e477f03cc MDL-63487 badges: Style "◀ Award badge" and "Revoke badge ▶" buttons 2018-11-16 17:29:17 +01:00
Juan Leyva
904c37c6c8 MDL-63394 mod_quiz: Do not fail overdue if there is a grace period 2018-11-16 16:56:40 +01:00
Juan Leyva
a28c222e63 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.
2018-11-16 13:20:11 +01:00
Eloy Lafuente (stronk7)
8907290a46 on-demand release 3.6dev+ 2018-11-16 12:03:18 +01:00
Eloy Lafuente (stronk7)
303d597523 NOBUG: Fixed SVG browser compatibility 2018-11-16 12:03:16 +01:00
Jan Dageförde
f11a7d6a05
MDL-63696 oauth2: Store system account access tokens in DB 2018-11-16 11:43:16 +01:00
Jun Pataleta
bf3c9536ac Merge branch 'MDL-63999-master' of git://github.com/lameze/moodle 2018-11-16 14:36:14 +08:00
Andrew Nicols
e151cbd971 Merge branch 'MDL-63303-master' of git://github.com/ryanwyllie/moodle 2018-11-16 14:15:16 +08:00
Ryan Wyllie
d3d95d5dc2 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
2018-11-16 14:10:10 +08:00
Simey Lameze
b8c0534515 MDL-63999 calendar: double escape event name on templates 2018-11-16 13:56:54 +08:00
Mihail Geshoski
329f1f23ff 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.
2018-11-16 12:20:17 +08:00
Mihail Geshoski
214696b04f MDL-63969 core_course: Update course privacy provider unit tests 2018-11-16 12:19:46 +08:00
Mihail Geshoski
4f8c9232f1 MDL-63969 core_course: Include core_favourites subsystem in provider 2018-11-16 12:18:58 +08:00
Mihail Geshoski
61fafe8127 MDL-63969 core_favourites: Add support for removal of context users 2018-11-16 12:18:22 +08:00
Jake Dallimore
18550c0afb MDL-64035 core_message: get_conversations() excludes disabled chats
Linked conversations which have been disabled must be excluded from
the results.
2018-11-16 12:04:24 +08:00
Jun Pataleta
30538dc9c1 Merge branch 'MDL-63660-master' of git://github.com/junpataleta/moodle 2018-11-16 10:54:25 +08:00
Damyon Wiese
ba88292a3d Merge branch 'wip-MDL-63854-master' of https://github.com/kwiliarty/moodle 2018-11-16 10:35:37 +08:00
Jun Pataleta
223e1a6f73 MDL-63660 tool_dataprivacy: Increase expected export file size 2018-11-16 10:30:14 +08:00
Adrian Greeve
347b771a4b MDL-64010 badges: Validate URL form fields. 2018-11-16 10:28:09 +08:00
Eloy Lafuente (stronk7)
75bedeafe4 Merge branch 'MDL-64012' of https://github.com/timhunt/moodle 2018-11-16 01:02:44 +01:00
Eloy Lafuente (stronk7)
246149f059 Merge branch 'MDL-53035-master' of git://github.com/vmdef/moodle 2018-11-16 00:35:33 +01:00
Kevin Wiliarty
cadec24c48 MDL-63854 competencies, themes: misplaced dropdown arrows 2018-11-15 15:37:15 -05:00
David Mudrák
c7d33da305 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.
2018-11-15 21:19:50 +01:00
David Mudrák
e4a97a7a01 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.
2018-11-15 21:19:50 +01:00
David Mudrák
667f564b4d 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.
2018-11-15 21:19:50 +01:00
Jun Pataleta
b51b0c6682 Merge branch 'MDL-63832-master' of git://github.com/jleyva/moodle 2018-11-15 23:12:14 +08:00
Eloy Lafuente (stronk7)
9ca803a86d Merge branch 'MDL-63303_master-deleteduserfix' of https://github.com/markn86/moodle 2018-11-15 11:20:36 +01:00
Mark Nelson
52beee65b2 MDL-63303 core_message: dont check online status for deleted users 2018-11-15 18:08:12 +08:00
Eloy Lafuente (stronk7)
7a9717f614 Merge branch 'MDL-63303-master' of git://github.com/ryanwyllie/moodle 2018-11-15 11:04:12 +01:00
Eloy Lafuente (stronk7)
6a7ee95231 Merge branch 'MDL-63303-master-fix' of git://github.com/andrewnicols/moodle 2018-11-15 11:01:24 +01:00
Ryan Wyllie
132626720c 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.
2018-11-15 17:57:44 +08:00
Andrew Nicols
5e47224a62 MDL-63303 message: Stop WS from removing optional keys 2018-11-15 17:56:31 +08:00
Jun Pataleta
ac6cdcea06 Merge branch 'MDL-62287-master' of git://github.com/andrewnicols/moodle 2018-11-15 17:10:54 +08:00
Jun Pataleta
7a99ff70b9 Merge branch 'MDL-63811' of git://github.com/aolley/moodle 2018-11-15 17:09:28 +08:00
Damyon Wiese
f4ccea6f52 Merge branch 'MDL-64009-master' of git://github.com/abgreeve/moodle 2018-11-15 16:30:20 +08:00
Andrew Nicols
705003beae MDL-63303 behat: Behat fixes 2018-11-15 16:26:16 +08:00
Andrew Nicols
f42e85cc86 Merge branch 'MDL-63303-master' of git://github.com/ryanwyllie/moodle 2018-11-15 16:25:20 +08:00
Andrew Nicols
5d0abf9df6 MDL-63303 behat: Behat fixes 2018-11-15 16:24:00 +08:00
Damyon Wiese
47dc7eb8a4 Merge branch 'MDL-64011-master' of git://github.com/abgreeve/moodle 2018-11-15 16:10:21 +08:00
Ryan Wyllie
c75559cfff 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.
2018-11-15 14:43:22 +08:00
Ryan Wyllie
663ccd58ed 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
2018-11-15 14:43:21 +08:00