Commit graph

90379 commits

Author SHA1 Message Date
David Monllao
bf19506dfb Merge branch 'MDL-62886-master' of https://github.com/lucaboesch/moodle 2018-08-13 14:25:26 +02:00
Bas Brands
4f9d62835a MDL-62347 course: pagination phpunit updates 2018-08-13 13:45:33 +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
Bas Brands
f3df9f9f62 MDL-62347 course: move boost pagination renderer in core 2018-08-13 11:58:25 +02:00
Bas Brands
c8d5001f9a MDL-62347 course: use standard pagination renderer 2018-08-13 11:58:25 +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
Mihail Geshoski
be38df119d MDL-62341 privacy: Add behat test 2018-08-13 07:52:09 +08:00
Mihail Geshoski
e55e9df388 MDL-62341 privacy: Add link to previous page in viewall policies page 2018-08-13 07:52:09 +08:00
Jean-Michel Vedrine
a4ffdbf3f0 MDL-62761 lesson: wrong deadlines on index with overrides 2018-08-12 07:44:41 +02:00
Andreas Wagner
288cbbf2d5 MDL-60114 mod_data: adding db activity lost radio field choose option 2018-08-11 07:41:40 +02:00
Luca Bösch
fba3c3be8e MDL-62886 boost: radio form element required icon 2018-08-10 17:11:28 +02:00
Eloy Lafuente (stronk7)
6e445671c1 weekly release 3.6dev 2018-08-10 13:21:51 +02:00
Eloy Lafuente (stronk7)
cd69396ab4 NOBUG: Fixed SVG browser compatibility 2018-08-10 13:21:49 +02:00
Andrew Nicols
89db4cc26e Merge branch 'MDL-62619' of git://github.com/stronk7/moodle 2018-08-10 08:43:43 +08:00
Eloy Lafuente (stronk7)
2bf974e7ef MDL-63097 phpunit: decouple user lastping and session start in tests
Previously the test was assuming that the user last ping, when
accessing to a chat should match the first (enter) system message
sent to the chat. And that's ok 99% of times but, if seconds advance
between the creation of the chat_users record and the chat_messages
one, then they don't match.

So now, the assumption is not used anymore and the expectation
is the timestamp of that first (enter) system message, explicitly.
2018-08-10 02:32:37 +02:00
Eloy Lafuente (stronk7)
c9840c0144 MDL-62619 privacy: Prevent action when boolean queries are involved
Before the patch, queries like:

SELECT 1 FROM dual UNION SELECT 2 FROM dual

were failing badly, with everything but the first numeric element
being ignored by the optimization.

So, being conservative, now we reduce the query being analysed,
ignoring any subquery, inline view (anything within parenthesis
in general) and, in the remaining query, if a boolean query (UNION,
MINUS, INTERSECT...) is found, we don't apply any optimization.
2018-08-09 16:05:55 +02:00
Eloy Lafuente (stronk7)
b76d8da4a6 Merge branch 'MDL-62581-master' of git://github.com/damyon/moodle 2018-08-09 00:09:12 +02:00
Jun Pataleta
2454ddb6ef Merge branch 'MDL-45170-master' of git://github.com/junpataleta/moodle 2018-08-08 16:27:55 +08:00
Jun Pataleta
c353ad20c3 MDL-45170 core: Integration review fixes
* Pass $forcehttps parameter to call extract_draft_file_urls_from_text()
 call in \core_weblib_testcase::test_extract_draft_file_urls_from_text()
* Style fixes
2018-08-08 16:17:32 +08:00
Charles Fulton
7d7d3b1731 MDL-45170 files: check other draftfile areas when processing 2018-08-08 16:15:23 +08:00
Andrew Nicols
f89f6cf04e Merge branch 'MDL-62899-search-icons-master' of https://github.com/dmitriim/moodle 2018-08-08 13:17:34 +08:00
Andrew Nicols
0c759ba614 Merge branch 'MDL-56335-master' of git://github.com/mihailges/moodle 2018-08-08 13:14:00 +08:00
Andrew Nicols
1718a59ee2 Merge branch 'MDL-62993_master' of git://github.com/markn86/moodle 2018-08-08 13:10:41 +08:00
Andrew Nicols
03655bb050 Merge branch 'MDL-50225_master' of git://github.com/markn86/moodle 2018-08-08 08:14:55 +08:00
Eloy Lafuente (stronk7)
bc7ee099ae Merge branch 'MDL-62619-master-privacycontexts' of git://github.com/mudrd8mz/moodle 2018-08-08 01:02:16 +02:00
Eloy Lafuente (stronk7)
6760a7e3e9 Merge branch 'MDL-43334-master' of git://github.com/damyon/moodle 2018-08-08 00:11:16 +02:00
Eloy Lafuente (stronk7)
43ae41a100 Merge branch 'MDL-50325_inconsistent_check_missing_module' of http://github.com/enovation/moodle 2018-08-08 00:06:09 +02:00
Eloy Lafuente (stronk7)
ff4bab999b Merge branch 'MDL-61839-master' of git://github.com/mihailges/moodle 2018-08-07 23:52:08 +02:00
Eloy Lafuente (stronk7)
521ebb76b0 Merge branch 'MDL-61870-master' of git://github.com/damyon/moodle 2018-08-07 23:48:31 +02:00
Eloy Lafuente (stronk7)
54635fdee8 Merge branch 'MDL-62750_master' of https://github.com/aanabit/moodle 2018-08-07 17:10:14 +02:00
Eloy Lafuente (stronk7)
937a608d71 Merge branch 'MDL-63026_master' of git://github.com/dmonllao/moodle 2018-08-07 15:59:51 +02:00
Eloy Lafuente (stronk7)
c8bea6ae57 Merge branch 'MDL-53297-master' of git://github.com/cescobedo/moodle 2018-08-07 15:57:00 +02:00
Eloy Lafuente (stronk7)
925d1dc60e Merge branch 'MDL-62065-master' of git://github.com/cescobedo/moodle 2018-08-07 15:51:34 +02:00
David Matamoros
2ee47aeca5 MDL-55744 EDITOR_ATTO: Now atto does not autosave for not loggedin user 2018-08-07 15:29:53 +02:00
David Matamoros
18e2f40377 MDL-58409 core_form: needs clean in autocomplete element 2018-08-07 10:59:34 +02:00
Dmitrii Metelkin
66f145efd1 MDL-62899 search: add document icons 2018-08-07 17:40:57 +10:00
Andrew Nicols
6acae5165c Merge branch 'MDL-62975_master' of git://github.com/markn86/moodle 2018-08-07 14:38:00 +08:00
Andrew Nicols
dcb2d4bfcf Merge branch 'MDL-62798-master' of git://github.com/mihailges/moodle 2018-08-07 13:07:31 +08:00
Andrew Nicols
4af25b000f Merge branch 'MDL-54741-master' of git://github.com/mihailges/moodle 2018-08-07 12:19:44 +08:00
Andrew Nicols
7b4dbb05e3 Merge branch 'MDL-55449-master' of git://github.com/abgreeve/moodle 2018-08-07 11:44:38 +08:00
Adrian Greeve
cc4952e997 MDL-55449 messages: Remove support for stdClass messages.
This also makes message_sent::create_from_ids() $courseid
parameter required.
2018-08-07 11:04:22 +08:00
Andrew Nicols
19d5c416e0 Merge branch 'MDL-63012-master' of https://github.com/jobyh/moodle 2018-08-07 09:32:55 +08:00
Andrew Nicols
2a8830379f Merge branch 'wip-MDL-61424-master' of git://github.com/marinaglancy/moodle 2018-08-07 08:18:58 +08:00
Andrew Nicols
89763f5226 Merge branch 'MDL-62945-master' of https://github.com/HuongNV13/moodle 2018-08-07 08:08:18 +08:00
Eloy Lafuente (stronk7)
90bdc5be4b Merge branch 'MDL-62237-master' of https://github.com/lucaboesch/moodle 2018-08-06 14:22:21 +02:00
Amaia Anabitarte
23c2316697 MDL-62750 lang: Trim langlist setting values 2018-08-06 09:38:14 +01:00
Andrew Nicols
75f23dc80f MDL-61515 theme: Pre-compile boost 2018-08-06 15:21:11 +08:00