27392 Commits

Author SHA1 Message Date
Sara Arjona
20bbb473cf Merge branch 'MDL-68667-master' of git://github.com/aanabit/moodle 2020-05-27 12:26:46 +02:00
Víctor Déniz Falcón
75f58cbfa2 MDL-67810 core_contentbank: added dropdown menu to create content 2020-05-27 10:27:13 +01:00
David Mudrák
2615e429f4 MDL-68753 lang: Remove a redundant okay string and use "OK" everywhere
The "Ok" (with lower-case "k") string was added in MDL-68409 to keep
backwards compatibility with YUI alerts that had it hard-coded. But we
should not need to explain to translators why we have two OK strings
like this and why they use different wording.

Additionally, there would be inconsistency in Behat tests and everywhere
depending on which "OK" or "Ok" string is used for buttons.

So instead, this patch changes the hard-coded 'Ok' string in the YUI and
we should stick to "OK" from now on everywhere.
2020-05-27 09:59:44 +02:00
Sara Arjona
3d0541c03a Merge branch 'MDL-68758-master' of git://github.com/peterRd/moodle 2020-05-27 09:46:47 +02:00
Jun Pataleta
d5eec2a2fd Merge branch 'MDL-67743-master-final' of git://github.com/andrewnicols/moodle 2020-05-27 14:51:25 +08:00
Peter Dias
31788c8cf2 MDL-68758 core_repository: Allow ability to download files on all views. 2020-05-27 14:20:15 +08:00
Jake Dallimore
0fbc2c11f5 Merge branch 'MDL-67874-master' of git://github.com/bmbrands/moodle 2020-05-27 13:54:51 +08:00
Andrew Nicols
04ce665a98 Merge branch 'MDL-68765-master' of https://github.com/ised-isde-canada/moodle 2020-05-27 12:49:39 +08:00
Andrew Nicols
28bff4cff4 Merge branch 'master_MDL-68054' of https://github.com/danmarsden/moodle 2020-05-27 12:12:27 +08:00
Andrew Nicols
c4bd1858db MDL-67743 table: Sort direction is an integer 2020-05-27 11:16:24 +08:00
Jun Pataleta
039fc86902 Merge branch 'MDL-68750-master' of git://github.com/andrewnicols/moodle 2020-05-27 11:03:54 +08:00
Adrian Greeve
6f17ec9181 Merge branch 'MDL-68788' of https://github.com/Chocolate-lightning/moodle 2020-05-27 10:55:20 +08:00
Bas Brands
6881ca38d7 MDL-68259 user: add styling to participant filters
Part of MDL-67743
2020-05-27 10:49:44 +08:00
Andrew Nicols
110f3ebf54 MDL-68169 user: Limit the number of filter conditions
Part of MDL-67743
2020-05-27 10:49:44 +08:00
Andrew Nicols
1be0f90c6f MDL-67917 core: Add custom template support to autocomplete
Part of MDL-67743
2020-05-27 10:49:43 +08:00
Andrew Nicols
f456195599 MDL-67917 core: Return newly added nodes from template helpers
Part of MDL-67743
2020-05-27 10:49:43 +08:00
Tom Dickman
2228ca31a2 MDL-66911 core files: Add license help to file selector
This improvement adds a help icon to the 'Choose license' option
providing links to further information on each license.
Utilise templates for license links to avoid code reuse.
2020-05-27 08:36:48 +10:00
Eloy Lafuente (stronk7)
08c6eca7e9 Merge branch 'MDL-68789-master' of git://github.com/crazyserver/moodle 2020-05-26 23:43:05 +02:00
Eloy Lafuente (stronk7)
60fe1f8c9d MDL-68388 core_grades: Tweak unit test assertion to make Oracle happy
Also modify some comments and get rid of some void return types.
2020-05-26 19:00:24 +02:00
Bas Brands
91de0ed823 MDL-67874 theme_boost: make focus outline accessible 2020-05-26 09:54:12 +02:00
Andrew Nicols
89db84b5b1 MDL-68750 core_tag: Add missing confirmation dialogue title 2020-05-26 12:55:29 +08:00
Andrew Nicols
8985c478ce MDL-68750 behat: Correct dialogue selector 2020-05-26 12:55:29 +08:00
Jun Pataleta
8aa0f2c4d8 Merge branch 'MDL-45184-master' of git://github.com/junpataleta/moodle 2020-05-26 12:39:24 +08:00
Adrian Greeve
b2978c1787 Merge branch 'MDL-68757' of https://github.com/timhunt/moodle 2020-05-26 10:33:03 +08:00
Andrew Nicols
17238ab079 MDL-68388 grade: Tidy comments and whitespace 2020-05-26 10:15:52 +08:00
Andrew Nicols
a7aaf91855 Merge branch 'MDL-68388' of https://github.com/marcusboon/moodle 2020-05-26 10:11:08 +08:00
Tom Dickman
4399e4759a MDL-45184 tool_licenses: Add custom licenses
This feature adds an admin tool for creating custom licenses.
Now custom licenses can be added and amended in Moodle, and the site
default can be set to a custom license.

Core licenses remain hard-coded and are uneditable, so they will always
require update within Moodle core updates, and maintain their
internationalisation through core language strings.

This also includes fundamental changes to the license API including
the addition of license caching and deprecation of no longer required
admin settings for license management.
2020-05-26 12:08:05 +10:00
Andrew Nicols
ecf526566a Merge branch 'MDL-64427' of https://github.com/NeillM/moodle 2020-05-26 10:04:51 +08:00
Andrew Nicols
7d02452504 Merge branch 'MDL-67547' of https://github.com/paulholden/moodle 2020-05-26 08:06:39 +08:00
Andrew Nicols
1a3a864a4a Merge branch 'MDL-68270-master' of git://github.com/bmbrands/moodle 2020-05-26 08:02:50 +08:00
Victor Deniz Falcon
a735d4d1d4 Merge branch 'MDL-68252' of https://github.com/timhunt/moodle 2020-05-26 00:55:02 +01:00
Paul Holden
233a51ad21 MDL-67547 dataformat_pdf: method to convert images to supported format.
For Dataformats that support exporting HTML content, provide an API for
converting images within that content to something suitable for the format.

This fixes an issue with the PDF writer when it encountered a pluginfile.php
image, which it tried to request via HTTP without an active session. This
resulted in a 303 header returned by Moodle instead of the actual image,
causing an exception in the underlying TCPDF library.
2020-05-26 00:54:27 +01:00
Adrian Greeve
ef17275726 Merge branch 'MDL-68348-master-6' of git://github.com/mickhawkins/moodle 2020-05-26 07:48:53 +08:00
Marcus Boon
f1f5ba36ad MDL-68388 core_grades: Use MUC for grade letters
In the get_grade_letters there is a static variable that is used
to cache grade letters, we should use MUC for this so that it is
reset properly between unit tests.
2020-05-26 09:06:50 +10:00
Amaia Anabitarte
f9d2635f7f MDL-68667 core_contentbank: Fix content generator to use filename 2020-05-25 18:44:53 +02:00
Sara Arjona
028d43b37d Merge branch 'MDL-67386-master' of git://github.com/bmbrands/moodle 2020-05-25 17:46:41 +02:00
Bas Brands
f0947b944c MDL-68270 core_output: prevent blurring of navbar logo 2020-05-25 15:48:52 +02:00
Bas Brands
6a4ce7b0a3 MDL-67386 theme_boost: upgrade bootstrap to version 4.5.0 2020-05-25 15:48:17 +02:00
Pau Ferrer Ocaña
a87aa36ad9 MDL-68789 behat: Change app page menu text selector 2020-05-25 14:53:18 +02:00
Michael Hawkins
03397c817b MDL-68348 lib: User filter match types support - groups
Updated groups_get_members_join to support different filter match types
2020-05-25 18:35:08 +08:00
Michael Hawkins
4157e2d4f3 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.
2020-05-25 18:10:53 +08:00
Michael Hawkins
3f069a2c48 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.
2020-05-25 18:10:53 +08:00
Andrew Nicols
d3503c76b4 Merge branch 'MDL-68658' of https://github.com/stronk7/moodle 2020-05-25 15:23:37 +08:00
Jake Dallimore
4404ced7f7 Merge branch 'MDL-68567-master' of git://github.com/sarjona/moodle 2020-05-25 11:36:48 +08:00
Sara Arjona
968016a38d Merge branch 'MDL-68592-master' of https://github.com/kabalin/moodle 2020-05-22 17:55:23 +02:00
Eloy Lafuente (stronk7)
200570558d 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.
2020-05-22 17:07:05 +02:00
Pau Ferrer Ocaña
9afc6b78c3 MDL-68789 behat: Adapt login step to new app version 2020-05-22 16:17:29 +02:00
Sara Arjona
a80541ea90 MDL-68567 badges: add/remove site backpacks 2020-05-22 09:01:59 +02:00
Andrew Nicols
cc29e04f27 Merge branch '68137-master-prevent-removing-all-dots-in-filename' of https://github.com/DSI-Universite-Rennes2/moodle 2020-05-22 11:53:22 +08:00
Jun Pataleta
929bb27c21 Merge branch 'MDL-68508-master' of git://github.com/andrewnicols/moodle 2020-05-22 11:06:16 +08:00