mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-25 12:33:18 +01:00
Code Issues Projects Releases Wiki Activity
98,896 Commits 36 Branches 523 Tags
Commit Graph

98896 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Nicols
56e89da101 Merge branch 'MDL-69375' of https://github.com/Cvmcosta/moodle 2020-08-20 11:50:28 +08:00
Adrian Greeve
84d2d98c63 Merge branch 'MDL-68964-master' of git://github.com/ferranrecio/moodle 2020-08-20 11:37:32 +08:00
Adrian Greeve
528c73e050 Merge branch 'MDL-42434-master' of git://github.com/sarjona/moodle 2020-08-20 11:21:53 +08:00
Adrian Greeve
257b90d10c Merge branch 'MDL-68683-master-fix' of git://github.com/lameze/moodle 2020-08-20 09:54:48 +08:00
Andrew Nicols
6e116209db Merge branch 'MDL-69449' of https://github.com/paulholden/moodle 2020-08-20 09:23:39 +08:00
Andrew Nicols
d8e035e932 Merge branch 'MDL-68889-master' of git://github.com/bmbrands/moodle 2020-08-20 09:12:43 +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
f8e916d705 Merge branch 'MDL-68975-master' of git://github.com/sarjona/moodle 2020-08-20 08:40:37 +08:00
Andrew Nicols
1e18a38e95 Merge branch 'MDL-67415' of https://github.com/stronk7/moodle 2020-08-20 08:21:45 +08:00
Andrew Nicols
5c617d81e6 Merge branch 'MDL-66818-master' of git://github.com/lameze/moodle 2020-08-20 08:16:07 +08:00
Simey Lameze
7235771927 MDL-66818 mod_forum: remove unnecessary behat steps 2020-08-20 08:03:53 +08:00
Andrew Nicols
06f900daff Merge branch 'MDL-66900' of https://github.com/paulholden/moodle 2020-08-20 07:51:30 +08:00
gthomas2
4224b8e541 MDL-66818 mod_forum: hide portfolio export button based on caps 2020-08-20 07:46:09 +08:00
Andrew Nicols
d606ed13bc Merge branch 'MDL-69473-master' of git://github.com/sarjona/moodle 2020-08-20 07:39:22 +08:00
Andrew Nicols
7d06558681 Merge branch 'MDL-69271' of https://github.com/stronk7/moodle 2020-08-20 07:34:18 +08:00
Andrew Nicols
0fe7780c2f Merge branch 'MDL-69054-master' of git://github.com/sarjona/moodle 2020-08-20 07:28:19 +08:00
Andrew Nicols
d48a0a9a5d Merge branch 'MDL-61215-master' of git://github.com/sarjona/moodle 2020-08-20 07:14:15 +08:00
Andrew Nicols
575e4d3efd Merge branch 'MDL-69401-master' of git://github.com/mihailges/moodle 2020-08-20 07:00:55 +08:00
Victor Deniz Falcon
ffbf74eeb3 Merge branch 'MDL-69297-master' of git://github.com/peterRd/moodle 2020-08-19 23:28:34 +01:00
Adrian Greeve
fe7ef8a59d Merge branch 'MDL-66665-master-POC2' of git://github.com/peterRd/moodle 2020-08-19 14:26:50 +08:00
Peter Dias
0c6b705719 MDL-66665 assign: Check whether a modified user could actually grade 2020-08-19 13:39:18 +08:00
Adrian Greeve
93eb0e5402 Merge branch 'MDL-68683-master' of git://github.com/lameze/moodle 2020-08-19 12:51:23 +08:00
Peter Dias
6de93d2f29 MDL-69297 assign: Check whether there is content for a submission 
Confirm there is some content to be submitted for an assignment when processing it.
 2020-08-19 12:07:52 +08:00
Adrian Greeve
678660093e Merge branch 'MDL-69475' of https://github.com/stronk7/moodle 2020-08-19 10:37:51 +08:00
Andrew Nicols
d8d05f04d9 Merge branch 'MDL-26401-master' of git://github.com/lameze/moodle 2020-08-19 08:50:37 +08:00
Andrew Nicols
1a5f0e6cd9 MDL-67735 theme_boost: Fix incorrect whitespace 2020-08-19 08:39:33 +08:00
Andrew Nicols
f24aae4cad Merge branch 'MDL-67735-master' of git://github.com/bmbrands/moodle 2020-08-19 08:28:49 +08:00
Andrew Nicols
7cd63bde9f Merge branch 'MDL-69089-master' of git://github.com/aanabit/moodle 2020-08-19 08:18:16 +08:00
Eloy Lafuente (stronk7)
dd844d9c5f Merge branch 'MDL-65847-auth_db_error_handling' of git://github.com/leonstr/moodle into master 2020-08-19 00:35:18 +02:00
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)
44c8fe38c7 Merge branch 'MDL-63375-master' of https://github.com/syxton/moodle into master 2020-08-19 00:13:02 +02:00
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)
b7100ae5b1 MDL-69475 backup: Proper handling of backup::RELEASE versions 
1) Remove any floatval() casting. They are breaking / killing
   .10 versions (converting them to .1). Since Moodle 2.0 all the
   backup::RELEASE have been 100% numerical values.
2) Use version_compare() always to compare backup::RELEASE values.
   They are always versions and the function is aware of versions
   > .9, able to clean/ignore alpha chars... and everything else.

Note that I've also changed a couple of cases in formats (topics and
weeks) that were correct, but just added the same comment and used
the same version_compare() comparison parameters style, so all uses
in core are consistent (and safe to be copied out there).
 2020-08-18 12:48:10 +02: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
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
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
Paul Holden
1d4dbcde96 MDL-69493 cohort: remove escaping of return URL params. 2020-08-17 21:22:02 +01:00
Amaia Anabitarte
dfd8f6b56e MDL-69089 core_contentbank: Tests for empty content names 2020-08-17 15:54:36 +02:00
Amaia Anabitarte
5ea98dc5b1 MDL-69089 core_contentbank: Empty content names are not allowed 2020-08-17 15:54:36 +02:00
Bas Brands
4394f9e358 MDL-67735 theme_boost: remove bs2 and bs4alpha compatibility css 2020-08-17 08:16:42 +00:00