Commit graph

100521 commits

Author SHA1 Message Date
Paul Holden
e64eae866e MDL-71127 mod_quiz: fix thrown exception for invalid question columns. 2021-04-19 09:07:06 +01: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
Jun Pataleta
03f21e4cc0 Merge branch 'MDL-48594-311' of https://github.com/nguyenphuctien/moodle into MOODLE_311_STABLE 2021-04-16 08:06:23 +01:00
Andrew Nicols
c0db4805df Merge branch 'MDL-60490-missing_close_div-311' of https://github.com/leonstr/moodle into MOODLE_311_STABLE 2021-04-16 08:06:22 +01:00
Andrew Nicols
28d07f3373 Merge branch 'MDL-69415-311' of git://github.com/sarjona/moodle into MOODLE_311_STABLE 2021-04-16 08:06:22 +01:00
Paul Phillips
11a15b8b9c MDL-71167 mod_scorm: use full url in redirect 2021-04-16 08:06:22 +01:00
Jake Dallimore
a7061af4fb Merge branch 'MDL-71342-311-2' of git://github.com/junpataleta/moodle into MOODLE_311_STABLE 2021-04-16 08:06:22 +01:00
Andrew Nicols
e1eff84dd2 Merge branch 'MOODLE_311_MDL-71254' of https://github.com/golenkovm/moodle into MOODLE_311_STABLE 2021-04-16 08:06:22 +01:00
Andrew Nicols
6d6a57dda9 Merge branch 'MDL-71186-m311' of https://github.com/clransom/moodle into MOODLE_311_STABLE 2021-04-16 08:06:22 +01:00
Víctor Déniz
9976bacec2 Merge branch 'MDL-69331-311' of git://github.com/sarjona/moodle into MOODLE_311_STABLE 2021-04-16 08:06:21 +01:00
Sara Arjona
4fcc06b43e Merge branch 'MDL-70269_311' of https://github.com/timhunt/moodle into MOODLE_311_STABLE 2021-04-16 08:06:21 +01:00
Tien Nguyen
5ad8101553 MDL-48594 Report: More filtering options on Activity Completion Report 2021-04-16 10:07:06 +07:00
Jun Pataleta
91170558ac 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:42 +08:00
Katie Ransom
b4fdc7c1b0 MDL-71186 core_user: show custom user fields in group management screens 2021-04-15 15:30:54 +01:00
Sara Arjona
cf42280164 Merge branch 'MDL-71090-311' of git://github.com/paulholden/moodle into MOODLE_311_STABLE 2021-04-15 11:56:46 +02:00
Sara Arjona
d3b93906d5 MDL-69331 core_h5p: Add missing @core_h5p tag 2021-04-15 09:33:02 +02:00
Sara Arjona
d0d7fc835e 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:33:02 +02:00
Sara Arjona
8a81d74244 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:32:58 +02:00
Sara Arjona
73a7133ef8 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:31:36 +02:00
Sara Arjona
be7143381f 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:31:36 +02:00
Sara Arjona
dc77f13dab MDL-69331 core_h5p: Add enabled field to libraries
The "enabled" field has been added to the H5P libraries to let
admins decide whether a library should be used or not in the site.
2021-04-15 09:31:36 +02:00
Jake Dallimore
c78aa10409 Merge branch 'MDL-71338-311' of git://github.com/paulholden/moodle into MOODLE_311_STABLE 2021-04-15 14:42:25 +08:00
Sara Arjona
a1ce0a96d2 Merge branch 'MDL-71337-311' of git://github.com/junpataleta/moodle into MOODLE_311_STABLE 2021-04-15 08:30:14 +02:00
Jake Dallimore
d839e4f941 Merge branch 'MDL-61768-311-3' of git://github.com/mihailges/moodle into MOODLE_311_STABLE 2021-04-15 14:16:40 +08:00
abgreeve
dfda0b1c19 Merge branch 'MDL-71007-courseidnumer-grade-ws-MOODLE_311_STABLE' of https://github.com/brendanheywood/moodle into MOODLE_311_STABLE 2021-04-15 13:47:02 +08:00
Jun Pataleta
4c5d70b586 MDL-71337 mod_h5pactivity: Increase window size during test
The addition of the activity information moves the h5p content down
out of the window view on Firefox which causes the Check button to be
unclickable. This patch increases the window size to ensure that the
check button is visible and clickable.

Credits to Eloy <stronk7@moodle.org> for the thorough investigation
of the root cause of this issue :)
2021-04-15 12:45:56 +08:00
Mihail Geshoski
17bf8a2ef3 MDL-61768 repository_googledocs: Deprecate unused methods
Deprecates methods from the repository_googledocs class which are
no longer used.
2021-04-15 12:43:00 +08:00
Mihail Geshoski
598a072922 MDL-61768 repository_googledocs: Add unit tests
Adds unit tests for the newly introduced methods related to the content
browsing and searching functionallity across drives.
2021-04-15 12:43:00 +08:00
Mihail Geshoski
bded723306 MDL-61768 repository_googledocs: Support shared drives
Enables the Google Drive repository to support browsing and searching
for content from the existing shared drives.
2021-04-15 12:42:58 +08:00
Mihail Geshoski
2950a9a024 MDL-61768 repository_googledocs: Rest API function to list shared drives
Adds a new rest API function in the googledocs repository which would
return the existing shared drives.
2021-04-15 12:41:41 +08:00
Jake Dallimore
38a54270c7 Merge branch 'MDL-70142-311' of git://github.com/paulholden/moodle into MOODLE_311_STABLE 2021-04-15 10:35:49 +08:00
Andrew Nicols
dd62d97a1a Merge branch 'MDL-70311-311' of git://github.com/ilyatregubov/moodle into MOODLE_311_STABLE 2021-04-15 09:19:50 +08:00
Jake Dallimore
946d0ea0cf Merge branch 'MDL-70649-M311' of https://github.com/xuangui2018/moodle into MOODLE_311_STABLE 2021-04-15 08:39:08 +08:00
Jake Dallimore
52f8e4001c Merge branch 'MDL-71119-311' of git://github.com/sarjona/moodle into MOODLE_311_STABLE 2021-04-15 08:32:04 +08:00
AMOS bot
7da38579f6 Automatically generated installer lang files 2021-04-15 00:07:38 +00:00
Paul Holden
5138937e79 MDL-71338 tool_usertours: correct Content-Type on tour export.
Replace existing code with standard file serving mechanism, in
turn correcting the previously incorrect Content-Type header.
2021-04-14 21:11:53 +01:00
Eloy Lafuente (stronk7)
d1b2b063c9 Merge branch 'MDL-67999-311' of git://github.com/sarjona/moodle into MOODLE_311_STABLE 2021-04-14 19:30:24 +02:00
Sara Arjona
b199ebd0d5 MDL-67999 contentbank: Remove contentbank/upload.php
As the form to upload files to the content bank has been moved to
modal, this file is not required any more, so it has been removed.
2021-04-14 18:10:32 +02:00
Sara Arjona
03ab4546ed MDL-67999 contentbank: Make upload/replace files modal form
Once MDL-64554 landed, content bank can implement the original
proposal, using a modal form when uploading files.
2021-04-14 18:10:32 +02:00
Sara Arjona
eb8c1fce66 MDL-67999 core_contentbank: Add namespace to upload form
The form to upload/replace files has been moved to classes/form
(it's where it should have been added when it was created).
Besides, this class has been renamed because now, with the
namespace, contentbank and form don't need to be in the name ;-)
2021-04-14 18:10:32 +02:00
Xuan Gui
a32c076d0b MDL-70649 files: Alternative security helper
Augment all installed plugin's security helper if there is any.
Plugins function has to be defined as plugintype_pluginname_security_helper in pluginname/lib.php file.
2021-04-14 21:25:12 +10:00
Eloy Lafuente (stronk7)
e0d45a6bc2 Merge branch 'MDL-70616-311-fix' of https://github.com/izendegi/moodle into MOODLE_311_STABLE 2021-04-14 12:45:11 +02:00
Iñigo Zendegi
a8d4abf091 MDL-70616 gradingform_rubric: Filters not applied to rubric name 2021-04-14 11:52:16 +02:00
Sara Arjona
f58c70ebd5 MDL-71119 core_badges: Add more information to errors
Some errors raised when calling external services were ignored.
Displaying this information helps to debug and find the real reasons
why some action, like connecting to an external backpack, can't be
done.
2021-04-14 10:56:00 +02:00
Sara Arjona
1fdf3adf51 MDL-71119 core_badges: Use basicauth and remove urlencode
Basic authorization header is required to get token. Besides, client
id and secret shouldn't call urlencode.
2021-04-14 10:55:59 +02:00
Sara Arjona
7dd480dde2 MDL-71119 core_badges: Initialise scopes param in backpack-connect.php
The scopes parameter should be passed when creating the OAuth2 badges
client. As it is an optional parameter, when it's empty, it will
be initilised with the supported scopes for the backpack issuer.

It will happen, for instance, when a call is done to oauth2callback.php
because, as defined in RFC6749, OAuth2 authorization response only
supports code and state.
2021-04-14 10:55:59 +02:00
Jun Pataleta
0ff857ca81 Merge branch 'MDL-71315-311' of git://github.com/sarjona/moodle into MOODLE_311_STABLE 2021-04-14 16:50:49 +08:00