Commit graph

8529 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
d66512d213 Merge branch 'MDL-69095-master' of git://github.com/jleyva/moodle into master 2020-08-19 00:19:43 +02:00
Eloy Lafuente (stronk7)
089a3ac4a1 Merge branch 'MDL-68928' of https://github.com/Chocolate-lightning/moodle into master 2020-08-18 19:01:52 +02:00
Victor Deniz Falcon
63364b9877 Merge branch 'MDL-69477' of https://github.com/stronk7/moodle 2020-08-18 13:03:40 +01:00
Eloy Lafuente (stronk7)
fbb0767536 MDL-69475 versions: bump all versions and requires in master
version = 2021052500 release version
requires= 2021052500 same than version

Why 20210525? (25th May 2021) ?

Because master is going to be Moodle 4.0, to be released
on November 2021. And, until then, we are going to have
a couple of "intermediate" releases:

- Moodle 3.10 to be released 9th November 2020. (2020110900)

  This version will be using versions from today to 2020110900
  (once it's released the YYYYMMDD part stops advancing).

- Moodle 3.11 to be released 10th May 2021. (2021051000)

  This version will be using versions from 3.10 release to 2021051000
  (once it's released the YYYYMMDD part stops advancing).

That means that all versions from today to 2021051000 are going
to be used by those 2 "intermediate" releases (3.10 and 3.11).

And we cannot use them in master, because it's forbidden to have
any overlapping of versions between branches (or different upgrade
paths will fail).

So, get that 2021051000, let's add it a couple of weeks to cover
the on-sync period (or a 2 weeks delay max!) and, the first version
that master can "own" in exclusive (without any overlap) is, exactly,
25th May 2021, hence our 20210525.
2020-08-18 00:47:15 +02:00
Bas Brands
4394f9e358 MDL-67735 theme_boost: remove bs2 and bs4alpha compatibility css 2020-08-17 08:16:42 +00:00
Eloy Lafuente (stronk7)
e45ecaa0cc MDL-69477 install: Ensure CFG variables are set before using them
On installation (or also phpunit/behat unit) some CFG variables
were being used (on setting validation) before being set.

So this commit just verifies they are set before using them. Note that,
strictly speaking, only one of them ($CFG->searchenginequeryonly)
required the extra check, but I think it's better to apply it to all
them, as a reference and in case validations are run in any other order.
2020-08-14 17:48:57 +02:00
Andrew Nicols
a059ec19b9 Merge branch 'MDL-68666-master' of git://github.com/bmbrands/moodle 2020-08-13 15:20:03 +08:00
Bas Brands
9e8cfc0235 MDL-68666 core_pix: add missing fallback icons 2020-08-13 08:47:56 +02:00
Andrew Nicols
78193d34b4 Merge branch 'MDL-69265-email-headers' of https://github.com/brendanheywood/moodle 2020-08-13 07:28:27 +08:00
Eloy Lafuente (stronk7)
d54d9110ce MDL-67415 environment: change requirements
- mysql requirement up to 5.7
- postgres requirement up to 9.6
2020-08-13 01:22:44 +02:00
Eloy Lafuente (stronk7)
9c9fe8741e MDL-67415 environment: 3.10 base information
This is a direct copy of the 3.9 branch to have
changes under control easier for next commits.
2020-08-13 01:20:41 +02:00
Eloy Lafuente (stronk7)
8e29cce41c Merge branch 'MDL-68558-master-plugindepscheckdeadend' of git://github.com/mudrd8mz/moodle into master 2020-08-13 00:40:10 +02:00
Brendan Heywood
0f89884980 MDL-69265 email: Add admin setting for email headers 2020-08-12 20:51:10 +10:00
Eloy Lafuente (stronk7)
62a7d2b5de Merge branch 'MDL-68729-master' of https://github.com/sammarshallou/moodle into master 2020-08-12 01:28:51 +02:00
Mathew May
b4121975b1 MDL-68928 core_course: Select activity chooser footer 2020-08-11 09:25:50 +08:00
Adrian Greeve
b4f6fe06fd Merge branch 'MDL-69204' of https://github.com/paulholden/moodle 2020-08-11 08:42:02 +08:00
Farhan Karmali
470f94dc46 MDL-67419 admin: New admin setting for lang during user creation 2020-08-10 18:34:19 +05:30
sam marshall
679e8d8b66 MDL-68729 Search: Allow query on one server while indexing another
To support transitions from one search engine to a different one, or
to a different installation of the same kind, this feature allows for
queries to use a different search engine from indexing. So you can
reindex (and do all other search operation) on one server, while
user queries are unaffected on a different server.

This feature supports changing between search engine types, and also
between two Solr installations.
2020-08-06 12:12:01 +01:00
Eloy Lafuente (stronk7)
d55f2b787c Merge branch 'MDL-67687-master-2' of git://github.com/andrewnicols/moodle into master 2020-08-06 00:59:15 +02:00
Andrew Nicols
41eaa09bbe MDL-67687 behat: Make axe tests optional 2020-08-04 18:56:57 +08:00
Eloy Lafuente (stronk7)
390512db4f Merge branch 'MDL-62980' of https://github.com/paulholden/moodle into master 2020-08-03 12:37:46 +02:00
Jun Pataleta
4a4905356c Merge branch 'MDL-68390-master' of git://github.com/andrewnicols/moodle 2020-07-30 11:42:53 +08:00
Andrew Nicols
7c56d5589d MDL-68390 tool_usertours: Update to use aria-hidden module 2020-07-30 11:36:23 +08:00
Eloy Lafuente (stronk7)
8d1785fec5 Merge branch 'MDL-63252-master' of git://github.com/lameze/moodle into master 2020-07-30 00:47:40 +02:00
Eloy Lafuente (stronk7)
f8666013b3 Merge branch 'MDL-68390-master' of git://github.com/andrewnicols/moodle into master 2020-07-29 19:34:45 +02:00
Juan Leyva
d58b3df938 MDL-69095 tool_mobile: Display warning if not allowed to use qr login 2020-07-28 13:49:26 +02:00
Juan Leyva
f575093bc4 MDL-69095 tool_mobile: Avoid non-https sites using qrlogin by default 2020-07-28 13:49:26 +02:00
Jun Pataleta
fcc5307e64 Merge branch 'MDL-65453-master' of git://github.com/lameze/moodle 2020-07-28 11:42:47 +08:00
Simey Lameze
d208ffb0e2 MDL-65453 core: fix behaviour of --skip-database option on install 2020-07-28 11:21:35 +08:00
Paul Holden
5c36644c05 MDL-69204 tool_dataprivacy: summary link only on current user profile. 2020-07-27 17:25:09 +01:00
Jun Pataleta
a1b2045364 Merge branch 'MDL-69260_master' of git://github.com/adpe/moodle 2020-07-27 10:53:23 +08:00
Sam Marshall
3d03d2a0d4 MDL-63252 tool_xmldb: convert default to float to avoid false positives 2020-07-24 07:53:19 +08:00
David Mudrák
9d171793d7 MDL-68558 admin: Allow to go back to plugins check page on failed deps
Once the admin reaches the Plugin dependencies check with a failed
plugin dependency, the "Continue" button should take him/her to the
previous page where the dependency can be sorted out, or the plugin
installation cancelled. Also the "Cancel this installation" should work
on this page, too.

None of this was happening correctly because the page with failed
dependencies is loaded with "confirmplugincheck" set to 1 as a result
of confirming the previous step. We must explicitly override it back to
0 to navigate the user back to the previous step.
2020-07-23 16:54:14 +02:00
Victor Deniz Falcon
ddcde1994d Merge branch 'MDL-48391' of https://github.com/paulholden/moodle 2020-07-22 21:51:25 +01:00
Paul Holden
b9a09480b2 MDL-48391 tool_uploadcourse: access checks for configuring enrolments. 2020-07-22 17:52:24 +01:00
Jun Pataleta
a03e9e0d9d Merge branch 'MDL-68874-db-sql-instrumentation' of https://github.com/brendanheywood/moodle 2020-07-22 18:10:46 +08:00
Eloy Lafuente (stronk7)
9e28ba2b65 Merge branch 'MDL-69074-master' of https://github.com/mackensen/moodle 2020-07-16 16:21:27 +02:00
Brendan Heywood
ef4145dd1a MDL-68874 dml: Add SQL stacktrace debugging mode 2020-07-15 20:32:43 +10:00
Andrew Nicols
7cc18dc2ad MDL-68390 js: Update to use Aria mod 2020-07-15 14:40:49 +08:00
Sara Arjona
ebd307b396 Merge branch 'MDL-69228-master' of git://github.com/andrewnicols/moodle 2020-07-14 12:41:05 +02:00
Paul Holden
60c92dcb4b MDL-62980 tool_dataprivacy: show persistent errors inside form. 2020-07-14 00:22:48 +01:00
adpe
d4dc94ec8d MDL-69260 admin_cli: show only contributed plugins in uninstall plugins 2020-07-13 20:19:35 +02:00
Eloy Lafuente (stronk7)
cdbb433c32 Merge branch 'MDL-69134-master' of git://github.com/andrewnicols/moodle 2020-07-08 20:53:11 +02:00
Andrew Nicols
0bf024e48a MDL-69228 tool_mobile: Hide dependant settings 2020-07-08 11:44:02 +08:00
Andrew Nicols
7d4ee9c50b Merge branch 'MDL-69031-master' of git://github.com/jleyva/moodle 2020-07-08 09:38:46 +08:00
Andrew Nicols
63a66eb2ce MDL-69134 competencies: Behat fails randomly opening dialogues 2020-07-08 09:21:44 +08:00
Andrew Nicols
e4faf5fede Merge branch 'MDL-68820-referrer-policy' of https://github.com/Peterburnett/moodle 2020-07-06 12:38:29 +08:00
Jake Dallimore
71bfe91591 Merge branch 'MDL-55192-master' of git://github.com/peterRd/moodle 2020-07-06 12:10:02 +08:00
Peter Dias
ceedbf1515 MDL-55192 log: Remove add_log from unit tests 2020-07-06 11:56:47 +08:00
Michael Hawkins
c6ffe9588e MDL-69128 admin: Convert HTML entities when populating tasklogs filter 2020-07-06 10:04:03 +08:00