mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-11 03:12:17 +02:00
Code Issues Projects Releases Wiki Activity
91,232 Commits 36 Branches 530 Tags
Commit Graph

91232 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Mark Nelson
accd64827d MDL-63864 core_message: can now specify limit for contact requests 2018-11-09 13:28:38 +08:00
Andrew Nicols
9c89103a63 MDL-63946 plagirism: Filename typo fix 2018-11-09 13:25:33 +08:00
Mark Nelson
daa33803cd MDL-63864 core_message: get_contact_requests now uses helper 2018-11-09 12:12:17 +08:00
Jun Pataleta
a954485ef5 Merge branch 'MDL-63830-master' of git://github.com/bmbrands/moodle 2018-11-09 12:07:05 +08:00
Jun Pataleta
1d2adca39b Merge branch 'MDL-63924-master' of git://github.com/andrewnicols/moodle 2018-11-09 11:57:38 +08:00
Jun Pataleta
66e83fc0cc Merge branch 'MDL-63942-master' of git://github.com/andrewnicols/moodle 2018-11-09 11:44:02 +08:00
Jun Pataleta
2acbd44883 Merge branch 'MDL-63897-master' of git://github.com/andrewnicols/moodle 2018-11-09 11:30:28 +08:00
Andrew Nicols
8bb3c0d0c5 fixup! MDL-63897 dataprivacy: Kill the preprocess stage 2018-11-09 11:26:21 +08:00
Andrew Nicols
03acfa408a MDL-63897 tool_dataprivacy: Send notifications for new requests 2018-11-09 11:25:57 +08:00
Andrew Nicols
b838d85cbc MDL-63897 dataprivacy: Kill the preprocess stage 2018-11-09 11:08:07 +08:00
Damyon Wiese
3dc6208961 Merge branch 'MDL-62415-master' of git://github.com/peterRd/moodle 2018-11-09 10:54:35 +08:00
Andrew Nicols
b627565e9b Merge branch 'MDL-63919-master' of git://github.com/mihailges/moodle 2018-11-09 10:51:48 +08:00
Jun Pataleta
120edbe65f Merge branch 'MDL-62589-master' of git://github.com/andrewnicols/moodle 2018-11-09 10:36:52 +08:00
Damyon Wiese
ba3b0cc6ac Merge branch 'wip-MDL-63894-master' of https://github.com/kwiliarty/moodle 2018-11-09 09:48:39 +08:00
Andrew Nicols
a10b512021 MDL-63942 dataprivacy: Disable deleted user task by default 2018-11-09 09:29:13 +08:00
Peter
29cfe7a527 MDL-62415 repo_filepicker: Display search results in tree view 
Disable overriding call to list all files in tree view and show search results instead
 2018-11-09 09:28:28 +08:00
Damyon Wiese
d3fdd7442b Merge branch 'MDL-63671-master-2' of git://github.com/mihailges/moodle 2018-11-09 09:12:49 +08:00
Jun Pataleta
3bc9a0b2e2 Merge branch 'MDL-63836-master' of git://github.com/damyon/moodle 2018-11-09 00:21:19 +08:00
Eloy Lafuente (stronk7)
3aa0cfe33e Merge branch 'MDL-62564-integration-master-1' of git://github.com/mihailges/moodle 2018-11-08 16:38:38 +01:00
Víctor Déniz Falcón
fe2e696ed7 MDL-63838 block_recentlyaccesseditems: add placeholder during loading 2018-11-08 14:12:40 +00:00
Andrew Nicols
c96cd71102 MDL-63924 privacy: Add shared user providers to subsytsems 2018-11-08 21:26:18 +08:00
Mark Nelson
4461288dfa MDL-63909 core_message: undeprecated still used functions by old UI 
A note has been made to remove these and other functions once we
remove the old UI.
 2018-11-08 18:43:17 +08:00