100682 Commits

Author SHA1 Message Date
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
Eloy Lafuente (stronk7)
2d287b8adf MDL-71365 grunt: fix boost ignores order and missing LF @ EOF 2021-04-18 00:10:46 +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
Michael Hawkins
7ffc5a7160 MDL-71334 mod_lti: Fix manual activity completion behat test 2021-04-16 14:09:55 +08:00
Tien Nguyen
c51b77e48a MDL-48594 Report: More filtering options on Activity Completion Report 2021-04-16 10:22:16 +07:00
Jun Pataleta
daa9992215 MDL-71342 mod: Conditionally display activity info
* The activity information output component is still being displayed
even in the case when the activity does not have dates to show and
completion tracking is not enabled.
This also causes a horizontal line to be rendered in activity view pages
below the activity heading which does not serve much purpose when
there's no activity information to be shown.
The activity information output component should only be displayed
if there's completion information to show or if there are activty dates
to show. Otherwise, there's no need to render it.
2021-04-15 23:10:03 +08:00
Amaia Anabitarte
5af5368059 MDL-65553 core_analytics: Don't allow to flag predictions several times
Even if a prediction is hidden from the report once is flagged,
it can be flagged several times if the user visits detailed view via URL.
We remove the checkbox to select a prediction and flag it
once it has already been flagged.
2021-04-15 16:39:09 +02:00
Katie Ransom
d916cd77ca MDL-71186 core_user: show custom user fields in group management screens 2021-04-15 15:28:17 +01:00
Sara Arjona
bd572b2434 Merge branch 'MDL-71090' of git://github.com/paulholden/moodle 2021-04-15 11:56:40 +02:00
Sara Arjona
39263ddb62 MDL-69331 core_h5p: Add missing @core_h5p tag 2021-04-15 09:16:36 +02:00
Sara Arjona
f3d43c76bc MDL-69331 core_h5p: Add missing library files to behat tests
Some of the pre-existing behat tests were creating content into the
content bank using the generator but the H5P content-type libraries
weren't uploaded.
Since MDL-69331, libraries need to be deployed previously (so fake
H5P content-type won't be displayed if these libraries don't exist).
2021-04-15 09:16:36 +02:00
Sara Arjona
39fa45e299 MDL-69331 core_contentbank: Hide disabled H5P content-types
If a H5P content-type is disabled:
- The content bank won't display existing contents having it as a
main library.
- The content bank won't allow to create new contents using it.
2021-04-15 09:16:32 +02:00
Sara Arjona
dbfd4aebb5 MDL-69331 core_h5p: Only upgrade enabled libraries
The core\task\h5p_get_content_types_task task will only download
content-type for enabled libraries.
2021-04-15 09:03:56 +02:00
Sara Arjona
5308ba0947 MDL-69331 core_h5p: Display error when main library is disabled
H5P contents with the main library disabled won't be deployed; a
message error will be displayed instead of.
2021-04-15 09:03:56 +02:00