abgreeve
dac0c020ef
Merge branch 'MDL-71174' of git://github.com/danmarsden/moodle
2021-04-21 11:01:05 +08:00
Eloy Lafuente (stronk7)
7c75781518
Merge branch 'MDL-63381_master_v3' of https://github.com/TomoTsuyuki/moodle
2021-04-20 23:56:56 +02:00
Sara Arjona
d0b3f1d24a
Merge branch 'MDL-62244_master_label_view' of https://github.com/sheesania/moodle
2021-04-20 17:44:54 +02:00
Sara Arjona
e29b256438
weekly release 4.0dev
2021-04-20 15:51:10 +02:00
Sara Arjona
92261bbb2a
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2021-04-20 15:51:07 +02:00
Jun Pataleta
0d92e1bc11
Merge branch 'MDL-71364' of https://github.com/stronk7/moodle
2021-04-20 09:24:52 +08:00
AMOS bot
3a134a3066
Automatically generated installer lang files
2021-04-20 00:07:51 +00:00
Víctor Déniz
ab6f97292d
Merge branch 'MDL-71087-master' of https://github.com/NashTechOpenUniversity/moodle
2021-04-19 23:44:06 +01:00
Eloy Lafuente (stronk7)
ea2fd1ace6
Merge branch 'MDL-69256-master' of git://github.com/andrewnicols/moodle
2021-04-20 00:04:48 +02:00
Víctor Déniz
50fb2248f5
Merge branch 'master_fix_gradeimport_csv' of https://github.com/intrajp/moodle
2021-04-19 22:47:32 +01:00
Víctor Déniz
f7dd6b26b7
Merge branch 'MDL-71118-master' of git://github.com/lucaboesch/moodle
2021-04-19 19:43:32 +01:00
Eloy Lafuente (stronk7)
973a4a2ae1
Merge branch 'MDL-71181-master' of https://github.com/ettolrah/moodle
2021-04-19 18:58:14 +02:00
Eloy Lafuente (stronk7)
ce06891713
Merge branch 'master-MDL-71190-backup-lastaccess' of https://github.com/ScottVerbeek/moodle
2021-04-19 18:52:18 +02:00
Sara Arjona
9ffe994b4c
Merge branch 'MDL-71262' of https://github.com/mkassaei/moodle
2021-04-19 17:44:03 +02:00
Sara Arjona
5013604f18
MDL-71225 questions: Remove duplicated empty line
2021-04-19 17:28:19 +02:00
Sara Arjona
ee6eccd7fd
Merge branch 'MDL-71225' of https://github.com/mkassaei/moodle
2021-04-19 17:18:33 +02:00
Sara Arjona
4478fcf1ce
Merge branch 'MDL-67882-message-config-log' of https://github.com/brendanheywood/moodle
2021-04-19 16:22:48 +02:00
Sara Arjona
754c8f8d74
Merge branch 'MDL-71367' of https://github.com/stronk7/moodle
2021-04-19 11:12:49 +02:00
Sara Arjona
727bb77860
Merge branch 'MDL-71365' of https://github.com/stronk7/moodle
2021-04-19 10:18:25 +02:00
Sara Arjona
545996577e
Merge branch 'MDL-66475' of git://github.com/paulholden/moodle
2021-04-19 09:49:09 +02:00
Sara Arjona
d688af7edd
Merge branch 'MDL-65553-master' of git://github.com/aanabit/moodle
2021-04-19 08:53:33 +02:00
Jun Pataleta
ba5f069ada
Merge branch 'MDL-71324-master' of git://github.com/lucaboesch/moodle
2021-04-19 12:31:18 +08:00
ScottVerbeek
dc1048c301
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:03:50 +10:00
Andrew Nicols
d649ec2837
Merge branch 'MDL_71012_master' of https://github.com/jessansell/moodle
2021-04-19 08:47:50 +08:00
Eloy Lafuente (stronk7)
fc530b1837
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:04:10 +02:00
Eloy Lafuente (stronk7)
64ae826093
Merge branch 'MDL-71031' of https://github.com/stronk7/moodle
2021-04-18 17:08:43 +02:00
Eloy Lafuente (stronk7)
be927f0327
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:52:14 +02:00
Peter Burnett
71ffad7ea6
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:52:07 +02:00
AMOS bot
66684b7b8e
Automatically generated installer lang files
2021-04-18 00:07:48 +00:00
Eloy Lafuente (stronk7)
2d287b8adf
MDL-71365 grunt: fix boost ignores order and missing LF @ EOF
2021-04-18 00:10:46 +02:00
Eloy Lafuente (stronk7)
10a4932e25
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:31:23 +02:00
Luca Bösch
3316562636
MDL-71324 course: Render hasinfo class only if necessary.
2021-04-17 11:49:39 +02:00
Luca Bösch
aee27d0a9b
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:46:09 +02:00
Luca Bösch
b9c7ea61a9
MDL-71118 gradereport_user: Display Grades (plural) in profile page.
2021-04-17 11:46:09 +02:00
Eloy Lafuente (stronk7)
b60fbb9cd4
Merge branch 'MDL-70099' of git://github.com/paulholden/moodle
2021-04-17 09:40:19 +02:00
Eloy Lafuente (stronk7)
fc2e04d903
Merge branch 'MDL-71334-master' of git://github.com/mickhawkins/moodle
2021-04-16 19:59:37 +02:00
Sara Arjona
0fd37bf5d8
weekly release 4.0dev
2021-04-16 17:03:25 +02:00
Sara Arjona
dd33f73bfa
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2021-04-16 17:03:22 +02:00
Eloy Lafuente (stronk7)
26d8cc9ce7
Merge branch 'MDL-69331-fix' of github.com:sarjona/moodle
2021-04-16 13:04:51 +02:00
Sara Arjona
ef557b970f
MDL-69331 core_h5p: fix behat errors
2021-04-16 11:09:02 +02:00
Andrew Nicols
e37158ba6c
Merge branch 'master_MDL-71233' of https://github.com/golenkovm/moodle
2021-04-16 07:57:02 +01:00
Jun Pataleta
c44e5c2218
Merge branch 'MDL-48594-master' of https://github.com/nguyenphuctien/moodle
2021-04-16 07:57:01 +01:00
Andrew Nicols
0afbb0517c
Merge branch 'MDL-60490-missing_close_div' of https://github.com/leonstr/moodle
2021-04-16 07:57:01 +01:00
Andrew Nicols
c58e9a14ee
Merge branch 'MDL-69415-master' of git://github.com/sarjona/moodle
2021-04-16 07:57:01 +01:00
Jake Dallimore
64e24894f4
Merge branch 'master' of git://github.com/paulphillip5/moodle
2021-04-16 07:57:01 +01:00
Jake Dallimore
829b8b70c8
Merge branch 'MDL-71342-master-2' of git://github.com/junpataleta/moodle
2021-04-16 07:57:01 +01:00
Andrew Nicols
0dbcbbb452
Merge branch 'master_MDL-71254' of https://github.com/golenkovm/moodle
2021-04-16 07:57:01 +01:00
Andrew Nicols
1528661e68
Merge branch 'MDL-71186-master' of https://github.com/clransom/moodle
2021-04-16 07:57:01 +01:00
Víctor Déniz
95e9ccea79
Merge branch 'MDL-69331-master' of git://github.com/sarjona/moodle
2021-04-16 07:57:01 +01:00
Sara Arjona
0d29672cd7
Merge branch 'MDL-70269' of https://github.com/timhunt/moodle
2021-04-16 07:57:00 +01:00