mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-09 10:22:08 +02:00
Code Issues Projects Releases Wiki Activity
91,257 Commits 36 Branches 530 Tags
Commit Graph

91257 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
49971e66f7 Merge branch 'MDL-63907-master' of git://github.com/cescobedo/moodle 2018-11-12 12:07:45 +01:00
Eloy Lafuente (stronk7)
610883c007 Merge branch 'MDL-63929-master' of git://github.com/jleyva/moodle 2018-11-12 12:02:51 +01:00
David Monllao
754ff36d1d Merge branch 'MDL-63925-master' of git://github.com/mickhawkins/moodle 2018-11-12 11:57:42 +01:00
David Monllao
f04e51cfca Merge branch 'MDL-63940-master-recaptchaurl' of git://github.com/mudrd8mz/moodle 2018-11-12 10:42:36 +01:00
David Monllao
c83676101f Merge branch 'MDL-63823-master' of git://github.com/lameze/moodle 2018-11-12 10:09:33 +01:00
David Monllao
623995e589 Merge branch 'MDL-63968-master' of git://github.com/andrewnicols/moodle 2018-11-12 10:02:17 +01:00
Damyon Wiese
eac24f2b71 Merge branch 'MDL-63945_master' of git://github.com/markn86/moodle 2018-11-12 16:36:57 +08:00
Mark Nelson
d15c1e77b0 MDL-63945 core_message: fixed discrepancy between helpers 2018-11-12 15:30:30 +08:00
Damyon Wiese
b0f45a8b8f Merge branch 'MDL-63724-master-3' of https://github.com/snake/moodle 2018-11-12 14:16:31 +08:00
Damyon Wiese
75e6661940 Merge branch 'MDL-63909_master' of git://github.com/markn86/moodle 2018-11-12 14:01:01 +08:00
Damyon Wiese
6cfba4a1c6 MDL-63864 message: Contact request fix 
The contactrequestid was removed from the api, so now we search by both
the userid from and the userid to.
 2018-11-12 13:38:33 +08:00
Andrew Nicols
6d0a43deb9 Merge branch 'MDL-63763-master' of https://github.com/nwp90/moodle 2018-11-12 10:32:32 +08:00
Andrew Nicols
e926b4d046 MDL-63968 message: Correct use of get_in_or_equal 2018-11-12 10:32:06 +08:00
Jake Dallimore
2553e9db8e MDL-63724 core_message: add send_messages_to_conversation() web service 2018-11-12 10:09:27 +08:00
Jake Dallimore
86e274d929 MDL-63724 core_message: move message redirection into helper function 2018-11-12 10:09:27 +08:00
Jake Dallimore
52f9cf205e MDL-63724 core_message: add send_message_to_conversation() to api 2018-11-12 10:09:27 +08:00
Jake Dallimore
b30f4d6d58 MDL-63724 core_message: buffering support for conv messages in manager 
We need to be able to delay calling all member processors with localised
event data if a DB transaction is taking place. This code treats a
conversation message as a single item of work to be buffered, and stores
all localised eventdata, and processorlists for later reference. When
processing the buffer, we pass off all localised eventdata items to
their respective member's processors, before firing a single event.
 2018-11-12 10:09:27 +08:00
Jake Dallimore
0eddf920be MDL-63724 core_message: add conversation support to message_send() 
Added a test confirming that processors are called for each member
and that a single event is fired.
 2018-11-12 10:09:27 +08:00
Jake Dallimore
9581bc3c00 MDL-63724 core_message: add send_message_to_conversation() to manager 2018-11-12 10:09:27 +08:00
Jake Dallimore
aa083ab95f MDL-63724 core_message: add new group_message_sent event 2018-11-12 10:09:27 +08:00
Jake Dallimore
947d32895e MDL-63724 core_message: split up event and processor code in the manager 
This was couple before, but we're going to want this to be separate for
group conversation messages, where we'll call many users' processors,
but only create a single 'group_message_sent' event.
 2018-11-12 10:09:27 +08:00
Jake Dallimore
9f82758c01 MDL-63724 core_message: fix method signature for can_contact_user() 
This method required objects, but only used their ids, so has been
changed to require only ids.
 2018-11-12 10:09:27 +08:00
Jake Dallimore
8e3bf150d9 MDL-63724 core_message: add can_send_message_to_conversation() to api 2018-11-12 10:09:27 +08:00
Damyon Wiese
080cc5b671 Merge branch 'MDL-63864_master' of git://github.com/markn86/moodle 2018-11-12 10:02:25 +08:00
Andrew Nicols
fa54c160f9 Merge branch 'MDL-63838-master' of git://github.com/vmdef/moodle 2018-11-12 09:54:59 +08:00
Simey Lameze
2d18a4a89f MDL-63823 tool_lpimportcsv: supress progress bar debugging 2018-11-12 09:53:07 +08:00
Andrew Nicols
e2a8ebddb5 Merge branch 'MDL-63850_master' of git://github.com/markn86/moodle 2018-11-12 07:53:09 +08:00
Eloy Lafuente (stronk7)
208950cff0 on-demand release 3.6dev+ 2018-11-10 12:53:31 +01:00
Eloy Lafuente (stronk7)
3b1e59e3e1 NOBUG: Fixed SVG browser compatibility 2018-11-10 12:53:29 +01:00
Eloy Lafuente (stronk7)
42155e2501 Merge branch 'MDL-63960-master' of git://github.com/andrewnicols/moodle 2018-11-10 10:27:35 +01:00
Andrew Nicols
c083d1ad1e MDL-63960 dataprivacy: Do not perform strict type checks for id 
When inherit is specified in the data registry it is stored as a
string and we cannot perform a strict comparison with it.

We should still compare strict comparison checks against null, or false,
but not for the NOTSET (0) or INHERIT values (-1).
 2018-11-10 15:34:21 +08:00
Andrew Nicols
35afa11801 Merge branch 'MDL-63919' of git://github.com/stronk7/moodle 2018-11-10 10:59:25 +08:00
Eloy Lafuente (stronk7)
d01d9e2c0e Merge branch 'MDL-63596-master' of git://github.com/andrewnicols/moodle 2018-11-10 03:49:14 +01:00
Andrew Nicols
2986a99153 MDL-63596 backup: Add missing include 2018-11-10 10:46:38 +08:00
Eloy Lafuente (stronk7)
baf3fd4177 MDL-63919 tool_dataprivacy: admin & notify fixes 
This includes the following:

1) Replace $ADMIN->id by get_admin()->id. The former doesn't exist.
2) Only change the notify parameter when it has not been specified
   at creation time (null). If specified, observe it.
3) Set the current user in tests to admin, able to create those
   requests.
 2018-11-10 02:22:12 +01:00
Eloy Lafuente (stronk7)
5c0f8dcddf Merge branch 'MDL-63596-master' of git://github.com/andrewnicols/moodle 2018-11-09 19:32:23 +01:00
Andrew Nicols
56c2b941df MDL-63919 tool_dataprivacy: Notify by default 2018-11-09 18:39:42 +08:00
Eloy Lafuente (stronk7)
8ecff96216 Merge branch 'MDL-63884-master-fix' of https://github.com/snake/moodle 2018-11-09 11:19:02 +01:00
Jake Dallimore
d76029110b MDL-63884 core_message: fix for get_conversations legacy adapter code 
This code also tries to adapt other conversation types, but it should
only support individual conversations, where we know members exist.
 2018-11-09 17:59:55 +08:00
Jake Dallimore
9cef5491fb MDL-63884 core_message: fix for groups without images 
If we don't have an image for the group, leave this extra field empty.
 2018-11-09 17:59:53 +08:00
Eloy Lafuente (stronk7)
ba999160b4 Merge branch 'MDL-62564-master-fix' of git://github.com/andrewnicols/moodle 2018-11-09 10:59:04 +01:00
Damyon Wiese
f1f7d45bc7 MDL-63596 backup: Deal with controller types 
For privacy requests, deal with all 3 controller types.
 2018-11-09 17:55:23 +08:00
Andrew Nicols
b26c5e031b MDL-62564 tool_dataprivacy: Do not delete deleted user 
This also ensures that we do not call delete_user on an already deleted
user.
 2018-11-09 17:34:47 +08:00
Juan Leyva
2979ca1175 MDL-63929 user: Support unsetting prefs in update_user_preferences WS 2018-11-09 09:28:23 +01:00
Mihail Geshoski
fc9bde4bc3 MDL-63596 core_backup: Add support for removal of context users 
This issue is part of the MDL-62560 Epic.
 2018-11-09 16:09:22 +08:00
Jun Pataleta
012fa6abc3 Merge branch 'MDL-63867-master' of git://github.com/mickhawkins/moodle 2018-11-09 15:31:28 +08:00
Michael Hawkins
95a3f78058 MDL-63867 tool_dataprivacy: Add site purpose checks to tasks 
If a site purpose is not defined, requests cannot be processed.
 2018-11-09 15:20:12 +08:00
Michael Hawkins
0646c8514b MDL-63867 tool_dataprivacy: Fix context expired/unprotected user check 
It now checks the system context has been defined, since that is
required for data privacy to be set up correctly, and the check
to be valid. This also fixes an error being thrown when checking
pending delete requests in cron.
 2018-11-09 14:19:31 +08:00
Jun Pataleta
3adcfb0518 Merge branch 'MDL-63946-master' of git://github.com/andrewnicols/moodle 2018-11-09 13:41:44 +08:00
Mark Nelson
b3ce575e63 MDL-63864 core_message: added unit tests 2018-11-09 13:28:39 +08:00