Adrian Greeve [Mon, 25 May 2020 23:48:53 +0000 (07:48 +0800)]
Merge branch 'MDL-68348-master-6' of git://github.com/mickhawkins/moodle
Sara Arjona [Mon, 25 May 2020 15:58:39 +0000 (17:58 +0200)]
Merge branch 'MDL-67386-master-fix' of github.com:sarjona/moodle
Sara Arjona [Mon, 25 May 2020 15:57:34 +0000 (17:57 +0200)]
MDL-67386 theme_boost: update latest CSS changes
Sara Arjona [Mon, 25 May 2020 15:46:41 +0000 (17:46 +0200)]
Merge branch 'MDL-67386-master' of git://github.com/bmbrands/moodle
Sara Arjona [Mon, 25 May 2020 15:11:03 +0000 (17:11 +0200)]
Merge branch 'MDL-68177-master_course_renderer_split_methods' of https://github.com/roland04/moodle
Mikel Martín [Tue, 28 Apr 2020 08:38:14 +0000 (10:38 +0200)]
MDL-68177 course: split course_info_box into different methods
Bas Brands [Tue, 19 May 2020 10:00:13 +0000 (12:00 +0200)]
MDL-67386 theme_boost: upgrade bootstrap to version 4.5.0
Sara Arjona [Mon, 25 May 2020 13:47:44 +0000 (15:47 +0200)]
Merge branch 'MDL-68819-master' of git://github.com/lucaboesch/moodle
Andrew Nicols [Mon, 25 May 2020 11:55:11 +0000 (19:55 +0800)]
Merge branch 'MDL-68103-master' of git://github.com/bmbrands/moodle
Bas Brands [Wed, 15 Apr 2020 11:51:46 +0000 (13:51 +0200)]
MDL-68103 theme_classic: show content full width when printing
Andrew Nicols [Mon, 25 May 2020 11:10:21 +0000 (19:10 +0800)]
Merge branch 'MDL-68549' of https://github.com/HuongNV13/moodle
Michael Hawkins [Thu, 30 Apr 2020 06:13:47 +0000 (14:13 +0800)]
MDL-68348 user: Added filterset joins unit testing
Michael Hawkins [Fri, 24 Apr 2020 08:20:45 +0000 (16:20 +0800)]
MDL-68348 user: Added other logical operators to filter unit tests
Michael Hawkins [Tue, 28 Apr 2020 08:40:57 +0000 (16:40 +0800)]
MDL-68348 user: User filter match types support - enrol method & status
Completed support for all join types (any/all/none) for enrolment
method and status filtering. This includes handling forced status
filtering where a user does not have the capability to view suspended
users, as well as handling front page (whole site) participants page.
Michael Hawkins [Thu, 23 Apr 2020 13:31:27 +0000 (21:31 +0800)]
MDL-68348 lib: User filter match types support - groups
Updated groups_get_members_join to support different filter match types
Michael Hawkins [Wed, 8 Apr 2020 10:19:13 +0000 (18:19 +0800)]
MDL-68348 user: User filter match types support - keywords/last access
The last access implementation also fixes an existing bug,
where it was assumed never accessed would be 0, when it also needed to
handle null to return correct results. Related userlib unit tests also
updated to reflect this, as well as some incorrect comment wording.
Michael Hawkins [Fri, 24 Apr 2020 11:59:32 +0000 (19:59 +0800)]
MDL-68348 lib: Added create_user_course_lastaccess generator
This creates a last access record for a user within a course.
It is requires for testing accesssince participants filtering.
Michael Hawkins [Wed, 8 Apr 2020 09:11:52 +0000 (17:11 +0800)]
MDL-68348 user: User filter match types support - filterset and roles
Michael Hawkins [Wed, 20 May 2020 08:58:41 +0000 (16:58 +0800)]
MDL-68348 lib: Default filters to match ALL for backwards compatibility
Temporarily defaulting filtersets and their filters to join type ALL
for backwards compatibility, so the existing participants unified
filter continues to function consistently. This will be reverted once
the new participants filter UI replaces the existing unified filter.
Sara Arjona [Mon, 25 May 2020 09:57:39 +0000 (11:57 +0200)]
Merge branch 'MDL-68248-master' of https://github.com/DinhHien0307/moodle
Nick Phillips [Wed, 4 Mar 2020 03:16:41 +0000 (16:16 +1300)]
MDL-68103 theme_classic: hidden-print => d-print-none for BS4.
Sara Arjona [Mon, 25 May 2020 09:37:41 +0000 (11:37 +0200)]
Merge branch 'MDL-68448-master-fix' of github.com:sarjona/moodle
Sara Arjona [Mon, 25 May 2020 09:35:15 +0000 (11:35 +0200)]
MDL-68448 h5pactivity: remove illegal whitespaces
Sara Arjona [Mon, 25 May 2020 08:56:18 +0000 (10:56 +0200)]
Merge branch 'MDL-68448-master' of git://github.com/cescobedo/moodle
Adrian Greeve [Mon, 25 May 2020 08:14:54 +0000 (16:14 +0800)]
Merge branch 'MDL-68629_master' of https://github.com/t-schroeder/moodle
Jake Dallimore [Mon, 25 May 2020 08:11:55 +0000 (16:11 +0800)]
Merge branch 'MDL-62853' of https://github.com/paulholden/moodle
Andrew Nicols [Mon, 25 May 2020 07:23:37 +0000 (15:23 +0800)]
Merge branch 'MDL-68658' of https://github.com/stronk7/moodle
cescobedo [Thu, 21 May 2020 19:13:37 +0000 (21:13 +0200)]
MDL-68448 mod_h5pactivity: Add new ws get_h5pactivities_by_courses
This WS is required by the Moodle app in order to fetch
the activity information for displaying it to app users.
cescobedo [Thu, 21 May 2020 19:12:38 +0000 (21:12 +0200)]
MDL-68448 core_h5p: Add get export information to helper
Create a new method in the helper to use in the player,
in the external WS and in the API. Also, add a
new method in API to help to get export information
by other WS.
Adrian Greeve [Mon, 25 May 2020 06:40:14 +0000 (14:40 +0800)]
Merge branch 'MDL-63812' of https://github.com/timhunt/moodle
Jake Dallimore [Mon, 25 May 2020 03:36:48 +0000 (11:36 +0800)]
Merge branch 'MDL-68567-master' of git://github.com/sarjona/moodle
Luca Bösch [Sun, 24 May 2020 19:50:33 +0000 (21:50 +0200)]
MDL-68819 core_contentbank: "Upload" button is not localized.
Sara Arjona [Fri, 22 May 2020 15:55:23 +0000 (17:55 +0200)]
Merge branch 'MDL-68592-master' of https://github.com/kabalin/moodle
Sara Arjona [Fri, 22 May 2020 15:49:32 +0000 (17:49 +0200)]
Merge branch 'MDL-68619-master' of git://github.com/ferranrecio/moodle
Eloy Lafuente (stronk7) [Sun, 10 May 2020 14:54:14 +0000 (16:54 +0200)]
MDL-68658 phpunit: Ensure that the configured proxy is applied always
Previously, if the RSS feed (extests) was being served locally,
CFG->proxybypass was applied and causing the test to fail (proxy
ignored).
In that exact test we need the configured proxy to be applied
always, because the test is exaclty about detecting the problem
when a wrong proxy is used.
Victor Deniz Falcon [Fri, 22 May 2020 13:21:37 +0000 (14:21 +0100)]
weekly release 3.9dev+
Victor Deniz Falcon [Fri, 22 May 2020 13:21:32 +0000 (14:21 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Jake Dallimore [Fri, 22 May 2020 07:10:04 +0000 (15:10 +0800)]
Merge branch 'MDL-68367-master-fix' of git://github.com/junpataleta/moodle
Sara Arjona [Thu, 30 Apr 2020 20:18:54 +0000 (22:18 +0200)]
MDL-68567 badges: add/remove site backpacks
Jun Pataleta [Fri, 22 May 2020 06:45:05 +0000 (14:45 +0800)]
MDL-68367 qtype_multichoice: Decrease minimum expected export file size
* Exporting via Oracle trims trailing zeroes in floating numbers which
results to a smaller file size for the exported file. Better to reduce
the minimum expected export file size from 4000 bytes to 3900 bytes.
Andrew Nicols [Fri, 22 May 2020 03:53:22 +0000 (11:53 +0800)]
Merge branch '68137-master-prevent-removing-all-dots-in-filename' of https://github.com/DSI-Universite-Rennes2/moodle
Jake Dallimore [Fri, 22 May 2020 03:52:31 +0000 (11:52 +0800)]
Merge branch 'MDL-68143-master' of https://github.com/HuongNV13/moodle
Jun Pataleta [Fri, 22 May 2020 03:50:53 +0000 (11:50 +0800)]
Merge branch 'MDL-65796' of https://github.com/paulholden/moodle
Andrew Nicols [Fri, 22 May 2020 03:37:38 +0000 (11:37 +0800)]
Merge branch 'MDL-57240' of https://github.com/timhunt/moodle
Andrew Nicols [Fri, 22 May 2020 03:32:01 +0000 (11:32 +0800)]
Merge branch 'MDL-68446' of https://github.com/timhunt/moodle
Andrew Nicols [Fri, 22 May 2020 03:21:47 +0000 (11:21 +0800)]
Merge branch 'MDL-68783-master' of git://github.com/junpataleta/moodle
Andrew Nicols [Fri, 22 May 2020 03:12:46 +0000 (11:12 +0800)]
Merge branch 'MDL-68661-rebase' of https://github.com/Chocolate-lightning/moodle
Jun Pataleta [Fri, 22 May 2020 03:06:16 +0000 (11:06 +0800)]
Merge branch 'MDL-68508-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Fri, 22 May 2020 02:51:31 +0000 (10:51 +0800)]
Merge branch 'MDL-67700-master' of git://github.com/ferranrecio/moodle
Andrew Nicols [Fri, 24 Apr 2020 08:08:45 +0000 (16:08 +0800)]
MDL-68508 core_table: Improve sorting to support sorting by multiple columns
Jake Dallimore [Fri, 22 May 2020 02:35:27 +0000 (10:35 +0800)]
Merge branch 'MDL-58645-master' of https://github.com/HuongNV13/moodle
Mathew May [Mon, 18 May 2020 05:25:45 +0000 (13:25 +0800)]
MDL-68661 core_lang: Roll back addresourceoractivity
Andrew Nicols [Fri, 22 May 2020 01:21:21 +0000 (09:21 +0800)]
MDL-68493 contentbank: Whitespace fixes
Andrew Nicols [Fri, 22 May 2020 01:04:57 +0000 (09:04 +0800)]
Merge branch 'MDL-68493-master' of git://github.com/bmbrands/moodle
Eloy Lafuente (stronk7) [Fri, 22 May 2020 00:15:03 +0000 (02:15 +0200)]
Merge branch 'MDL-65306-resourceid-onecommit' of https://github.com/cengage/moodle
Victor Deniz Falcon [Thu, 21 May 2020 21:28:32 +0000 (22:28 +0100)]
Merge branch 'MDL-39571-Master' of git://github.com/tuanngocnguyen/moodle
David Mudrák [Tue, 19 May 2020 21:01:16 +0000 (23:01 +0200)]
MDL-68738 wiki: Prevent URLs inside links from turning into another link
There was a problem with wiki pages in the HTML markup syntax. If they
contain a link and the link text has a URL in it, that URL was converted
into another link. But it was not correctly nested and it caused
additional troubles with filters (particularly the multimedia filter if
the URL was a video such as on youtube).
The solution here is similar to what we do in filters. We protect the
whole explicit link so that its content is not further parsed. That
prevents the inner URL to be converted into another link and the
explicit link has the full control.
Sara Arjona [Thu, 21 May 2020 17:00:01 +0000 (19:00 +0200)]
Merge branch 'master_MDL-67497' of https://github.com/danmarsden/moodle
Ferran Recio [Fri, 8 May 2020 11:18:21 +0000 (13:18 +0200)]
MDL-68619 mod_h5pactivity: add results report webservice
Ferran Recio [Thu, 21 May 2020 16:06:29 +0000 (18:06 +0200)]
MDL-68619 mod_h5pactivity: add activity check to get_attempt method
Ferran Recio [Thu, 21 May 2020 13:26:52 +0000 (15:26 +0200)]
MDL-67700 message: prevent async loading conversation message mix
Sara Arjona [Thu, 21 May 2020 15:33:12 +0000 (17:33 +0200)]
Merge branch 'MDL-66471' of https://github.com/paulholden/moodle
Andrew Nicols [Thu, 21 May 2020 12:30:13 +0000 (20:30 +0800)]
Merge branch 'MDL-68439-master' of https://github.com/HuongNV13/moodle
Sara Arjona [Thu, 21 May 2020 11:34:59 +0000 (13:34 +0200)]
Merge branch 'MDL-67126_master' of https://github.com/ffhs/moodle
Ferran Recio [Thu, 7 May 2020 15:52:25 +0000 (17:52 +0200)]
MDL-68619 mod_h5pactivity: correcting content generator
Huong Nguyen [Tue, 28 Apr 2020 10:13:57 +0000 (17:13 +0700)]
MDL-68439 qtype_ddwtos: UI issues
- Fixed cursor for dropped ddwtos
- Fixed the animation of "flying back to the home position" starts off at the right end of the previous line"
Jun Pataleta [Thu, 21 May 2020 09:10:16 +0000 (17:10 +0800)]
Merge branch 'MDL-68367' of https://github.com/mkassaei/moodle
Mahmoud Kassaei [Tue, 14 Apr 2020 09:36:19 +0000 (10:36 +0100)]
MDL-68367 Question: Multi-choice Option to hide systemtext
Sara Arjona [Thu, 21 May 2020 06:30:31 +0000 (08:30 +0200)]
Merge branch 'MDL-68451-master' of git://github.com/cescobedo/moodle
Jun Pataleta [Thu, 21 May 2020 06:26:54 +0000 (14:26 +0800)]
Merge branch 'MDL-68568-master' of git://github.com/junpataleta/moodle
Sara Arjona [Thu, 21 May 2020 06:23:46 +0000 (08:23 +0200)]
Merge branch 'MDL-68782-master' of git://github.com/aanabit/moodle
Adrian Greeve [Thu, 21 May 2020 00:37:52 +0000 (08:37 +0800)]
Merge branch 'MDL-68733' of https://github.com/timhunt/moodle
AMOS bot [Thu, 21 May 2020 00:07:15 +0000 (00:07 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Wed, 20 May 2020 22:51:10 +0000 (00:51 +0200)]
Merge branch 'MDL-52578-master' of git://github.com/junpataleta/moodle
Eloy Lafuente (stronk7) [Wed, 20 May 2020 22:45:34 +0000 (00:45 +0200)]
Merge branch 'MDL-66992-master' of https://github.com/tungthai/moodle
Amaia Anabitarte [Wed, 20 May 2020 10:42:11 +0000 (12:42 +0200)]
MDL-68782 core_contentbank: Improving event unit tests
cescobedo [Wed, 20 May 2020 16:50:21 +0000 (18:50 +0200)]
MDL-68451 mod_h5pactivity: Add info attempts in check_updates_since
Add updates information related to attempts in check_updates_since
because they may affect the user or the information displayed
in the app.
Jun Pataleta [Wed, 20 May 2020 16:18:52 +0000 (00:18 +0800)]
MDL-68568 editor_atto: Upgrade step for the new toolbar default layout
* emojipicker added to files
* indent moved to list
Mike Churchward [Thu, 30 Apr 2020 17:20:50 +0000 (13:20 -0400)]
MDL-68568 editor-atto: Move 'indent' next to 'lists' by default.
Víctor Déniz Falcón [Wed, 20 May 2020 14:54:14 +0000 (15:54 +0100)]
Merge branch 'MDL-67183' of git://github.com/timhunt/moodle
Sara Arjona [Wed, 20 May 2020 14:32:36 +0000 (16:32 +0200)]
Merge branch 'MDL-68617-master' of git://github.com/ferranrecio/moodle
Ferran Recio [Fri, 8 May 2020 07:35:41 +0000 (09:35 +0200)]
MDL-68617 mod_h5pactivity: add attempts report webservice
Bas Brands [Wed, 20 May 2020 09:42:55 +0000 (11:42 +0200)]
MDL-68493 core_contentbank: implement list view
Sara Arjona [Wed, 20 May 2020 10:58:37 +0000 (12:58 +0200)]
Merge branch 'MDL-68780' of https://github.com/stronk7/moodle
Amaia Anabitarte [Wed, 20 May 2020 07:25:07 +0000 (09:25 +0200)]
MDL-68782 core_contentbank: Fixing undefined variable error
Ferran Recio [Fri, 8 May 2020 07:34:29 +0000 (09:34 +0200)]
MDL-68617 mod_h5pactivity: add attempt info to generator
Sara Arjona [Wed, 20 May 2020 09:47:27 +0000 (11:47 +0200)]
Merge branch 'MDL-68778-master' of git://github.com/andrewnicols/moodle
Jun Pataleta [Wed, 20 May 2020 09:35:08 +0000 (17:35 +0800)]
Merge branch 'MDL-58866-master-2' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 19 May 2020 21:48:13 +0000 (23:48 +0200)]
MDL-68780 unit tests: Add missing ->destroy() calls to controllers
Every backup and restore controller always need to call
to their ->destroy() method in charge of finalizing loggers,
closing file handlers and destroy some circular references.
This is specially important within unit tests, because
open resources cannot be reset between tests, causing problems,
specially within Windows that locks all those files.
Adrian Greeve [Wed, 20 May 2020 08:52:17 +0000 (16:52 +0800)]
Merge branch 'MDL-68662' of https://github.com/Chocolate-lightning/moodle
Andrew Nicols [Wed, 20 May 2020 08:50:37 +0000 (16:50 +0800)]
Merge branch 'MDL-68577-redis-lock-tuning' of https://github.com/brendanheywood/moodle
Marina Glancy [Wed, 20 May 2020 08:38:12 +0000 (10:38 +0200)]
MDL-58866 core_calendar: deprecation warning in upgrade.txt
Mathew May [Wed, 13 May 2020 03:14:56 +0000 (11:14 +0800)]
MDL-68662 core_course: Add new tabs to the chooser
We now have two more tabs in the chooser.
Activities & Resources aer now offered in different tabs.
Andrew Nicols [Wed, 20 May 2020 00:47:02 +0000 (08:47 +0800)]
MDL-68778 user: Add bulk action pendingjs checks
Brendan Heywood [Sat, 2 May 2020 15:23:32 +0000 (01:23 +1000)]
MDL-68577 session: Fine tune the redis lock polling
Adrian Greeve [Wed, 20 May 2020 05:17:58 +0000 (13:17 +0800)]
Merge branch 'MDL-68333-master' of git://github.com/marinaglancy/moodle
Andrew Nicols [Wed, 20 May 2020 00:47:02 +0000 (08:47 +0800)]
MDL-68778 user: Fetch select from selected option
It seems that the HTMLSelectElement behaves slightly different on Linux
vs MacOS.
On Linux with Firefox 47 when selecting an option the
HTMLOptionElement is returned, whereas on MavOS the HTMLSelectElement
that the Option belongs to is returned.
We need to normalise the value here before resetting the currently
selected item.
Jun Pataleta [Wed, 20 May 2020 03:15:22 +0000 (11:15 +0800)]
MDL-68783 core_grades: Fix outcome page's add/remove button styles
* Applied proper styles of btn-secondary.
* Added some vertical spacing between the buttons by enclosing them in
divs with 'm-y-1' class instead of just a br tag.
Nathan Nguyen [Fri, 17 Apr 2020 03:10:26 +0000 (13:10 +1000)]
MDL-39571 repository_recent: query improvement
Nathan Nguyen [Fri, 17 Apr 2020 03:08:22 +0000 (13:08 +1000)]
MDL-39571 repository_recent: add unit test