86618 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
00e557a15d MDL-36580 backup: General support for decrypted contents in restore
- Uses site generated (on backup) key.
- Can be applied potentially everywhere in the restore process.
- Covered with unit tests.
- Authentication / integrity aware so can be used between any 2 servers
  (just requires matching key).
2017-10-19 10:11:47 +02:00
Eloy Lafuente (stronk7)
4a7afd2bb9 MDL-36580 backup: Use the encrypted_final_element for lti "secrets" 2017-10-19 10:11:47 +02:00
Eloy Lafuente (stronk7)
872e957415 MDL-36580 backup: General support for encrypted contents in backups
- Built using standard backup custom fields.
- Can be applied potentially everywhere.
- Automatically addded 'encrypted' attribute.
- Defaults to site generated key.
- Enforces key robutness / provides authentication (hmac integrity)
- Covered with unit tests.
2017-10-19 10:11:39 +02:00
Eloy Lafuente (stronk7)
9644c0e87a on-demand release 3.4dev+ 2017-10-19 00:11:40 +02:00
Eloy Lafuente (stronk7)
d56fa02487 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-10-19 00:11:39 +02:00
David Mudrák
91f015171f MDL-46269 tool_httpsreplace: Fix incorrect sorting 2017-10-18 19:46:26 +02:00
Jake Dallimore
bc22db02fb Merge branch 'MDL-57455_master-fix' of https://github.com/markn86/moodle 2017-10-18 16:36:10 +08:00
Mark Nelson
3dfd48ba9c MDL-57455 mod_data: moved export tag checkbox and set default
Also capitalised string 'tags'.

AMOS BEGIN
 CPY [tags,core],[tags,mod_data]
AMOS END
2017-10-18 16:03:17 +08:00
Andrew Nicols
ffbe92bffb Merge branch 'MDL-59988_master-fix' of git://github.com/dmonllao/moodle 2017-10-18 14:16:12 +08:00
David Monllao
0af2421acd MDL-59988 analytics: Reset trained status on clear 2017-10-18 07:02:23 +02:00
Andrew Nicols
f150071901 Merge branch 'MDL-60022_master' of git://github.com/dmonllao/moodle 2017-10-18 12:36:00 +08:00
Andrew Nicols
a1a39eda7d Merge branch 'MDL-59987_master-fix' of git://github.com/dmonllao/moodle 2017-10-18 11:47:45 +08:00
David Monllao
70dc5e0ab7 MDL-59987 analytics: Language string refinements
All credit goes to Helen Foster.
2017-10-18 05:37:07 +02:00
David Monllao
b1a9a6a19a Merge branch 'wip-MDL-60281-master' of git://github.com/marinaglancy/moodle 2017-10-17 09:45:44 +02:00
David Monllao
6bc6e460cd Merge branch 'wip-MDL-60285-master' of git://github.com/abgreeve/moodle 2017-10-17 09:42:25 +02:00
David Monllao
8816022df7 MDL-60022 analytics: Clear model predictions in UI 2017-10-17 09:10:08 +02:00
Jake Dallimore
0d3bdbe4af Merge branch 'wip-MDL-46269-master' of git://github.com/marinaglancy/moodle 2017-10-17 14:27:31 +08:00
Damyon Wiese
b35b588f00 Merge branch 'MDL-60058-int-fix-1' of github.com:ryanwyllie/moodle 2017-10-17 12:04:23 +08:00
Andrew Nicols
0b53be9056 Merge branch 'MDL-59987_master' of git://github.com/dmonllao/moodle 2017-10-17 12:00:51 +08:00
Jun Pataleta
ae8353a0ba Merge branch 'MDL-60063-master-2' of git://github.com/ryanwyllie/moodle 2017-10-17 11:56:53 +08:00
Ryan Wyllie
83d4635d99 MDL-60063 feedback: add drag and drop of open close events 2017-10-17 03:54:24 +00:00
Ryan Wyllie
f2c3818b39 MDL-60063 feedback: show feedback events on calendar for teacher 2017-10-17 03:54:23 +00:00
Ryan Wyllie
dbe537fb50 MDL-60058 assign: add missing locallib require_once calls 2017-10-17 03:04:47 +00:00
Jake Dallimore
21bb56fd96 Merge branch 'MDL-59254-master' of git://github.com/jleyva/moodle 2017-10-17 10:33:41 +08:00
Adrian Greeve
c32220b750 MDL-60285 lib: Update to Moodle changes to loglevel. 2017-10-17 10:22:00 +08:00
Adrian Greeve
07cf908e6c MDL-60285 lib: Update loglevel to 1.5.1 2017-10-17 10:21:05 +08:00
Jake Dallimore
f66ab6e4f7 Merge branch 'MDL-58713-master-fix' of git://github.com/junpataleta/moodle 2017-10-17 09:50:49 +08:00
Jun Pataleta
52f6f4879a MDL-58713 phpunit: Add core_filter test suite 2017-10-17 09:20:31 +08:00
Jun Pataleta
4f53f3f571 Merge branch 'MDL-58713-master' of git://github.com/jleyva/moodle 2017-10-17 09:03:08 +08:00
Eloy Lafuente (stronk7)
a9f816744b Merge branch 'MDL-59984-master' of git://github.com/junpataleta/moodle 2017-10-17 00:37:47 +02:00
Eloy Lafuente (stronk7)
d355cb54ab Merge branch 'MDL-60365-master' of git://github.com/jleyva/moodle 2017-10-17 00:23:38 +02:00
Eloy Lafuente (stronk7)
b86f988bcb Merge branch 'MDL-60171' of https://github.com/cbluesprl/moodle 2017-10-17 00:13:25 +02:00
Eloy Lafuente (stronk7)
39dce3073f Merge branch 'MDL-60320' of git://github.com/aolley/moodle 2017-10-17 00:05:54 +02:00
David Monllao
7152d2ff7a Merge branch 'MDL-60176-master' of git://github.com/andrewnicols/moodle 2017-10-16 20:02:03 +02:00
David Monllao
75820fb3ec Merge branch 'wip-MDL-60284-master' of git://github.com/abgreeve/moodle 2017-10-16 19:41:36 +02:00
David Monllao
23e5b74954 Merge branch 'MDL-57455' of https://github.com/stronk7/moodle 2017-10-16 19:33:37 +02:00
Eloy Lafuente (stronk7)
76feb5ac9b MDL-57455 mod_data: table aliases cannot use AS for crossdb 2017-10-16 19:16:17 +02:00
David Monllao
7f1f78d23e Merge branch 'MDL-60373-master' of git://github.com/andrewnicols/moodle 2017-10-16 18:28:47 +02:00
David Monllao
5d5ebedf56 Merge branch 'MDL-60374-master' of git://github.com/andrewnicols/moodle 2017-10-16 18:26:55 +02:00
David Monllao
2350745d82 Merge branch 'wip-MDL-60280-master' of git://github.com/marinaglancy/moodle 2017-10-16 13:46:19 +02:00
David Monllao
dde2ba7634 Merge branch 'wip-MDL-60237-master' of git://github.com/marinaglancy/moodle 2017-10-16 12:37:55 +02:00
Juan Leyva
66ef16d364 MDL-58713 filters: New WS core_filters_get_available_in_context 2017-10-16 11:16:20 +02:00
Marina Glancy
84a9f58b67 MDL-46269 tool_httpsreplace: minor fixes
- don't call curl() from unittests
- make sure we don't replace links to http:// urls when the embedded contents from the same domain is present
- convert only text or long varchar columns
- improve searching performance, use case-insensitive regex/like instead of LOWER
- add unittests for the above and also for international domains
2017-10-16 16:53:49 +08:00
Marina Glancy
109fbd5a15 MDL-46269 dml: Add casesensitive argument to sql_regex() 2017-10-16 16:53:46 +08:00
Juan Leyva
dc78f150fa MDL-58713 filters: Support auto-loading in the filters component 2017-10-16 10:25:17 +02:00
John Okely
16d5ec55c9 MDL-46269 tool_httpsreplace: Combine CLI scripts 2017-10-16 16:11:15 +08:00
John Okely
55b1d231ed MDL-46269 tool_httpsreplace: Add multiple steps 2017-10-16 16:11:15 +08:00
John Okely
4b86dd7ba6 MDL-46269 tool_httpsreplace: Make param search case insensitive 2017-10-16 16:11:15 +08:00
John Okely
6163651e76 MDL-46269 tool_httpsreplace: Support DBs with no regex (oracle & mssql) 2017-10-16 16:11:15 +08:00
John Okely
c74748c6bd MDL-46269 tool_httpsreplace: Add more info and warnings about the tool 2017-10-16 16:11:15 +08:00