Commit graph

93626 commits

Author SHA1 Message Date
David Monllaó
3d15deff15 Merge branch 'MDL-65222' of git://github.com/timhunt/moodle 2019-04-22 09:08:37 +02:00
Eloy Lafuente (stronk7)
594717128d MDL-62459 database: remove unused table role_sortorder 2019-04-22 01:37:14 +02:00
Eloy Lafuente (stronk7)
65c6deca6f Merge branch 'MDL-65378_master' of git://github.com/dmonllao/moodle 2019-04-22 01:03:34 +02:00
Eloy Lafuente (stronk7)
1d75eb9bad Merge branch 'MDL-65275_master' of git://github.com/markn86/moodle 2019-04-22 00:58:37 +02:00
Alexander Bias
d6cea5ccd9 MDL-65056 completion: Hide checkboxes on course page for teachers 2019-04-19 11:40:00 +02:00
sam marshall
7e604b418e MDL-65375 Restore: Log restore must support new jsonformat setting
Includes support for the new jsonformat setting in logstore_standard
and logstore_database.

Also includes a bugfix where the restore used to restore NULL into
'other' fields, which were not null otherwise, so it was inconsistent
with normal logging.
2019-04-18 16:07:01 +01:00
Adrian Greeve
8c67db30a6 Merge branch 'MDL-64017_master' of git://github.com/markn86/moodle 2019-04-18 16:18:22 +08:00
Mark Nelson
168d782ff8 MDL-64017 message_email: task to send messages as a digest 2019-04-18 16:03:27 +08:00
Jun Pataleta
a0653e5c4a MDL-65382 tool_dataprivacy: Fix appearance of status labels 2019-04-18 15:29:07 +08:00
Jun Pataleta
83d4204ef1 MDL-65382 mod_lti: Fix appearance of status labels 2019-04-18 15:28:48 +08:00
Jun Pataleta
eecb7dc093 MDL-65382 admin: Fix appearance of status labels 2019-04-18 15:28:15 +08:00
Jun Pataleta
da5a90a822 Merge branch 'MDL-64137-master' of git://github.com/bmbrands/moodle 2019-04-18 14:55:20 +08:00
Bas Brands
2902ca9d92 MDL-64017 message_email: Added mustache templates for email 2019-04-18 14:28:09 +08:00
Mark Nelson
d5d4a5aab2 MDL-64017 core_message: can specify conversation to view on index page 2019-04-18 14:28:09 +08:00
Mark Nelson
9b6034bc77 MDL-64017 message_email: populate new DB table when required 2019-04-18 14:28:09 +08:00
Mark Nelson
c210455a4c MDL-64017 core: remove group conversation check for processors
We now want to allow processors to process group messages.
2019-04-18 14:28:09 +08:00
Mark Nelson
ca754fc8c2 MDL-64017 core_message: pass conversation type to processors 2019-04-18 14:28:09 +08:00
Mark Nelson
9bc1b8f8da MDL-64017 message_email: updated privacy provider 2019-04-18 14:28:09 +08:00
Mark Nelson
97c85a001c MDL-64017 message_email: add new database table
This table will be responsible for storing the messages
that need to be emailed, but have not yet. A task will
run that will email these and then remove them from the
table.
2019-04-18 14:28:09 +08:00
Adrian Greeve
48fa567da2 Merge branch 'MDL-29318-master' of git://github.com/junpataleta/moodle 2019-04-18 13:48:33 +08:00
Adrian Greeve
eae20bc94a MDL-64715 core_message: Fix for message upgrade db prefix. 2019-04-18 11:47:13 +08:00
Jun Pataleta
9f23a65e0c Merge branch 'MDL-64956-master2' of git://github.com/peterRd/moodle 2019-04-18 11:09:49 +08:00
Adrian Greeve
862a9b1d60 Merge branch 'MDL-64715-master-self-starred-pr-ryan' of git://github.com/sarjona/moodle 2019-04-18 11:06:57 +08:00
Adrian Greeve
e16ab06b46 Merge branch 'MDL-64703-master' of git://github.com/bmbrands/moodle 2019-04-18 09:12:43 +08:00
Simey Lameze
3bc573501a MDL-65354 core: replace all usages of old cap 2019-04-18 08:57:52 +08:00
Simey Lameze
d26749b74c MDL-65354 core: rename course:browse cap to category:browsecourses 2019-04-18 08:57:48 +08:00
Peter
a0c9b6afcc MDL-64956 mod_forum: Updates based on IR 2019-04-18 06:40:22 +08:00
Eloy Lafuente (stronk7)
019004dcc7 on-demand release 3.7dev+ 2019-04-17 20:07:01 +02:00
Eloy Lafuente (stronk7)
7404b9de9b Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2019-04-17 20:06:58 +02:00
David Monllaó
acaf0977a8 MDL-65378 tool_analytics: Add missing require 2019-04-17 13:56:04 +02:00
David Monllaó
6289f6afe3 Merge branch 'MDL-62907' of https://github.com/stronk7/moodle 2019-04-17 11:16:44 +02:00
Eloy Lafuente (stronk7)
65453b9861 MDL-62907 Logging: Allow nulls on info, cases have been detected 2019-04-17 10:43:02 +02:00
Peter
9b4f09bad2 MDL-64956 mod_forum: Inpage reply
* Basic functionality for an inpage reply. With advanced link that takes you to the previous "Reply page".
* Updated behat function to handle the additional step
* Updated templates to have some identifiers on where one is storing the replies post
* Updated discussion_post to use the new vault functions to get the corresponding records
* Jumpto newly created post
2019-04-17 10:13:41 +08:00
Eloy Lafuente (stronk7)
9bcfd21bcd Merge branch 'MDL-65137' of https://github.com/KietChan/moodle 2019-04-17 00:49:21 +02:00
Eloy Lafuente (stronk7)
89fbc3ec9a Merge branch 'MDL-65179-master' of https://github.com/sammarshallou/moodle 2019-04-16 22:37:23 +02:00
Ryan Wyllie
69efd0337b MDL-64715 message: improve the front-end for the self-conversations 2019-04-16 12:06:28 +02:00
David Monllaó
4e5fd9e14d Merge branch 'MDL-64855_fixviews' of git://github.com/dmonllao/moodle 2019-04-16 11:14:51 +02:00
Tom Dickman
c7d625a728 MDL-64855 block_myoverview: Fix list and summary views 2019-04-16 11:13:43 +02:00
Eloy Lafuente (stronk7)
7f7b751ea2 Merge branch 'MDL-64777_delete-static' of https://github.com/dmonllao/moodle 2019-04-16 10:59:55 +02:00
David Monllaó
6fce5a13cc MDL-64777 tool_analytics: Static models can also be deleted 2019-04-16 10:46:20 +02:00
Adrian Greeve
a251ed8be7 Merge branch 'MDL-65034-master' of git://github.com/ryanwyllie/moodle 2019-04-16 13:19:15 +08:00
Ryan Wyllie
8dbe769988 MDL-65034 mod_forum: fix author for single discussion forum 2019-04-16 10:51:43 +08:00
Eloy Lafuente (stronk7)
0b9d7d93f8 MDL-65308 core: change a couple of unsafe preg_quote() cases
With PHP 7.3, the hash (#) is being escaped by preg_quote().

While normally that doesnt have much impact and normal operations
continue working perfectly... when the results of the function are
used to match against the same string... they don't match anymore.

Have found a couple of there double-uses in core and this
commit fixes them. Covered with tests.
2019-04-16 01:40:47 +02:00
Eloy Lafuente (stronk7)
f79881b8d0 Merge branch 'MDL-59298-master' of git://github.com/rezaies/moodle 2019-04-15 23:53:58 +02:00
Eloy Lafuente (stronk7)
f7e183e513 Merge branch 'MDL-64777-master-modelsrestore' of git://github.com/mudrd8mz/moodle 2019-04-15 23:37:43 +02:00
Eloy Lafuente (stronk7)
5fd5eaf766 Merge branch 'MDL-64786-master-renamemodels' of git://github.com/mudrd8mz/moodle 2019-04-15 22:53:55 +02:00
Eloy Lafuente (stronk7)
75cd6b9a08 Merge branch 'MDL-65307_master' of git://github.com/dmonllao/moodle 2019-04-15 20:43:13 +02:00
Eloy Lafuente (stronk7)
0c1944cd93 Merge branch 'MDL-60470' of https://github.com/brendanheywood/moodle 2019-04-15 20:26:17 +02:00
Sara Arjona
734b198fd3 MDL-64715 message: add support for self conversations
Added new MESSAGE_CONVERSATION_TYPE_SELF type for self-conversations
and upgraded legacy self-conversations to the new type, removing
repeated members in the message_conversation_members table.
Besides, from now, a self-conversation will be created by default for
all the existing users.

All the self-conversations have been also starred and a default message
will be displayed always to explain how to use them.
2019-04-15 20:17:54 +02:00
Brendan Heywood
bf9f255523 MDL-60470 core: New hook 'after_require_login'
This adds a hook towards the end of the require_login function.
2019-04-16 03:39:20 +10:00