David Monllao
cb0f30cf77
Merge branch 'MDL-58014_master' of git://github.com/markn86/moodle
2017-02-20 09:32:11 +01:00
Mark Nelson
29c3b0b4d2
MDL-58014 core_message: fixed unread message count
2017-02-20 13:29:13 +08:00
Mark Nelson
f512355b31
MDL-57967 core_message: do not process conversations from deleted users
2017-02-16 13:01:06 +08:00
Ryan Wyllie
e12d9f494c
MDL-57370 message: add unread count to conversation tests
2017-02-09 03:39:14 +00:00
Ryan Wyllie
c9b82e402e
MDL-57370 message: improve message union sql
2017-02-09 03:39:09 +00:00
Ryan Wyllie
42e2f6c0e9
MDL-57370 message: fix duplicate ids
2017-02-08 07:40:07 +00:00
Dan Poltawski
125fa38af3
Merge branch 'MDL-57370-master' of git://github.com/ryanwyllie/moodle
2017-02-07 10:35:13 +00:00
Ryan Wyllie
b1e6f1a8fb
MDL-57370 message: deprecate message_get_recent_conversations
2017-02-07 01:40:47 +00:00
Ryan Wyllie
98be2d2009
MDL-57370 message: change indexes on message tables
2017-02-07 01:40:47 +00:00
Ryan Wyllie
4d146f1a45
MDL-57370 message: unit tests for get_conversations
2017-02-07 01:04:11 +00:00
Ryan Wyllie
349f426197
MDL-57370 message: remove joins from get_conversations
...
I have broken up the single query that was doing multiple joins on the
messaging and user tables. It no longer does any joins and will instead
query each data set individually.
This may cost more in terms of PHP processing but it will mean that
standard database tunings should be able to handle larger data sets.
For example this function was taking a long time to run on moodle.org
and was causing the MySQL join buffer to overflow.
2017-02-07 01:04:11 +00:00
Rajesh Taneja
9bb156ee75
MDL-57853 phpunit: Remove use of setExpectedException
2017-02-06 11:44:42 +08:00
Andrew Nicols
ea6eb1cc48
Merge branch 'MDL-57630-m' of https://github.com/micaherne/moodle
2017-02-02 09:18:17 +08:00
Andrew Nicols
81c226d451
Merge branch 'MDL-57634-m' of https://github.com/micaherne/moodle
2017-01-18 12:36:45 +08:00
Michael Aherne
55b2a33ce1
MDL-57634 messaging: Ensure test uses a configured plugin
2017-01-12 12:30:39 +00:00
Michael Aherne
46c5c88321
MDL-57630 messaging: Pass unit test with third-party plugins
2017-01-11 16:37:46 +00:00
Eloy Lafuente (stronk7)
777361983c
Merge branch 'wip-mdl-56519-m' of https://github.com/rajeshtaneja/moodle
2017-01-11 02:42:29 +01:00
Rajesh Taneja
57bee542ab
MDL-56519 behat: Fixed lint errors
2017-01-03 09:12:54 +08:00
David Monllao
7eeb375380
Merge branch 'MDL-57338-master' of git://github.com/danpoltawski/moodle
2016-12-29 10:44:01 +01:00
David Monllao
edda5120e2
Merge branch 'MDL-57331-master' of https://github.com/xow/moodle
2016-12-28 21:21:04 +00:00
Dan Poltawski
514ab739fb
MDL-57338 message: fix template component
2016-12-22 12:50:38 +00:00
John Okely
9e7b172a02
MDL-57331 messaging: Fix sent messages appearing twice.
2016-12-20 10:47:14 +08:00
Mark Nelson
c9431a5be8
MDL-57270 core_message: trim message before it is sent
2016-12-14 12:18:58 +08:00
Andrew Nicols
75af0aa680
Merge branch 'MDL-57266' of git://github.com/stronk7/moodle
2016-12-07 09:53:16 +08:00
Eloy Lafuente (stronk7)
75c57a08fb
MDL-57266 upgrade: add 3.2.0 separation line to all upgrade scripts
2016-12-05 17:10:20 +01:00
Mark Nelson
57b3433604
MDL-57084 core_message: prevent duplication of day separator
2016-12-05 12:12:14 +08:00
Eloy Lafuente (stronk7)
04649747a4
MDL-57197 versions: bump all versions and requires near release
...
version = 2016120500 release version
requires= 2016112900 current rc4 version
2016-11-29 22:57:05 +01:00
Adrian Greeve
72a5842bd7
MDL-56431 messaging: Added aria label to filter.
...
Added an aria label to the course filter in the
messaging page.
2016-11-24 17:33:22 +08:00
David Monllao
68dde67d9f
Merge branch 'MDL-57094-master' of git://github.com/ryanwyllie/moodle
2016-11-24 15:53:26 +08:00
David Monllao
8b81daf4dd
Merge branch 'MDL-56429-master' of git://github.com/ryanwyllie/moodle
2016-11-24 15:47:31 +08:00
Ryan Wyllie
de4ca62e7a
MDL-56429 theme: add margin to processor settings form controls
...
Add a top margin to the form controls in the processor settings modal on
the notification preferences page to separate the content from the
controls.
2016-11-24 06:12:27 +00:00
David Monllao
fa42b7bc69
Merge branch 'MDL-57069_master' of git://github.com/markn86/moodle
2016-11-24 11:04:28 +08:00
David Monllao
ff8b71ef7b
Merge branch 'MDL-56871_master' of git://github.com/markn86/moodle
2016-11-24 09:53:45 +08:00
Adrian Greeve
58c2684db2
MDL-56431 messaging: Set focus to the write a message box.
2016-11-23 09:13:51 +00:00
Adrian Greeve
d14207fd25
MDL-56431 messaging: Adding access to messaging.
...
This adds the most crucial elements needed for making
the messaging page accessible. There are still some other
areas that need addressing.
2016-11-23 09:13:50 +00:00
Mark Nelson
cb8057531f
MDL-56871 core_message: fix inconsistent online status between panels
2016-11-23 16:32:46 +08:00
Mark Nelson
afa68a8174
MDL-57069 core_message: prevent past messages being loaded
2016-11-23 14:26:14 +08:00
Ryan Wyllie
b487a7c028
MDL-57094 message: change view more link in notification popover
2016-11-23 05:54:07 +00:00
David Monllao
8fb1b3bb68
Merge branch 'MDL-56391_master' of git://github.com/markn86/moodle
2016-11-23 09:49:03 +08:00
David Monllao
74138c7cd0
Merge branch 'MDL-57087_master' of git://github.com/markn86/moodle
2016-11-23 08:01:25 +08:00
Dan Poltawski
0484a0d511
Merge branch 'MDL-57075-master' of git://github.com/ryanwyllie/moodle
2016-11-22 21:14:20 +00:00
Dan Poltawski
cb151980c4
Merge branch 'MDL-56656-master' of git://github.com/ankitagarwal/moodle
2016-11-22 18:05:10 +00:00
Dan Poltawski
73430100ff
Merge branch 'MDL-57042-master' of git://github.com/damyon/moodle
2016-11-22 18:00:45 +00:00
Ankit Agarwal
7597ab0b99
MDL-56656 messages: Proper multilang formating in messaging pages
2016-11-22 14:51:12 +05:30
Mark Nelson
9c6c29932a
MDL-56391 core_message: addressed confusing links on the profile page
...
1) Use the string 'Send message' rather than 'View messages'.
2) Removed the 'View messages' string as it is no longer used
and was introduced in the new messaging UI.
3) Removed the 'View profile' link and made the user's profile
picture a link to their profile instead, this was only
recently plausible because of MDL-57036.
2016-11-22 14:35:19 +08:00
Mark Nelson
3c1cdac63f
MDL-57087 core_message: ignore site policy if logged in as admin
2016-11-22 13:20:49 +08:00
Ryan Wyllie
a6a277f06c
MDL-57075 message: notification popover see all link
...
The "see all" link in the notification popover should link to the full
notifications page similar to how the "see all" link in the message
popover links to the messaging page.
2016-11-22 03:44:26 +00:00
Andrew Nicols
727145bf1c
MDL-56407 message: Additional unit test for unblocked user
2016-11-22 09:45:52 +08:00
Andrew Nicols
d10ca75b8c
Merge branch 'MDL-56407-master-2' of git://github.com/junpataleta/moodle
2016-11-22 09:06:09 +08:00
Damyon Wiese
9741087ffd
MDL-57042 messaging: When selecting a user, go to send message
...
This is the whole point of this UI - make it the default action after
searching and selecting a user. You can still get to their profile by
clicking their name in the header of the messaging pane.
2016-11-21 12:22:30 +08:00