88178 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
c7189fb2bb MDL-60736 tool_mobile: Add missing VALUE_OPTIONAL to new returned info 2018-03-28 18:16:25 +02:00
Eloy Lafuente (stronk7)
6aaf27af91 Merge branch 'MDL-60736-master' of git://github.com/jleyva/moodle 2018-03-28 18:16:22 +02:00
Eloy Lafuente (stronk7)
67eb557286 Merge branch 'MDL-61321-master' of git://github.com/jleyva/moodle 2018-03-28 18:16:19 +02:00
Eloy Lafuente (stronk7)
4b96d7ce05 Merge branch 'MDL-61718-master' of git://github.com/junpataleta/moodle 2018-03-28 18:16:15 +02:00
Jun Pataleta
51c6cfb69a Merge branch 'MDL-60762-master' of git://github.com/junpataleta/moodle 2018-03-28 18:16:12 +02:00
Jun Pataleta
99feb82ab5 Merge branch 'wip-MDL-61328-master' of git://github.com/marinaglancy/moodle 2018-03-28 18:16:09 +02:00
Jun Pataleta
4683e5ff11 Merge branch 'MDL-61257-master' of git://github.com/mihailges/moodle 2018-03-28 18:16:06 +02:00
Jun Pataleta
d6ccd91832 Merge branch 'MDL-61656' of git://github.com/stronk7/moodle 2018-03-28 18:16:03 +02:00
Eloy Lafuente (stronk7)
bdb22af959 Merge branch 'MDL-53226-master' of git://github.com/andrewnicols/moodle 2018-03-28 18:15:52 +02:00
Eloy Lafuente (stronk7)
c3f771aeba Merge branch 'MDL-61248' of https://github.com/ak4t0sh/moodle 2018-03-28 18:12:52 +02:00
Eloy Lafuente (stronk7)
a8336b03a0 Merge branch 'MDL-61576-master' of git://github.com/cescobedo/moodle 2018-03-28 18:12:48 +02:00
Eloy Lafuente (stronk7)
0b9162bd05 Merge branch 'MDL-61691-master' of https://github.com/snake/moodle 2018-03-28 18:12:45 +02:00
Andrew Nicols
306a0bafed Merge branch 'MDL-55532-master' of git://github.com/lameze/moodle 2018-03-28 18:12:42 +02:00
Andrew Nicols
56f5e21f6e Merge branch 'MDL-61733-master' of https://github.com/MartinGauk/moodle 2018-03-28 18:12:39 +02:00
Andrew Nicols
0b4e4ca48f Merge branch 'MDL-60119-master' of https://github.com/lucaboesch/moodle 2018-03-28 18:12:36 +02:00
Adam Pawełczak
7ccb6bb3cc MDL-60762 tool_usertours: Respect $CFG->admin in manager.php 2018-03-27 15:18:03 +08:00
David Monllao
add8d846d9 MDL-53226 search_simpledb: Remove unnecessary object clone 2018-03-27 09:37:20 +08:00
Jake Dallimore
e315e84cf2 MDL-61691 core_plagiarism: fix namespace in privacy provider interface 2018-03-26 12:28:58 +08:00
Mihail Geshoski
e91bc73f87 MDL-61257 reports: Report logs link to unavailable completion report 2018-03-26 12:22:00 +08:00
Nick Phillips
7d4f34cb0d MDL-55532 gradebook: fix grade export to include category names 2018-03-26 11:47:44 +08:00
Marina Glancy
1f0157e137 MDL-61328 tool_usertours: do not fix tour sortorder after step editing
otherwise it breaks when we try to modify the step sortorder
2018-03-26 09:52:14 +08:00
Arnaud Trouvé
a15e507366 MDL-61248 admin: fix incorrectly initialized property 2018-03-23 16:25:36 +01:00
Martin Gauk
db3da830c1 MDL-61733 atto_table: fix creating new table
If Atto is embedded in an HTML table (e.g. in the database activity
on the template pages), you could not create a new table.
2018-03-23 09:08:39 +00:00
Jun Pataleta
d5458014b3 MDL-36941 core: Remove default for convhash field in upgrade.php 2018-03-23 14:14:49 +08:00
Jun Pataleta
ba926805e2 Merge branch 'MDL-36941_master' of git://github.com/markn86/moodle 2018-03-23 12:55:49 +08:00
Mark Nelson
5aac33c785 MDL-36941 core_message: dont query DB unnecessarily checking read status 2018-03-23 12:30:31 +08:00
Mark Nelson
99248f6177 MDL-36941 core_message: fixed minor CiBoT complaints 2018-03-23 12:30:31 +08:00
Mark Nelson
e159b53b5b MDL-36941 core_message: improved performance of helper::get_messages()
Improved the query to use the 'convhash' field as well as adding an index.

Also fixed issue where 'timeread' was hardcoded as 0.
2018-03-23 12:30:30 +08:00
Mark Nelson
d0d1e97ab6 MDL-36941 core_message: added details to upgrade.txt 2018-03-23 12:30:30 +08:00
Mark Nelson
2ccbb8ed62 MDL-36941 core: added index to 'message_user_actions' table 2018-03-23 12:30:30 +08:00
Mark Nelson
74ad60bfbe MDL-36941 core_message: deprecated 'api::mark_all_read_for_user' 2018-03-23 12:30:30 +08:00
Mark Nelson
0d657cc9b7 MDL-36941 core: removed 'message_working' table 2018-03-23 12:30:29 +08:00
Mark Nelson
123631ad47 MDL-36941 message_popup: removed 'message_popup' table 2018-03-23 12:30:29 +08:00
Mark Nelson
b2cd17e6a9 MDL-36941 core: added 'convhash' field to quickly get conversations 2018-03-23 12:30:28 +08:00
Mark Nelson
0d51ae7ef3 MDL-36941 core: final deprecation of functions
This was done earlier than the usual deprecation
process since we have changed the table structure.
It would take time to change the logic in these
functions, but as they have been deprecated for
some time it was decided to forego this effort.
2018-03-23 12:30:28 +08:00
Mark Nelson
3f3e453632 MDL-36941 message_popup: use new WS for marking notifications as read
Also changed the observer to listen for the notification_viewed event,
rather than the message_viewed event.
2018-03-23 12:30:28 +08:00
Mark Nelson
2b595d96f4 MDL-36941 core: added new mark notification as read webservice 2018-03-23 12:30:28 +08:00
Mark Nelson
376a79c242 MDL-36941 core: added events for notifications 2018-03-23 12:30:27 +08:00
Mark Nelson
548936a6c9 MDL-36941 core_message: mark notification/messages takes stdClass
This avoid unnecessary DB calls.
2018-03-23 12:30:27 +08:00
Mark Nelson
883ce42127 MDL-36941 core: convert existing api to use new table structure
Also deprecated the following functions -

1. message_move_userfrom_unread2read - It is not necessary
   for us to mark a message as read on user deletion.
2. message_get_blocked_users - Horrible logic used to
   determine if a user is blocked via reference on some
   randomly chosen 'isblocked' variable.
3. message_get_contacts - The same as above. This can be
   done in a much nicer way.
4. message_mark_message_read - We want two functions to do
   this to avoid confusing messages and notifications.
5. message_can_delete_message - This assumed the variable
   $message contained the 'useridto' property, which
   was present in the old table structure. We do not want
   future usages where a query is done on the new table
   and is simply passed as this won't contain this property.
6. message_delete_message - Same as above.
2018-03-23 12:30:27 +08:00
Mark Nelson
4cd439887a MDL-36941 core: alter events to use new table structure 2018-03-23 09:27:57 +08:00
Mark Nelson
ee14412e21 MDL-36941 core_message: removed unit test that will always fail
We are changing how the API behaves so the old tables will never
be populated. This unit test is testing a deprecated function
which we will not be refactoring to use the new table structure.
2018-03-23 09:27:57 +08:00
Mark Nelson
a63f98245c MDL-36941 core: added new messaging and notification tables 2018-03-23 09:27:56 +08:00
Luca Bösch
efdf25636a MDL-60119 mod_feedback: Suppress choice weight in parentheses. 2018-03-22 23:52:36 +01:00
Eloy Lafuente (stronk7)
a15c745936 weekly release 3.5dev 2018-03-22 16:57:05 +01:00
Eloy Lafuente (stronk7)
eae3d88bc9 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2018-03-22 16:57:02 +01:00
cescobedo
adbf7c5a43 MDL-61576 mod_lti: remove allowinstructorcustom in lib/locallib.php 2018-03-22 09:59:30 +01:00
Jun Pataleta
a20a2ac704 MDL-61718 admin: Make sure city and country columns are not duplicated
* Since City/town and Country have been added in $CFG->showuseridentity
since 3.4, we need to exclude the required city and country columns
when fetching the extra columns using get_extra_user_fields().
2018-03-22 13:52:39 +08:00
Jun Pataleta
fa54a1a7e2 Merge branch 'MDL-61678' of git://github.com/stronk7/moodle 2018-03-22 12:33:24 +08:00
Jake Dallimore
a44987a081 Merge branch 'MDL-58179-master-fix' of https://github.com/andrewnicols/moodle 2018-03-22 12:05:29 +08:00