mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-05-31 21:19:49 +02:00
Code Issues Projects Releases Wiki Activity
98,704 Commits 37 Branches 536 Tags
Commit Graph

27591 Commits

Author SHA1 Message Date
Andrew Nicols
2f7792a0da MDL-69117 output: Correct remove_dir usage 2020-09-03 09:01:32 +08:00
Andrew Nicols
695a7f2ddf Merge branch 'MDL-69117-master-2' of git://github.com/bmbrands/moodle 2020-09-03 08:38:54 +08:00
Eloy Lafuente (stronk7)
e02e90fa52 Merge branch 'MDL-55971' of https://github.com/paulholden/moodle into master 2020-09-03 00:50:39 +02:00
Peter Burnett
309f54bf81 MDL-67306 webservices: Added webservice for Grade category creation 2020-09-03 00:20:44 +02:00
Sara Arjona
cf4841cfdb Merge branch '67278-master-categories-selector' of https://github.com/DSI-Universite-Rennes2/moodle into master 2020-09-02 17:37:15 +02:00
Sara Arjona
52cccf7e77 Merge branch 'MDL-68680-Master' of https://github.com/tuanngocnguyen/moodle into master 2020-09-02 17:15:53 +02:00
Julien Boulen
93d7220587 MDL-67278 course: Use autocomplete widget for course category selector 2020-09-02 15:30:34 +02:00
Bas Brands
a158714284 MDL-69117 theme_boost: themedesigner source maps 2020-09-02 12:14:13 +02:00
Andrew Nicols
39ae77ca65 Merge branch 'MDL-67419-master' of git://github.com/farhan6318/moodle 2020-09-02 08:54:27 +08:00
Sara Arjona
c9bd1a6652 Merge branch 'MDL-63387-2' of https://github.com/paulholden/moodle into master 2020-09-01 16:58:00 +02:00
Paul Holden
a9165e69b4 MDL-63387 access: add parameter to define how role names are returned. 2020-09-01 12:05:15 +01:00
Andrew Nicols
7df5b8ed1c Merge branch 'MDL-69507' of https://github.com/timhunt/moodle 2020-09-01 11:11:07 +08:00
Sara Arjona
124a368a11 Merge branch 'MDL-38350-master' of https://github.com/sammarshallou/moodle into master 2020-09-01 07:26:42 +08:00
Andrew Nicols
1b0bd27ae1 Merge branch 'MDL-69505-master' of https://github.com/snake/moodle 2020-09-01 07:26:02 +08:00
Jake Dallimore
9ccf833ec1 MDL-69505 core_form: fix js min/max date restriction in dateselector 
This was using the yui2-calendar attribute, not the yui 3 attribute.
 2020-08-31 08:03:33 +08:00
Sara Arjona
66455e02d8 MDL-69269 contentbank: add support to download content 2020-08-28 12:28:13 +02:00
Nathan Nguyen
293760a4b5 MDL-68680 core_grades: check grade item before trigger delete event 2020-08-28 08:58:20 +10:00
Andrew Nicols
517ac3f3bb Merge branch 'master-MDL-67211_v6' of https://github.com/golenkovm/moodle 2020-08-27 12:47:59 +08:00
Adrian Greeve
134cdddfc4 Merge branch 'MDL-69479-master' of git://github.com/mihailges/moodle 2020-08-27 11:41:10 +08:00
Mikhail Golenkov
674f126d0b MDL-67211 phpunit: Do not test the order of the running adhoc tasks. 2020-08-27 13:02:36 +10:00
Andrew Nicols
2ccf106454 Merge branch 'master-MDL-69358' of https://github.com/golenkovm/moodle 2020-08-27 10:57:19 +08:00
Andrew Nicols
e471d82358 Merge branch 'MDL-66222-antivirus-reporting' of https://github.com/Peterburnett/moodle 2020-08-27 09:34:37 +08:00
Adrian Greeve
80326f90c4 Merge branch 'MDL-69419-master' of git://github.com/andrewnicols/moodle 2020-08-27 08:08:51 +08:00
Andrew Nicols
72616bfd46 MDL-69419 core: Task reset tests cannot use random test times 
If a scheduled task which uses a 'R' field is picked, then the reset of
updated task times will not necessarily be correctly determined as the
randomisation is picked during reset.

This can lead to some random test failures.

Actively specifying a test which does not make use of the 'R' random
field time addresses this issue.
 2020-08-26 09:57:47 +08:00
Andrew Nicols
23517d9034 Merge branch 'master-MDL-67211_v6' of https://github.com/golenkovm/moodle 2020-08-26 09:37:16 +08:00
Paul Holden
b670d3adb6 MDL-55971 dataformat: method to write exports to file storage. 2020-08-25 17:28:55 +01:00
Mikhail Golenkov
d7342dc239 MDL-67211 Tasks: Add cron_enabled setting. 
Co-authored-by: Sam Marshall <s.marshall@open.ac.uk>
 2020-08-25 17:08:57 +10:00
Mikhail Golenkov
b465a541ae MDL-67211 Tasks: Record when a task is running. 
Co-authored-by: Sam Marshall <s.marshall@open.ac.uk>
 2020-08-25 17:08:03 +10:00
Andrew Nicols
20c84b6cc2 MDL-69464 core_output: Whitespace fix 2020-08-25 13:21:26 +08:00
Andrew Nicols
55f863e012 Merge branch 'MDL-69464' of https://github.com/marinaglancy/moodle 2020-08-25 12:39:48 +08:00
Victor Deniz Falcon
9aa9efbfda MDL-68921 core_h5p: Add H5P libraries metadata settings 2020-08-25 00:48:02 +01:00
Eloy Lafuente (stronk7)
9a79c34eb6 MDL-69479 upgrade: Change all 4.0 occurrences to 3.10 
Under parallel development, when something is worth being commented
in upgrade.txt notes, it will be applied to all the development branches
using the "earliest" one to be released. So, if something changes
in 3.10 (and also is applied to master), the upgrade.txt notes will
show 3.10 in both branches.

Of course, if something only goes to one dev branch (say master), then the
master version will be used in the notes (4.0 in this case).
 2020-08-21 23:57:17 +02:00
Peter Burnett
8e0e99e4fd MDL-66222 antivirus: Improved error email capture 2020-08-21 12:21:09 +10:00
Nathan Nguyen
adbe92ce0a MDL-66222 antivirus: Added antivirus failure reporting 2020-08-21 11:43:56 +10:00
Andrew Nicols
b430493ca8 MDL-68705 testing: Allow composer updates to be disabled 2020-08-20 20:11:13 +02:00
sam marshall
9538ba0d67 MDL-38350 Lib: Rename directory before removing it, to reduce races 2020-08-20 16:52:28 +01:00
Marina Glancy
cd467644eb MDL-69464 core_output: allow to avoid formatting in page->set_heading 2020-08-20 14:56:08 +02:00
Tim Hunt
58b7986776 MDL-69507 duration form field: should return an int number of seconds 2020-08-20 11:30:41 +01:00
Tim Hunt
e5a0f11b5e MDL-69507 duration form field: modernise coding style 2020-08-20 11:30:40 +01:00
Adrian Greeve
257b90d10c Merge branch 'MDL-68683-master-fix' of git://github.com/lameze/moodle 2020-08-20 09:54:48 +08:00
Simey Lameze
f968aaf7c4 MDL-68683 competencies: fix query to delete stale files 2020-08-20 08:59:25 +08:00
Andrew Nicols
ef73bfbeac Merge branch 'MDL-69170-adhoc-task-timestamp' of https://github.com/Peterburnett/moodle 2020-08-20 08:45:27 +08:00
Andrew Nicols
d48a0a9a5d Merge branch 'MDL-61215-master' of git://github.com/sarjona/moodle 2020-08-20 07:14:15 +08:00
Adrian Greeve
93eb0e5402 Merge branch 'MDL-68683-master' of git://github.com/lameze/moodle 2020-08-19 12:51:23 +08:00
Andrew Nicols
f24aae4cad Merge branch 'MDL-67735-master' of git://github.com/bmbrands/moodle 2020-08-19 08:28:49 +08:00
Simey Lameze
fcb899b9c8 MDL-68683 competencies: step to delete orphaned evidence files 2020-08-18 16:02:38 +08:00
Simey Lameze
629ea1f932 MDL-68683 core: fix DML exception on upgrade step 2020-08-18 16:02:04 +08:00
Andrew Nicols
7df38d0352 Merge branch 'MDL-67943-master-1' of git://github.com/mihailges/moodle 2020-08-18 00:47:48 +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
Bas Brands
4394f9e358 MDL-67735 theme_boost: remove bs2 and bs4alpha compatibility css 2020-08-17 08:16:42 +00:00