mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-05 08:23:01 +02:00
Code Issues Projects Releases Wiki Activity
98,525 Commits 36 Branches 529 Tags
Commit Graph

98525 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
a1b23984aa Merge branch 'MDL-68444-master' of git://github.com/rezaies/moodle into master 2020-08-18 19:12:59 +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)
7995d72daa Merge branch 'MDL-69273-master-2' of git://github.com/andrewnicols/moodle into master 2020-08-18 10:58:26 +02:00
Andrew Nicols
819d10fc59 MDL-69273 travis: Use exttests for https too 2020-08-18 07:50:48 +08:00
Andrew Nicols
a67cb58e00 MDL-69273 travis: Move exttests check to after_script 
The result of the final command `script` phase determines the build
result.

The cleanup belongs in the `after_script` phase.
 2020-08-18 07:40:15 +08:00
Andrew Nicols
3508f17417 Merge branch 'MDL-69414' of https://github.com/nadavkav/moodle 2020-08-18 00:47:48 +02:00
Andrew Nicols
7df38d0352 Merge branch 'MDL-67943-master-1' of git://github.com/mihailges/moodle 2020-08-18 00:47:48 +02:00
Adrian Greeve
e287a78a2e Merge branch 'MDL-69475' of https://github.com/stronk7/moodle 2020-08-18 00:47:48 +02:00
Eloy Lafuente (stronk7)
db17ce6628 MDL-69475 versions: main version bump 2020-08-18 00:47:47 +02: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
Mihail Geshoski
cf29c355ec MDL-67943 core: Update timezone list in core_date 2020-08-17 09:06:30 +08:00
Eloy Lafuente (stronk7)
35c36d3ffb MDL-69475 install: Version, env. and minimal changes before branching 
Note this doesn't aim to be a complete change-set, but just the
minimum to switch to 3-digit $branches and keep installation, checks
and tests running and passing.
 2020-08-16 21:03:28 +02: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
a0fc902eb1 weekly release 4.0dev 2020-08-14 14:42:18 +08:00
Andrew Nicols
d665dec78e NOBUG: Fixed SVG browser compatibility 2020-08-14 14:42:17 +08: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
e0f91914a7 Merge branch 'MDL-69253' of https://github.com/timhunt/moodle 2020-08-13 11:50:09 +08:00
Andrew Nicols
39229f3cbd Merge branch 'MDL-60492-tagcloud_html' of https://github.com/leonstr/moodle 2020-08-13 11:44:13 +08:00
Andrew Nicols
7213b650ee Merge branch 'MDL-69381' of https://github.com/marinaglancy/moodle 2020-08-13 11:28:09 +08:00
Adrian Greeve
b713aa80b4 Merge branch 'MDL-68423-master' of git://github.com/ferranrecio/moodle 2020-08-13 11:02:04 +08:00
Andrew Nicols
8bec7c109d Merge branch 'MDL-68932-master' of git://github.com/rezaies/moodle 2020-08-13 10:51:59 +08:00
Andrew Nicols
1736d2e66f Merge branch 'MDL-69421-master' of git://github.com/noeldemartin/moodle 2020-08-13 09:35:37 +08:00
Andrew Nicols
5a3e92e76c Merge branch 'MDL-67991-master' of git://github.com/aanabit/moodle 2020-08-13 08:54:35 +08:00
Andrew Nicols
dec6eebdaa Merge branch 'MDL-69241-master' of git://github.com/mickhawkins/moodle 2020-08-13 08:27:01 +08:00
Andrew Nicols
48e5fbe1f5 Merge branch 'MDL-67708-master' of git://github.com/vmdef/moodle 2020-08-13 08:11:09 +08:00
Andrew Nicols
c59247e1e8 Merge branch 'MDL-60260' of https://github.com/paulholden/moodle 2020-08-13 07:54:26 +08:00
Andrew Nicols
f27f995522 Merge branch 'MDL-69143-master' of git://github.com/ferranrecio/moodle 2020-08-13 07:45:16 +08: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)
d337e7a546 Merge branch 'MDL-68860' of https://github.com/paulholden/moodle into master 2020-08-13 00:55:09 +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
Eloy Lafuente (stronk7)
5374c768f3 Merge branch 'MDL-67394' of https://github.com/paulholden/moodle into master 2020-08-13 00:28:51 +02:00
Eloy Lafuente (stronk7)
d40cecdb8a Merge branch 'MDL-67002' of https://github.com/timhunt/moodle into master 2020-08-13 00:08:17 +02:00
Eloy Lafuente (stronk7)
a470c9064a Merge branch 'master-MDL-66716' of https://github.com/golenkovm/moodle into master 2020-08-12 20:09:40 +02:00
Ferran Recio
5132309170 MDL-69143 contentbank: catching Exception on file upload 2020-08-12 16:57:17 +02:00
Brendan Heywood
0f89884980 MDL-69265 email: Add admin setting for email headers 2020-08-12 20:51:10 +10:00
Andrew Nicols
08b8b76655 Merge branch 'MDL-69356' of https://github.com/stronk7/moodle 2020-08-12 14:00:44 +08:00
Andrew Nicols
12403bc004 Merge branch 'MDL-68618' of https://github.com/paulholden/moodle 2020-08-12 13:39:20 +08:00
Andrew Nicols
b7146cdff9 Merge branch 'MDL-69353' of https://github.com/paulholden/moodle 2020-08-12 11:21:48 +08:00
Andrew Nicols
452497da41 Merge branch 'MDL-68334-master' of git://github.com/lucaboesch/moodle 2020-08-12 11:05:54 +08:00
Andrew Nicols
6c772c3b60 Merge branch 'MDL-69296' of https://github.com/NeillM/moodle 2020-08-12 10:27:55 +08:00
Andrew Nicols
d6c8f14ed9 Merge branch 'MDL-68731' of https://github.com/jonof/moodle 2020-08-12 08:32:00 +08: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
Andrew Nicols
2a247aab70 Merge branch 'MDL-69143-master' of git://github.com/ferranrecio/moodle 2020-08-11 14:33:44 +08:00
Andrew Nicols
d689b2e029 Merge branch 'MDL-69168_recently-accessed-items-block-uses-stock-lti-icon__master' of https://github.com/stopfstedt/moodle 2020-08-11 12:59:49 +08: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
Andrew Nicols
7a6ea323e4 Merge branch 'MDL-64818_master' of git://github.com/gjb2048/moodle 2020-08-10 18:54:30 +08:00
Paul Holden
e9a5485f3e MDL-68618 mod_forum: stop reverting idnumber when updating instance. 2020-08-10 09:11:02 +01:00