Sara Arjona
d68a8df7ea
Merge branch 'dynreg-upgrade-squash-311' of https://github.com/cengage/moodle into MOODLE_311_STABLE
2021-04-21 09:58:38 +02:00
Jun Pataleta
bcc9028f20
Merge branch 'MDL-71017-311-2' of git://github.com/marinaglancy/moodle into MOODLE_311_STABLE
2021-04-21 14:56:54 +08:00
abgreeve
f0b4559bfe
Merge branch 'MDL-71205_311' of https://github.com/mkassaei/moodle into MOODLE_311_STABLE
2021-04-21 13:31:44 +08:00
Jake Dallimore
25716402c1
Merge branch 'MDL-71030-311' of https://github.com/NashTechOpenUniversity/moodle into MOODLE_311_STABLE
2021-04-21 12:07:07 +08:00
abgreeve
dfda661753
Merge branch '311_MDL-71174' of git://github.com/danmarsden/moodle into MOODLE_311_STABLE
2021-04-21 11:02:13 +08:00
Eloy Lafuente (stronk7)
52dff48650
Merge branch 'MDL-63381_311_v3' of https://github.com/TomoTsuyuki/moodle into MOODLE_311_STABLE
2021-04-20 23:58:48 +02:00
Claude Vervoort
2eaf60e01b
MDL-70500 lti: dyn reg can be used to update tools
2021-04-20 17:13:18 -04:00
Sara Arjona
3c71c49d28
Merge branch 'MDL-62244_311_label_view' of https://github.com/sheesania/moodle into MOODLE_311_STABLE
2021-04-20 17:45:01 +02:00
Sara Arjona
003dadc64d
on-demand release 3.11dev+
2021-04-20 15:52:10 +02:00
Sara Arjona
bfa5ef0ea0
Merge branch 'install_311_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_311_STABLE
2021-04-20 15:52:07 +02:00
Marina Glancy
444a4a8c3e
MDL-71017 oath2: configuration check fix and return types
2021-04-20 12:08:19 +02:00
David Matamoros
fc02628620
MDL-71017 tool_oauth2: Small fixes on Oauth 2 services UI and tests
2021-04-20 10:52:35 +02:00
Marina Glancy
8cc1bcb123
MDL-71017 tool_oauth2: show not configured services
2021-04-20 10:52:35 +02:00
Marina Glancy
720d74ebeb
MDL-71017 oauth2: configure some oauth2 services for login only
2021-04-20 10:52:32 +02:00
Thong Bui
6a9063c588
MDL-71030 Quiz: Add 'who' made changes in question response history
2021-04-20 09:12:18 +07:00
Jun Pataleta
e3bd87cae7
Merge branch 'MDL-71364_311' of https://github.com/stronk7/moodle into MOODLE_311_STABLE
2021-04-20 09:24:44 +08:00
AMOS bot
587afbb7ad
Automatically generated installer lang files
2021-04-20 00:07:30 +00:00
Víctor Déniz
3de3ebc4f3
Merge branch 'MDL-71087-311' of https://github.com/NashTechOpenUniversity/moodle into MOODLE_311_STABLE
2021-04-19 23:44:38 +01:00
Eloy Lafuente (stronk7)
5e0772ed8b
Merge branch 'MDL-69256-311' of git://github.com/andrewnicols/moodle into MOODLE_311_STABLE
2021-04-20 00:04:56 +02:00
Víctor Déniz
6b9033f251
Merge branch 'MOODLE_311_STABLE_fix_gradeimport_csv' of https://github.com/intrajp/moodle into MOODLE_311_STABLE
2021-04-19 22:48:24 +01:00
Víctor Déniz
42a4fea40c
Merge branch 'MDL-71118-311' of git://github.com/lucaboesch/moodle into MOODLE_311_STABLE
2021-04-19 19:44:08 +01:00
Eloy Lafuente (stronk7)
6c5c501504
Merge branch 'MDL-71181-311' of https://github.com/ettolrah/moodle into MOODLE_311_STABLE
2021-04-19 18:58:24 +02:00
Eloy Lafuente (stronk7)
cb6cdc0fd3
Merge branch 'MOODLE_311_STABLE-MDL-71190-backup-lastaccess' of https://github.com/ScottVerbeek/moodle into MOODLE_311_STABLE
2021-04-19 18:52:30 +02:00
Sara Arjona
ab308e8847
Merge branch 'MDL-71262_311' of https://github.com/mkassaei/moodle into MOODLE_311_STABLE
2021-04-19 17:44:09 +02:00
Sara Arjona
e4d4369b2f
MDL-71225 questions: Remove duplicated empty line
2021-04-19 17:28:43 +02:00
Sara Arjona
bcfa03c428
Merge branch 'MDL-71225_311' of https://github.com/mkassaei/moodle into MOODLE_311_STABLE
2021-04-19 17:18:40 +02:00
Sara Arjona
8ec2411be7
Merge branch 'MDL-67882-message-config-log-MOODLE_311_STABLE' of https://github.com/brendanheywood/moodle into MOODLE_311_STABLE
2021-04-19 16:22:54 +02:00
Sara Arjona
103d168357
Merge branch 'MDL-71367_311' of https://github.com/stronk7/moodle into MOODLE_311_STABLE
2021-04-19 11:12:56 +02:00
Sara Arjona
350b49766a
Merge branch 'MDL-71365_311' of https://github.com/stronk7/moodle into MOODLE_311_STABLE
2021-04-19 10:18:32 +02:00
Sara Arjona
5a2ae7ecde
Merge branch 'MDL-66475-311' of git://github.com/paulholden/moodle into MOODLE_311_STABLE
2021-04-19 09:49:15 +02:00
Sara Arjona
a569ba73b4
Merge branch 'MDL-65553-311' of git://github.com/aanabit/moodle into MOODLE_311_STABLE
2021-04-19 08:53:39 +02:00
Jun Pataleta
8224c9d6b7
Merge branch 'MDL-71324-311' of git://github.com/lucaboesch/moodle into MOODLE_311_STABLE
2021-04-19 12:31:27 +08:00
ScottVerbeek
d687a56fed
MDL-71190 backup: Include users last access to course
...
Backup the table user_lastaccess which holds data for when a user last accessed a course.
And also restore to the table user_lastaccess from the .xml file created in the backup.
2021-04-19 12:04:30 +10:00
Andrew Nicols
1e90af329d
Merge branch 'MDL-71012-311' of https://github.com/jessansell/moodle into MOODLE_311_STABLE
2021-04-19 08:49:06 +08:00
Eloy Lafuente (stronk7)
c86f286543
MDL-71367 unit tests: Add missing ->destroy() call to test backups
...
As part of the tests preparations, some backups are created, but
the tests aren't calling to their ->destroy() method at the end.
The destroy() method is needed to go cleaning and unsetting various
objects that, only then, will free resources, like memory, open files...
This isn't critical under Unix OSs... but Windows is really sensible
and keeps all open files locked, so any write operation on them fails.
2021-04-19 00:03:46 +02:00
Eloy Lafuente (stronk7)
b98005ec2a
Merge branch 'MDL-71031_311' of https://github.com/stronk7/moodle into MOODLE_311_STABLE
2021-04-18 17:08:51 +02:00
Eloy Lafuente (stronk7)
51a5d523a1
MDL-71031 external: Minor tweaks towards coding style and external rules
...
- Some small namespace/use/MOODLE_INTERNAL/requires reorganization.
- Move file phpdocs to class phpdocs.
- Move external method names to be new "execute" default ones.
- Move unit tests to matching core_grades\external namespace.
- Add missing clean_returnvalue() calls.
2021-04-18 11:53:09 +02:00
Peter Burnett
74a86a9880
MDL-71031 webservices: Extended gradecategory creation API
...
This adds a new webservice that creates gradecategories as a batch,
and deprecates the old single creation call, which is superseded.
It also patches a few small issues in the single WS, for any integrations
currently relying on that webservice.
2021-04-18 11:53:03 +02:00
AMOS bot
eb45c21753
Automatically generated installer lang files
2021-04-18 00:07:28 +00:00
Eloy Lafuente (stronk7)
e5441b439e
MDL-71365 grunt: fix boost ignores order and missing LF @ EOF
2021-04-18 00:13:12 +02:00
Eloy Lafuente (stronk7)
b086645bd7
MDL-71364 behat: fix randomness causes by "now" advancing
...
Some recent tests do set a date time element
to ##now## or tomorrow and, immediately after that
the look if, effectively, ##now## and #tomorrow#
have been set (with minutes resolution).
Problem is that, between the field is set and the field
is verified, it can happen that the time advances to
next minute (from H:M:59 to H:M+1:00) and then the
assertion fails.
To avoid this, we could have lowered the resolution to be
hours... but that doesn't solve the problem just makes it
to happen less often.
So, instead of that... we are setting the 2 now and tomorrow
cases to be "today noon" and "tomorrow noon" (12:00:00) so
we ensure they won't be ever in the risk of jumping of minute.
2021-04-17 12:32:35 +02:00
Luca Bösch
e2b1ede0dd
MDL-71324 course: Render hasinfo class only if necessary.
2021-04-17 11:49:28 +02:00
Luca Bösch
c5446c9cc7
MDL-71118 core: Add grade (verb) string.
...
AMOS BEGIN
CPY [grade,core],[gradenoun,core]
CPY [grade,core],[gradeverb,core]
AMOS END
2021-04-17 11:45:57 +02:00
Luca Bösch
3256a63914
MDL-71118 gradereport_user: Display Grades (plural) in profile page.
2021-04-17 11:45:57 +02:00
Eloy Lafuente (stronk7)
8b9717935c
Merge branch 'MDL-70099-311' of git://github.com/paulholden/moodle into MOODLE_311_STABLE
2021-04-17 09:40:28 +02:00
Eloy Lafuente (stronk7)
9b8427c455
Merge branch 'MDL-71334-311' of git://github.com/mickhawkins/moodle into MOODLE_311_STABLE
2021-04-16 19:59:45 +02:00
Sara Arjona
9600becce3
on-demand release 3.11dev+
2021-04-16 17:06:23 +02:00
Sara Arjona
dfbea60ac4
Merge branch 'install_311_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_311_STABLE
2021-04-16 17:06:20 +02:00
Sara Arjona
b3209c0ac5
MDL-69331 core_h5p: fix behat errors
2021-04-16 13:07:09 +02:00
Andrew Nicols
b816aa102d
Merge branch 'MOODLE_311_MDL-71233' of https://github.com/golenkovm/moodle into MOODLE_311_STABLE
2021-04-16 08:06:23 +01:00