Commit graph

100821 commits

Author SHA1 Message Date
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
Mahmoud Kassaei
d2d9a7200b MDL-71225 Questions: Default options for
ddimageortext, ddmarker and match qtypes
2021-04-14 17:54:54 +01:00
Mahmoud Kassaei
82a9fb50d0 MDL-71262 Questions: Default options for qtype_essay 2021-04-14 17:14:28 +01: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
Sara Arjona
119fb4b712 MDL-71315 core_badges: Fix warning when rendering badges 2021-04-14 09:06:35 +02:00
Andrew Nicols
c42ccdd372 Merge branch 'MDL-71154_311' of https://github.com/stronk7/moodle into MOODLE_311_STABLE 2021-04-14 12:10:16 +08:00
Andrew Nicols
8e358c9983 Merge branch 'MDL-71169-311-execute' of git://github.com/mudrd8mz/moodle into MOODLE_311_STABLE 2021-04-14 08:35:38 +08:00
AMOS bot
444291e71a Automatically generated installer lang files 2021-04-14 00:07:33 +00:00
Eloy Lafuente (stronk7)
2c13de9fc8 Merge branch 'MDL-69874-311' of git://github.com/lucaboesch/moodle into MOODLE_311_STABLE 2021-04-13 23:08:57 +02:00
Eloy Lafuente (stronk7)
1f2fbfe331 Merge branch 'MDL-70722-311' of git://github.com/sarjona/moodle into MOODLE_311_STABLE 2021-04-13 22:39:36 +02:00
Víctor Déniz
c7e2a997a8 Merge branch 'MDL-71089-311' of git://github.com/roland04/moodle into MOODLE_311_STABLE 2021-04-13 19:40:09 +01:00
Eloy Lafuente (stronk7)
9c4a2b0d47 MDL-71154 ci: Prevent upstream branches and tags to be built
Both for travis and GHA:

- master and MOODLE_XXX_STABLE branches
- any vX.Y.Z tag

won't lead to a build anymore.
2021-04-13 16:55:46 +02:00
Mikel Martín
7c82ff41a3 MDL-71089 core: Add different Toast notification styling 'types' 2021-04-13 16:29:10 +02:00
Mikel Martín
b27cb56296 MDL-71089 theme_boost: Add styles for different toast types 2021-04-13 16:29:10 +02:00
Sara Arjona
933d98cd50 Merge branch 'MDL-71011_311' of https://github.com/stronk7/moodle into MOODLE_311_STABLE 2021-04-13 12:27:00 +02:00
Sara Arjona
09851f5882 Merge branch 'MDL-65983-311' of git://github.com/jleyva/moodle into MOODLE_311_STABLE 2021-04-13 12:19:33 +02:00
Luca Bösch
4a67d78a4c MDL-69874 workshop: Title mentions received assessments in close phase. 2021-04-13 12:03:17 +02:00
Eloy Lafuente (stronk7)
7811d7ace4 on-demand release 3.11dev+ 2021-04-13 10:27:30 +02:00
Eloy Lafuente (stronk7)
9d2bb5eb6b Merge branch 'install_311_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_311_STABLE 2021-04-13 10:27:26 +02:00
Adrian Greeve
6dfbb08b53 Merge branch 'MDL-71161-311-4' of git://github.com/junpataleta/moodle into MOODLE_311_STABLE 2021-04-13 11:41:22 +08:00
Tomo Tsuyuki
c12ef07260 MDL-63381 backup: Have an option to import permissions
Add options to use permission settings for import / restore
2021-04-13 13:21:54 +10:00
Adrian Greeve
f82793d840 Merge branch 'MDL-70821-311-5' of git://github.com/junpataleta/moodle into MOODLE_311_STABLE 2021-04-13 11:14:08 +08:00
Eloy Lafuente (stronk7)
efc8877c21 Merge branch 'MDL-71172-311' of https://github.com/AnupamaSarjoshi/moodle into MOODLE_311_STABLE 2021-04-13 00:47:03 +02:00
Michael Hawkins
5485896773 MDL-71161 mod_workshop: Display activity completion information 2021-04-13 01:25:31 +08:00
Michael Hawkins
51e5c13b4e MDL-71161 mod_wiki: Display activity completion information 2021-04-13 01:25:31 +08:00
Michael Hawkins
10a5c03ff3 MDL-71161 mod_url: Display activity completion information 2021-04-13 01:25:31 +08:00
Simey Lameze
5cc0484e01 MDL-71161 mod_survey: show survey activity info 2021-04-13 01:25:31 +08:00