Andrew Nicols
440dad627f
Merge branch 'MDL-62660-master' of git://github.com/junpataleta/moodle
2018-08-21 11:09:33 +08:00
Andrew Nicols
9adf5f0595
Merge branch 'MDL-57281-master' of https://github.com/vmdef/moodle
2018-08-21 10:49:10 +08:00
Jun Pataleta
4ecb1c6221
MDL-62660 tool_dataprivacy: Behat fix for data deletion
2018-08-21 10:27:21 +08:00
Jun Pataleta
237c85d303
MDL-62660 tool_dataprivacy: CI fixes
2018-08-21 09:28:48 +08:00
Andrew Nicols
13b4a1f4bb
Merge branch 'MDL-63131-master' of https://github.com/sammarshallou/moodle
2018-08-21 08:57:17 +08:00
sam marshall
b5311ce466
MDL-63131 Web services: Callback to allow web service overrides
2018-08-20 15:32:34 +01:00
Víctor Déniz Falcón
02fda279ed
MDL-57281 behat: deprecated step definition I navigate to node in
...
Definition step deprecated and affected tests modified.
2018-08-20 12:53:26 +01:00
Michael Hawkins
a1e1cf63fd
MDL-62660 tool_dataprivacy: Behat additions for deletion and data expiry
2018-08-20 15:31:20 +08:00
Michael Hawkins
95a844ebdc
MDL-62660 tool_dataprivacy: Add and update PHPUnit tests
...
Updated tests with latest statuses.
Added testing for request download expiry functionality and method.
Added assign_site_dpo within a parent class for unit tests.
2018-08-20 15:31:20 +08:00
Michael Hawkins
5f9a31ee79
MDL-62660 tool_dataprivacy: Add scheduled task to expire data requests
2018-08-20 15:31:20 +08:00
Michael Hawkins
693f690c18
MDL-62660 tool_dataprivacy: Add ability to expire data requests
...
Also replaced Completed status with situation specific statuses.
Also improved UX on request pages in line with expiries and the aadditional statuses.
2018-08-20 15:31:20 +08:00
Andrew Nicols
7bd269e82d
MDL-62660 tool_dataprivacy: Add method for unit tests to run adhoc tasks
2018-08-20 15:31:20 +08:00
Jake Dallimore
4638819780
Merge branch 'MDL-63097' of git://github.com/stronk7/moodle
2018-08-20 13:51:50 +08:00
Andrew Nicols
a4c596cb00
Merge branch 'MDL-63176' of https://github.com/spvickers/moodle
2018-08-20 11:15:35 +08:00
Jake Dallimore
88dc63c335
Merge branch 'MDL-57741-master' of git://github.com/cescobedo/moodle
2018-08-20 10:11:49 +08:00
Eloy Lafuente (stronk7)
a9428fab11
weekly release 3.6dev
2018-08-17 17:37:15 +02:00
Eloy Lafuente (stronk7)
beaff3f103
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2018-08-17 17:37:12 +02:00
Jake Dallimore
215ecb017a
Merge branch 'MDL-62884-master' of git://github.com/damyon/moodle
2018-08-17 16:02:05 +08:00
Damyon Wiese
a3124b15dc
MDL-62884 privacy: Additional fix for popper.js
...
For a table with action menus inside a scrollable region, we need to ensure
the table is at least big enough.
2018-08-17 15:12:05 +08:00
Stephen Vickers
1272a926d5
MDL-63176 enrol_lti: Add $COURSE to global
...
Ensure that capabilities using $COURSE can be parsed.
2018-08-16 22:41:57 +01:00
cescobedo
ea3c5ba14b
MDL-57741 enrol_lti: Add Launch URL to Published as LTI tools
2018-08-16 09:08:38 +02:00
AMOS bot
e28bc33b19
Automatically generated installer lang files
2018-08-16 00:08:08 +00:00
Jake Dallimore
71926adb0d
Merge branch 'MDL-63050-master' of git://github.com/andrewnicols/moodle
2018-08-15 10:59:37 +08:00
Andrew Nicols
6cf24801a9
Merge branch 'MDL-62600-master' of git://github.com/mickhawkins/moodle
2018-08-15 08:53:30 +08:00
AMOS bot
21b1892843
Automatically generated installer lang files
2018-08-15 00:07:31 +00:00
Luke Carrier
6b6fd4b0b7
MDL-61238 cohort: require_once all libraries
2018-08-15 00:12:38 +02:00
Eloy Lafuente (stronk7)
92af6a3998
Merge branch 'MDL-62341-master' of git://github.com/mihailges/moodle
2018-08-15 00:03:18 +02:00
Eloy Lafuente (stronk7)
326792694e
Merge branch 'MDL-58409-master_needs_clean_in_autocomplete_element' of https://github.com/dravek/moodle
2018-08-14 17:29:48 +02:00
Eloy Lafuente (stronk7)
9c1c0de78c
Merge branch 'MDL-61650-master' of git://github.com/damyon/moodle
2018-08-14 16:49:44 +02:00
David Monllao
8e6c2ce300
Merge branch 'MDL-36754-master' of git://github.com/andrewnicols/moodle
2018-08-14 10:18:55 +02:00
Andrew Nicols
2e8d476165
MDL-36754 core_files: Add back missing baseurl line
2018-08-14 15:54:12 +08:00
David Monllao
3ff9233a18
Merge branch 'MDL-36754-master' of git://github.com/andrewnicols/moodle
2018-08-14 08:49:45 +02:00
Jake Dallimore
ed9d61ef4a
Merge branch 'MDL-63031-master' of https://github.com/prg3/moodle
2018-08-14 12:11:25 +08:00
Paul Greidanus
05f6ed0034
MDL-63031 administration: Allow plugins to define trace storage
...
This will allow the use of other storage systems implemented
in plugins.
It also allows for disabling the built in DB based profiling, which
will be useful when using an external target to not waste DB storage.
2018-08-13 21:54:48 -06:00
Michael Hawkins
161a5c8ab9
MDL-62600 tool_dataprivacy: Corrected availability of PO pages to admins
2018-08-14 11:28:31 +08:00
Andrew Nicols
bc51085174
Merge branch 'MDL-62643-master' of git://github.com/damyon/moodle
2018-08-14 09:04:17 +08:00
Andrew Nicols
b426a2840f
Merge branch 'MDL-62896-master' of git://github.com/k-holland/moodle
2018-08-14 07:44:04 +08:00
Andrew Nicols
7fa3089753
MDL-36754 mod_forum: Use token for emailed pictures
2018-08-14 07:08:29 +08:00
Andrew Nicols
88d89512e4
MDL-36754 output: Support token pluginfiles in userpic
2018-08-14 07:08:29 +08:00
Andrew Nicols
883f655552
MDL-36754 output: Support token pluginfiles in group pic
2018-08-14 07:06:09 +08:00
Andrew Nicols
8af75f08e8
MDL-36754 tests: Move moodle_url tests to own file
2018-08-14 07:06:09 +08:00
Andrew Nicols
91f1f28233
MDL-36754 core_files: Support tokens when rewriting text
...
Support use of a token for access to pluginfile.php when rewriting text
content.
This is primarily intended for notifications where the user is unlikely
to be logged into Moodle when receiving the notification.
2018-08-14 06:57:32 +08:00
Andrew Nicols
4a74ab0200
MDL-36754 core_files: Add a token version of pluginfile
2018-08-14 06:57:32 +08:00
David Monllao
49a973014c
Merge branch 'MDL-62761-master' of https://github.com/jmvedrine/moodle
2018-08-13 15:29:34 +02:00
David Monllao
bf19506dfb
Merge branch 'MDL-62886-master' of https://github.com/lucaboesch/moodle
2018-08-13 14:25:26 +02:00
David Monllao
93e0b1593c
Merge branch 'MDL-59015-master' of git://github.com/mihailges/moodle
2018-08-13 12:19:13 +02:00
David Monllao
66be962523
Merge branch 'MDL-62994-master' of git://github.com/mihailges/moodle
2018-08-13 12:12:09 +02:00
Karen Holland
179a9f24db
MDL-62896 Privacy: External plugin Additional label update.
2018-08-13 08:32:21 +00:00
Jake Dallimore
e99564e51b
Merge branch 'MDL-60114_master_radio-option-choose' of https://github.com/awagner/moodle
2018-08-13 16:02:54 +08:00
Mihail Geshoski
4e829d2d75
MDL-59015 blocks: Confusing View more button in course overview block
2018-08-13 08:53:19 +08:00
