mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-12 11:49:49 +01:00
Code Issues Projects Releases Wiki Activity
100,643 Commits 36 Branches 523 Tags
Commit Graph

100643 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Sara Arjona
d3d3b3bdc0 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:03:56 +02:00
Jake Dallimore
a83dd7dd43 Merge branch 'MDL-71338' of git://github.com/paulholden/moodle 2021-04-15 14:42:10 +08:00
Sara Arjona
e82e8b4b1c Merge branch 'MDL-71337-master' of git://github.com/junpataleta/moodle 2021-04-15 08:30:08 +02:00
Jake Dallimore
a807361422 Merge branch 'MDL-61768-master-3' of git://github.com/mihailges/moodle 2021-04-15 14:16:04 +08:00
abgreeve
965a7fd357 Merge branch 'MDL-71007-courseidnumer-grade-ws' of https://github.com/brendanheywood/moodle 2021-04-15 13:48:39 +08:00
Jun Pataleta
18ad675111 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:44:31 +08:00
Mihail Geshoski
5f4bdefc54 MDL-61768 repository_googledocs: Deprecate unused methods 
Deprecates methods from the repository_googledocs class which are
no longer used.
 2021-04-15 12:40:32 +08:00
Mihail Geshoski
6528181e72 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:40:32 +08:00
Mihail Geshoski
54a850640d 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:40:32 +08:00
Mihail Geshoski
241e778ca7 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 11:06:11 +08:00
Jake Dallimore
e845a21a64 Merge branch 'MDL-70142' of git://github.com/paulholden/moodle 2021-04-15 10:35:33 +08:00
Andrew Nicols
b1975b002c Merge branch 'MDL-70311-master' of git://github.com/ilyatregubov/moodle 2021-04-15 09:19:24 +08:00
Jake Dallimore
c8a8dc6a52 Merge branch 'MDL-70649-alternative-security-helper' of https://github.com/xuangui2018/moodle 2021-04-15 08:38:48 +08:00
Jake Dallimore
1ed346c3cc Merge branch 'MDL-71119-master' of git://github.com/sarjona/moodle 2021-04-15 08:31:47 +08:00
Paul Holden
0fea9ec133 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:09:16 +01:00
Eloy Lafuente (stronk7)
41d9dc459f Merge branch 'MDL-67999-master' of git://github.com/sarjona/moodle 2021-04-14 19:17:19 +02:00
Sara Arjona
e5872a3b45 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:04 +02:00
Sara Arjona
dcf94b0ca2 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:04:10 +02:00
Sara Arjona
9c07064417 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:04:09 +02:00
Xuan Gui
ed046b8eb1 MDL-70649 files: Alternative security helper 
Augument 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:21:35 +10:00
Eloy Lafuente (stronk7)
9ee80056de Merge branch 'MDL-70616-master' of https://github.com/izendegi/moodle 2021-04-14 12:45:00 +02:00
Iñigo Zendegi
9391a177d8 MDL-70616 gradingform_rubric: Filters not applied to rubric name 2021-04-14 11:04:54 +02:00
Sara Arjona
24ff49f681 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:52:47 +02:00
Jun Pataleta
dbda8528f5 Merge branch 'MDL-71315-master' of git://github.com/sarjona/moodle 2021-04-14 16:50:42 +08:00
Sara Arjona
c1649591a2 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 09:18:36 +02:00
Sara Arjona
c974a59f41 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 09:18:35 +02:00
Sara Arjona
e281a5ef69 MDL-71315 core_badges: Fix warning when rendering badges 2021-04-14 09:06:06 +02:00
Andrew Nicols
88a29d6ca7 Merge branch 'MDL-71154' of https://github.com/stronk7/moodle 2021-04-14 12:09:01 +08:00
Jake Dallimore
195abe8ab1 Merge branch 'MDL-70207-master' of git://github.com/peterRd/moodle 2021-04-14 09:07:21 +08:00