99396 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
6ef4e66f03 weekly release 4.0dev 2020-11-12 22:11:32 +01:00
Eloy Lafuente (stronk7)
6baec70346 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install into master 2020-11-12 22:11:29 +01:00
Adrian Greeve
1691176799 Merge branch 'MDL-69453-master' of git://github.com/bmbrands/moodle 2020-11-12 11:53:49 +08:00
Adrian Greeve
5d2617a462 Merge branch 'master-MDL-70117' of https://github.com/golenkovm/moodle 2020-11-12 11:48:57 +08:00
Andrew Nicols
ea77b43b4e Merge branch 'MDL-70067-master_theme_classic' of https://github.com/alexmorrisnz/moodle 2020-11-12 10:26:30 +08:00
Eloy Lafuente (stronk7)
7378fac031 Merge branch 'MDL-65941-master' of https://github.com/snake/moodle into master 2020-11-12 00:18:26 +01:00
Eloy Lafuente (stronk7)
a765b5a170 Merge branch 'MDL-70023-master' of git://github.com/marinaglancy/moodle into master 2020-11-11 23:57:15 +01:00
Alex Morris
fa99232970 MDL-70067 report_insights: Replace BS3 column naming
Bootstrap 4 removed col-xs- and replaced it with col-
2020-11-12 08:56:19 +13:00
Sara Arjona
c33f967019 Merge branch 'MDL-70063-master-1' of git://github.com/mihailges/moodle 2020-11-11 16:32:08 +01:00
Jun Pataleta
f0b91724fe Merge branch 'MDL-70072-master' of git://github.com/rezaies/moodle 2020-11-11 22:08:07 +08:00
Mihail Geshoski
ce76a3e89b MDL-70063 block_tag_youtube: Add behat tests 2020-11-11 21:24:44 +08:00
Mihail Geshoski
87b9e72f4e MDL-70063 block_tag_youtube: Fix category config in existing instances
Upgrade step that fixes the category configuration of existing
tag_youtube block instances.
2020-11-11 21:24:44 +08:00
Mihail Geshoski
ca5850e341 MDL-70063 block_tag_youtube: Update category config to use category ID
In YouTube Data API v3, the API call to fetch the videos related to a
certain category expects the category ID to be passed to the
videoCategoryId parameter, instead of the category name. Therefore, the
category config should store the category ID.
2020-11-11 21:10:12 +08:00
Bas Brands
4d181cafa5 MDL-69453 core_form: improve form UI icons and alignment 2020-11-11 13:46:00 +01:00
Sara Arjona
84a8a2270f Merge branch 'MDL-70141-master' of https://github.com/sammarshallou/moodle 2020-11-11 08:39:14 +01:00
Sara Arjona
e7ea4ae450 Merge branch 'MDL-69823-master' of git://github.com/jleyva/moodle 2020-11-11 07:41:19 +01:00
Michael Aherne
2385ae7ee2 MDL-65941 cache: Prevent cache config failure on redis problems. 2020-11-11 14:33:22 +08:00
Andrew Nicols
c3086f74fb Merge branch 'MDL-70126' of git://github.com/paulholden/moodle 2020-11-11 10:20:00 +08:00
Andrew Nicols
8d8443411d Merge branch 'MDL-70065' of https://github.com/timhunt/moodle 2020-11-11 09:49:26 +08:00
AMOS bot
987023631c Automatically generated installer lang files 2020-11-11 00:07:43 +00:00
Mikhail Golenkov
8d025b449e MDL-70117 dataformat_pdf: Fix content overflow when headers are involved 2020-11-11 10:49:58 +11:00
Juan Leyva
440aaccb57 MDL-69823 qtype: Support core question types 2020-11-10 19:16:24 +01:00
Juan Leyva
caddb8f175 MDL-69823 mod_quiz: Return question options via WS 2020-11-10 19:16:24 +01:00
Sara Arjona
16af4ae4db Merge branch 'MDL-70106-icon-cache' of https://github.com/Peterburnett/moodle 2020-11-10 16:53:27 +01:00
Jun Pataleta
84b7d23334 Merge branch 'MDL-69930-master' of https://github.com/HuongNV13/moodle
# Conflicts:
#	question/type/ddimageortext/amd/build/question.min.js
#	question/type/ddimageortext/amd/build/question.min.js.map
#	question/type/ddimageortext/amd/src/question.js
2020-11-10 14:11:54 +08:00
Jun Pataleta
62fcc8d22a Merge branch 'MDL-68349-master' of git://github.com/marinaglancy/moodle 2020-11-10 10:14:57 +08:00
Jake Dallimore
5365057493 Merge branch 'MDL-69841-master' of https://github.com/HuongNV13/moodle 2020-11-10 09:32:34 +08:00
Víctor Déniz
27ef489443 Merge branch 'MDL-69955-master' of https://github.com/HuongNV13/moodle 2020-11-09 21:46:53 +00:00
Paul Holden
c1c4ae95f2 MDL-70126 tag: correct thrown exception class name. 2020-11-09 19:43:47 +00:00
AMOS bot
e27bb27abd Automatically generated installer lang files 2020-11-09 00:07:51 +00:00
AMOS bot
409a3d61de Automatically generated installer lang files 2020-11-07 00:07:44 +00:00
Eloy Lafuente (stronk7)
d330035f11 weekly release 4.0dev 2020-11-06 22:55:37 +01:00
Eloy Lafuente (stronk7)
7db6bb2343 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install into master 2020-11-06 22:55:34 +01:00
Víctor Déniz
4aa279956f Merge branch 'MDL-70137-master-2' of git://github.com/andrewnicols/moodle 2020-11-06 19:15:44 +00:00
Andrew Nicols
b8bf6f9c42 MDL-70137 cache: Write config to temp file and move into place 2020-11-06 19:15:43 +00:00
Andrew Nicols
db8377b53e MDL-70137 cache: Use sensible default when reading MUC config
When we read the MUC configuration, a file which exists but is empty
will not error, but will cause all configuration to be empty.

We already perform an {{is_array()}} check on the {{$configuration}}
variable, but the default value for {{$configuration}} is an empty
array. In the case where the file exists, but is empty, no errors occur
when the file is loaded, and the initial {{$configuration}} value is
not overwritten, leading to the file being replaced with an empty copy.
2020-11-06 19:15:34 +00:00
Eloy Lafuente (stronk7)
114102d37d Merge branch 'MDL-70143-master' of git://github.com/marinaglancy/moodle into master 2020-11-06 19:52:03 +01:00
Marina Glancy
c2aa5a29f1 MDL-70143 tool_uploaduser: fix wrong cache reference 2020-11-06 19:31:25 +01:00
Eloy Lafuente (stronk7)
1c3871e25a Merge branch 'MDL-70139-master' of git://github.com/sarjona/moodle into master 2020-11-06 19:27:10 +01:00
sam marshall
26231f17e6 MDL-70141 core_block: Web service set $PAGE url to avoid warnings 2020-11-06 17:37:11 +00:00
Sara Arjona
e85c7179b2 MDL-70139 core_badges: fix invalid request when sending to backpack
Having mixed $data in badge exporters is causing some issues.
As all these exporters are using $data as an object, $data can be
converted to object in the constructor, to avoid errors and get
the expected behaviour always.
2020-11-06 16:05:44 +01:00
Shamim Rezaie
f0f45c01b1 MDL-70072 core: Fix always displaying date in Gregorian 2020-11-06 19:21:17 +11:00
Jun Pataleta
48e4dbea7c Merge branch 'MDL-70130-master' of git://github.com/andrewnicols/moodle 2020-11-06 11:28:02 +08:00
Andrew Nicols
c42c08793b MDL-70130 core: Compare realpaths for file attachment checks
Rather than using the provided path, the `realpath` must be used to
ensure that the use of symlinks in paths is normalised.
2020-11-06 10:54:09 +08:00
Andrew Nicols
4f22fad9ac MDL-70130 core: Simplify attachment handling in email_to_suer 2020-11-06 10:54:09 +08:00
Marina Glancy
e30716a16e MDL-70130 core: allow to attach files from localrequestdir to emails
Co-authored-by: Paul Holden <paulh@moodle.com>
2020-11-06 10:02:04 +08:00
Marina Glancy
8a9a4ee4f3 MDL-70131 cli: only allow to negate existing keys 2020-11-06 09:30:08 +08:00
Andrew Nicols
6d138e3675 Merge branch 'MDL-70120-assign-stamp-expires' of https://github.com/brendanheywood/moodle 2020-11-06 09:04:06 +08:00
AMOS bot
aa403760a0 Automatically generated installer lang files 2020-11-06 00:09:51 +00:00
Eloy Lafuente (stronk7)
ea32d651e9 weekly release 4.0dev 2020-11-05 12:15:57 +01:00