89359 Commits

Author SHA1 Message Date
Bas Brands
b1a74e40ff MDL-62586 Themes: use Boostrap media compontent for author display 2018-05-29 09:27:04 +02:00
David Monllao
6b2e04676a weekly on-sync release 3.6dev 2018-05-24 10:47:52 +02:00
David Monllao
3399860ee8 NOBUG: Fixed SVG browser compatibility 2018-05-24 10:47:51 +02:00
David Monllao
59cc07ae99 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2018-05-24 10:47:50 +02:00
Simey Lameze
1bcc54ef25 MDL-61189 editor_tinymce: save data before submitting 2018-05-23 10:48:27 +08:00
Jake Dallimore
b345895a9d Merge branch 'MDL-61932-master' of git://github.com/junpataleta/moodle 2018-05-23 10:01:08 +08:00
Jun Pataleta
d980528873 MDL-61932 mod_glossary: Fetch the correct front page section 1 ID 2018-05-22 17:15:58 +08:00
Jun Pataleta
7e603553d5 Merge branch 'wip-MDL-62239-master' of https://github.com/Beedell/moodle 2018-05-22 10:05:13 +08:00
Andrew Nicols
f94aaed80b Merge branch 'MDL-62482' of git://github.com/timhunt/moodle 2018-05-22 09:37:57 +08:00
Andrew Nicols
227d6d68a3 Merge branch 'MDL-62488_master' of https://github.com/marxjohnson/moodle 2018-05-22 09:29:47 +08:00
Andrew Nicols
f979e2d418 Merge branch 'MDL-62477' of git://github.com/stronk7/moodle 2018-05-22 09:20:06 +08:00
Jake Dallimore
6ef703d8a6 Merge branch 'MDL-61015-master' of https://github.com/lucaboesch/moodle 2018-05-22 08:14:52 +08:00
Eloy Lafuente (stronk7)
6b47d8066a Merge branch 'MDL-62500-master' of git://github.com/andrewnicols/moodle 2018-05-21 13:37:16 +02:00
John Beedell
2d55b0b736 MDL-62239 QTYPE: iOS 11.3 broke Moodle drag-drop question types 2018-05-21 11:13:09 +01:00
David Monllao
a765519a42 Merge branch 'm36_MDL-61893_Accept_Any_Node_Carbon_Version' of https://github.com/scara/moodle 2018-05-21 12:04:44 +02:00
Luca Bösch
398ed46942 MDL-61015 course: consistently display hidden sections
This commit moves the availability info on top.
2018-05-21 11:33:35 +02:00
David Monllao
30f61e4d30 Merge branch 'MDL-62516-master' of git://github.com/andrewnicols/moodle 2018-05-21 11:15:02 +02:00
Jun Pataleta
5c334275df Merge branch 'MDL-62229-master' of git://github.com/jleyva/moodle 2018-05-21 17:04:08 +08:00
Andrew Nicols
94d55c0041 Merge branch 'wip-MDL-62481-master' of git://github.com/marinaglancy/moodle 2018-05-21 15:49:41 +08:00
Jake Dallimore
ed00590ad8 Merge branch 'MDL-62440' of git://github.com/timhunt/moodle 2018-05-21 14:55:16 +08:00
Andrew Nicols
630081dd91 MDL-62516 mod_forum: Only delete files for requested user 2018-05-21 14:12:17 +08:00
Andrew Nicols
4396a8f241 Merge branch 'MDL-62386-master' of git://github.com/bmbrands/moodle 2018-05-21 09:10:50 +08:00
AMOS bot
3f2168dcb9 Automatically generated installer lang files 2018-05-21 00:06:14 +00:00
Andrew Nicols
39e14b2325 MDL-62500 tag: Update checkbox label when updating tag 2018-05-20 15:14:50 +08:00
Matteo Scaramuccia
495a5c5a73 MDL-61893 JavaScript: Bumped npm packages
Performed by removing the current 'npm-shrinkwrap.json' file:
$ rm -Rf node_modules
$ rm -f npm-shrinkwrap.json
$ npm install
$ npm shrinkwrap
2018-05-18 00:36:44 +02:00
Matteo Scaramuccia
22d032301b MDL-61893 JavaScript: Accept any node version but Carbon (LTS) 2018-05-18 00:36:43 +02:00
Mark Johnson
3bc65933cf MDL-62488 filebrowser: Stop unit tests assuming number of categories 2018-05-17 16:01:26 +01:00
Tim Hunt
27d625a863 MDL-62482 file_storage: may have many files with same content hash 2018-05-17 11:24:33 +01:00
Tim Hunt
5359c517d0 MDL-62440 participants: out-of-memory is many site-wide role assigns 2018-05-17 10:42:31 +01:00
Jun Pataleta
266eccfde6 MDL-61932 mod_glossary: Display site-level glossaries on section 1
* Glossary activities created on the front page by importing
entries are being added to section 0, but the front page only shows
activities on section 1.
2018-05-17 16:02:36 +08:00
Marina Glancy
08ef342aba MDL-62481 atto_recordrtc: add svg icons 2018-05-17 14:43:43 +08:00
Marina Glancy
3b29978c8e MDL-61015 course: consistently display hidden sections
When section is hidden but the course setting says to show hidden sections display the hidden
sections consistently with how we display the sections with access restriction.

The only difference is that we didn't previously display the summary of the hidden section
in this case, the new logic repeats this behavior
2018-05-17 08:01:24 +02:00
Eloy Lafuente (stronk7)
5798aee926 MDL-62477 backup: Bump release to 3.6 2018-05-17 01:53:43 +02:00
Eloy Lafuente (stronk7)
22744b745b weekly back-to-dev release 3.6dev 2018-05-16 19:03:03 +02:00
Eloy Lafuente (stronk7)
cf6825cc43 NOBUG: Change travis.yml back to master 2018-05-16 18:44:30 +02:00
Eloy Lafuente (stronk7)
46574904af Moodle release 3.5 v3.5.0 2018-05-16 18:44:30 +02:00
Eloy Lafuente (stronk7)
4c8005a0ff NOBUG: Change travis.yml to MOODLE_35_STABLE 2018-05-16 18:44:30 +02:00
Eloy Lafuente (stronk7)
57cc5dc750 Merge branch 'MDL-62472-master' of git://github.com/bmbrands/moodle 2018-05-16 18:29:46 +02:00
Marina Glancy
897a492729 MDL-62469 qtype_calculated: check remaining placeholders, see MDL-62275 2018-05-16 17:20:38 +02:00
Bas Brands
a6c45af354 MDL-62472 Theme boost: update upgrade.txt for boost changes 2018-05-16 12:57:38 +02:00
David Monllao
36960958ad Merge branch 'MDL-62456_master' of git://github.com/markn86/moodle 2018-05-16 08:56:33 +02:00
Andrew Nicols
798f0f1da9 Merge branch 'wip-MDL-62147-master-4' of git://github.com/marinaglancy/moodle 2018-05-16 14:27:19 +08:00
Jun Pataleta
6c32ea4631 Merge branch 'MDL-62463-master' of git://github.com/andrewnicols/moodle 2018-05-16 14:22:05 +08:00
Frédéric Massart
554e6a6562 MDL-62147 core_grades: Report contexts and data related to scales 2018-05-16 13:57:26 +08:00
Marina Glancy
372ea5502c MDL-62147 core_grades: Declare metadata of scales and import tables 2018-05-16 13:57:25 +08:00
Marina Glancy
14f7296436 MDL-62147 portfolio: add missing tables to privacy provider 2018-05-16 13:57:22 +08:00
Marina Glancy
004fd4259e MDL-62147 privacy: unittest ensures that all tables covered 2018-05-16 13:57:19 +08:00
Andrew Nicols
39da8c1a35 MDL-62463 mod_glossary: Fix SQL query
The query was doing:
WHERE c.id ... AND ... OR ... OR ...

Which equates to:
WHERE (c.id ... AND ...) OR ... OR ...

Adding parens to:
WHERE (c.id ... AND (... OR ... OR ...))
2018-05-16 13:51:32 +08:00
Marina Glancy
d1620c57f9 MDL-62147 privacy: corrections to tables, temporary tables 2018-05-16 12:57:19 +08:00
Jake Dallimore
dc69734963 Merge branch 'MDL-62134-master' of git://github.com/andrewnicols/moodle 2018-05-16 12:39:27 +08:00