mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-15 13:10:08 +01:00
Code Issues Projects Releases Wiki Activity
98,142 Commits 36 Branches 523 Tags
Commit Graph

98142 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amaia Anabitarte
088786d284 MDL-69047 core_contentbank: Hard coding status messages 2020-06-18 18:06:30 +02:00
Sara Arjona
1ab9522055 weekly on-sync release 4.0dev 2020-06-18 14:14:26 +02:00
Sara Arjona
c6c6770268 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2020-06-18 14:14:23 +02:00
Victor Deniz Falcon
e055a45160 Merge branch 'MDL-66899-log-quiz-regrade' of https://github.com/rboyatt/moodle 2020-06-18 04:16:53 +01:00
Víctor Déniz Falcón
a59f03d4de Merge branch 'MDL-69060-master' of git://github.com/lucaboesch/moodle 2020-06-17 23:38:15 +01:00
Jun Pataleta
dff53373de Merge branch 'MDL-68890-master' of https://github.com/DinhHien0307/moodle 2020-06-17 19:53:29 +08:00
Jake Dallimore
32e9128333 Merge branch 'MDL-68215-master' of git://github.com/lucaboesch/moodle 2020-06-17 14:57:42 +08:00
Jun Pataleta
753f2dcfba Merge branch 'MDL-68971' of https://github.com/timhunt/moodle 2020-06-17 11:36:12 +08:00
Jun Pataleta
26f3788857 Merge branch 'MDL-67294-master' of git://github.com/mihailges/moodle 2020-06-17 10:33:55 +08:00
Víctor Déniz Falcón
f82fad44d7 Merge branch 'MDL-69049-master' of git://github.com/junpataleta/moodle 2020-06-16 18:05:42 +01:00
Mihail Geshoski
2e5e143061 MDL-67294 assignsubmission_file: Make sure record exists before updating 2020-06-17 00:50:22 +08:00
Jun Pataleta
3a679810d5 Merge branch 'MDL-68436' of https://github.com/timhunt/moodle 2020-06-16 14:38:44 +08:00
Jun Pataleta
3484f3e4b5 MDL-69049 tool_dataprivacy: Add possibly missing comment format columns 
The earlier CONTRIB plugin versions of the tool (<33.2.0, <34.2.0) were
missing the following columns in the data requests table:
* commentsformat
* dpocommentformat
And the upgrade scripts for the merged tool failed in
Moodle 3.3.8+/3.3.0+ failed to add these columns.
So a site which uses the CONTRIB plugin and eventually upgrading to 3.9
will encounter an error during upgrade because of the missing
dpocommentformat column.
 2020-06-16 09:25:03 +08:00
Víctor Déniz Falcón
a51797cc0e Merge branch 'MDL-69044' of https://github.com/stronk7/moodle 2020-06-15 17:21:49 +01:00
Víctor Déniz Falcón
bc0b4ec7f4 Merge branch 'MDL-69043' of https://github.com/stronk7/moodle 2020-06-15 15:55:22 +01:00
Luca Bösch
c09a294ff4 MDL-68215 block_activity_result: Format elements more nicely. 2020-06-15 15:24:46 +02:00
Luca Bösch
061893d89b MDL-69060 core_contentbank: fix contenbank typos. 2020-06-15 13:35:43 +02:00
hiendinh
de6b084925 MDL-68890 progressbar: prevent display exist file's progress bar 2020-06-15 10:55:06 +07:00
Eloy Lafuente (stronk7)
b764343e5a MDL-69044 upgrade: add 3.9.0 separation line to all upgrade scripts 2020-06-14 13:08:09 +02:00
Eloy Lafuente (stronk7)
dbe3e2dd13 MDL-69043 backup: Bump release to 4.0 2020-06-14 12:53:38 +02:00
AMOS bot
edb1a9b4f3 Automatically generated installer lang files 2020-06-14 00:07:18 +00:00
Eloy Lafuente (stronk7)
a2b286ce17 weekly back-to-dev release 4.0dev 2020-06-13 20:11:29 +02:00
Eloy Lafuente (stronk7)
7be8da04cd NOBUG: Change travis.yml back to master 2020-06-13 20:04:50 +02:00
Eloy Lafuente (stronk7)
500c131eb4 Moodle release 3.9 v3.9.0 2020-06-13 20:04:49 +02:00
Eloy Lafuente (stronk7)
ea24bef18a NOBUG: Change travis.yml to MOODLE_39_STABLE 2020-06-13 20:04:49 +02:00
Eloy Lafuente (stronk7)
698e225d61 Merge branch 'MDL-68632' of git://github.com/aolley/moodle 2020-06-12 19:59:55 +02:00
Victor Deniz Falcon
8dbc6ebbe3 Moodle release 3.9rc3 v3.9.0-rc3 2020-06-12 12:32:06 +01:00
Jun Pataleta
2b263bf837 Merge branch 'MDL-69026-master' of git://github.com/andrewnicols/moodle 2020-06-12 11:58:59 +08:00
Adam Olley
9db6c361fd MDL-68632 quizaccess_seb: Limit privacy queriyes to the quiz module 
Without this, joins are performed against the course_modules table purely on
the instance id - other modules can share this ID, resulting in incorrect
contexts being pulled in.
 2020-06-12 12:31:01 +09:30
Andrew Nicols
8d5926bead MDL-69026 user: Correct statuses => status in test 2020-06-12 10:03:06 +08:00
Andrew Nicols
8bcf74e9bc MDL-69026 user: Wrap sub-query in brackets 
It is perfectly valid to have a query like:

Match None of the following:
- Role is ANY of the following:
-- 'Teacher'
-- 'Editing teacher'
-- 'Manager'; AND
- Keyword is NONE of the following:
-- 'Kevin'

However, due to the way in which the query is constructed, this leads to
a query which includes

    WHERE NOT ef.id IS NOT NULL
    AND NOT
        u.id IN (SELECT userid FROM {role_assignments} WHERE roleid IN (...) AND contextid IN (...))
    AND NOT
        NOT (u.firstname || ' ' || u.lastname LIKE '%Kevin%')

The use of NOT NOT is valid in Postgres, MariaDB, MySQL, and MSSQL, but
not in Oracle.

To counter this when the outer jointype is of type NONE, we must wrap
each of the inner WHERE clauses in a set of brackets, which makes the
query:

    WHERE NOT ef.id IS NOT NULL
    AND NOT
        (u.id IN (SELECT userid FROM {role_assignments} WHERE roleid IN (...) AND contextid IN (...)))
    AND NOT
        (NOT (u.firstname || ' ' || u.lastname LIKE '%Kevin%'))

Whilst Oracle does not support the use of `AND NOT NOT ...`, it does support
`AND NOT (NOT ...)`
 2020-06-12 10:03:06 +08:00
Sara Arjona
aa6830ef99 Moodle release 3.9rc2 v3.9.0-rc2 2020-06-11 18:05:14 +02:00
Sara Arjona
4234dc31cb Merge branch 'MDL-69022' of https://github.com/Chocolate-lightning/moodle 2020-06-11 12:50:49 +02:00
Mathew May
ddb34e56d3 MDL-69022 tool_moodlenet: Disable integration by default 2020-06-11 17:25:54 +08:00
Jun Pataleta
02b7fac93d Merge branch 'MDL-69017-master' of git://github.com/andrewnicols/moodle 2020-06-11 16:59:04 +08:00
Sara Arjona
057db49265 Merge branch 'MDL-69004-master' of git://github.com/rezaies/moodle 2020-06-11 10:22:38 +02:00
Jake Dallimore
28bcf61281 Merge branch 'MDL-69020-master' of git://github.com/mihailges/moodle 2020-06-11 16:18:08 +08:00
Mihail Geshoski
cca4ba26c9 MDL-69020 tool_moodlenet: Modify defaultmoodlenet_desc string 2020-06-11 16:13:19 +08:00
Andrew Nicols
d3bfae8fcc MDL-69017 user: Show all links should work for students 2020-06-11 15:51:41 +08:00
Jun Pataleta
f2dc6313f0 Merge branch 'MDL-67070-master' of git://github.com/andrewnicols/moodle 2020-06-11 14:22:48 +08:00
Andrew Nicols
01f6be2cff Merge branch 'MDL-69006-master' of git://github.com/bmbrands/moodle 2020-06-11 12:59:26 +08:00
Jake Dallimore
c53b9c9a6f Merge branch 'MDL-68991-master' of git://github.com/rezaies/moodle 2020-06-11 12:27:16 +08:00
Jake Dallimore
8aa901e7c3 Merge branch 'MDL-69010' of https://github.com/Chocolate-lightning/moodle 2020-06-11 12:01:22 +08:00
Jun Pataleta
a04f9e8bf4 Merge branch 'MDL-69013-master' of git://github.com/andrewnicols/moodle 2020-06-11 11:28:31 +08:00
Andrew Nicols
4dae4b1429 Merge branch 'MDL-69002-master' of git://github.com/sarjona/moodle 2020-06-11 11:08:14 +08:00
Andrew Nicols
fc99ffa1aa MDL-67070 tool_usertours: Fix assumption that tours exist 2020-06-11 11:05:27 +08:00
Jun Pataleta
49a34f1593 Merge branch 'MDL-68912' of https://github.com/rlorenzo/moodle 2020-06-11 11:01:05 +08:00
Adrian Greeve
fcae8cd3cf MDL-66601 atto_image: Removing bad js build files. 2020-06-11 10:43:13 +08:00
Mathew May
e5daf9c7fc MDL-69010 tool_moodlenet: Migrate default MoodleNet instance setting 2020-06-11 10:32:27 +08:00
Andrew Nicols
6414edf1f9 MDL-69013 core: Add quizaccess_safebrowser to deleted plugins 2020-06-11 09:43:38 +08:00