Commit graph

8936 commits

Author SHA1 Message Date
Jun Pataleta
610b339c6e Merge branch 'MDL-71017-master-2' of git://github.com/marinaglancy/moodle 2021-04-21 14:58:06 +08:00
Eloy Lafuente (stronk7)
7c75781518 Merge branch 'MDL-63381_master_v3' of https://github.com/TomoTsuyuki/moodle 2021-04-20 23:56:56 +02:00
Marina Glancy
57a444d31f MDL-71017 oath2: configuration check fix and return types 2021-04-20 12:07:54 +02:00
David Matamoros
5a6f05c605 MDL-71017 tool_oauth2: Small fixes on Oauth 2 services UI and tests 2021-04-20 10:50:44 +02:00
Marina Glancy
d80f3c5d8a MDL-71017 tool_oauth2: show not configured services 2021-04-20 10:50:44 +02:00
Marina Glancy
0152fdbdff MDL-71017 oauth2: configure some oauth2 services for login only 2021-04-20 10:50:40 +02:00
Sara Arjona
4478fcf1ce Merge branch 'MDL-67882-message-config-log' of https://github.com/brendanheywood/moodle 2021-04-19 16:22:48 +02:00
Paul Holden
5163f1e6bd MDL-69460 admin: prevent CLI upgrade when stale files present. 2021-04-19 09:03:39 +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
0dbcbbb452 Merge branch 'master_MDL-71254' of https://github.com/golenkovm/moodle 2021-04-16 07:57:01 +01:00
Sara Arjona
bd572b2434 Merge branch 'MDL-71090' of git://github.com/paulholden/moodle 2021-04-15 11:56:40 +02:00
Jake Dallimore
a83dd7dd43 Merge branch 'MDL-71338' of git://github.com/paulholden/moodle 2021-04-15 14:42:10 +08:00
Jake Dallimore
e845a21a64 Merge branch 'MDL-70142' of git://github.com/paulholden/moodle 2021-04-15 10:35:33 +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)
392fc8ead0 Merge branch 'MDL-70722-master' of git://github.com/sarjona/moodle 2021-04-13 22:39:27 +02:00
Tomo Tsuyuki
108da43e9f MDL-63381 backup: Have an option to import permissions
Add options to use permission settings for import / restore
2021-04-13 13:24:15 +10:00
Eloy Lafuente (stronk7)
68a6915c06 Merge branch 'MDL-68635' of https://github.com/paulholden/moodle 2021-04-06 22:23:15 +02:00
Eloy Lafuente (stronk7)
0384e9d254 Merge branch 'MDL-71215-master' of https://github.com/sammarshallou/moodle 2021-04-06 15:13:16 +02:00
sam marshall
af3c05ca44 MDL-71215 Acceptance test: Missing Behat for webservice service_users 2021-04-06 11:52:56 +01:00
Adrian Greeve
b816b9566d Merge branch 'MDL-70817-master-8' of git://github.com/junpataleta/moodle 2021-04-06 13:00:53 +08:00
Paul Holden
069cfef590 MDL-70917 tool_behat: fix profile/replace option comparison.
The `isset` call always returned true for the 'replace' option,
because even if not specified it receives a non-null value. The
`strpos` call now does a strict equality check rather than
greater-than-or-equal (which always returns true).
2021-04-04 23:18:17 +01:00
Jun Pataleta
9a6958ae4c MDL-70817 admin: Remove heading for showcompletionconditions
It should be under the "Completion tracking" subheading just like in
the course form.
2021-04-02 21:53:20 +08:00
Simey Lameze
a4f7c1d91f MDL-70781 course: setting for displaying completion conditions
Part of MDL-70817
2021-04-02 21:53:20 +08:00
Simey Lameze
680018c95d MDL-70782 course: add setting to show activity dates
Part of MDL-70817
2021-04-02 21:53:20 +08:00
Leon Stringer
f56aabd726 MDL-60490 tool_lp: Missing div close
Mustache template had opening <div> with missing </div>.
2021-04-01 12:13:49 +01:00
Mikhail Golenkov
b808d72a62 MDL-71254 oauth2: Redirect to the login page in case of error 2021-04-01 13:35:51 +11:00
Eloy Lafuente (stronk7)
870a8de3fb MDL-37655 phpunit: Avoid having multiple testcase classes in 1 file
Note that there wasn't any case of multiple testcase classes in
1 file. All the cases reported in the issue were false positives
caused but other "mock/fixture" files being named _test.

So all this issue does is:

1) rename any _test suffixed class in test files, because we are
   going to start renaming a lot of test classes to _test.

2) ensure that the 2 test case classes modified in this issue,
   are already observing the filename = classname rule that will
   be implemented soon (and verigy it works).
2021-03-30 19:17:54 +02:00
Paul Holden
7107649bc8 MDL-68635 tool_cohortroles: observe user initial table filter. 2021-03-29 14:12:36 +01:00
Paul Holden
0c6ea21bac MDL-70142 admin: preserve selected cache definitions in the form.
By not redirecting when we are already on the purge caches page we
can preserve the submitted form data, allowing users to easily
repeat the previous action.
2021-03-26 13:09:33 +00:00
Sara Arjona
5d93de8b67 MDL-70722 core_badges: minor fixes from MDL-70689
In MDL-70689, Eloy and Helen suggested some fixes to improve this patch.
As this is a followup issue to move the pending services, this
very first commit will fix pending things raised in the parent issue.
2021-03-26 09:20:52 +01:00
sam marshall
efb9654dcb MDL-71131 Admin: Users page incorrectly showing all name fields 2021-03-25 13:49:39 +00:00
sam marshall
5e72715e4f MDL-71099 Lib: Move new user_fields class from core to core_user
This class would belong more appropriately within the 'user' API
(core_user) instead of within the 'core' API, since it is
directly related to user data.

Since the class has only just been added to Moodle, now is a good
time to move it.
2021-03-25 13:47:23 +00:00
Brendan Heywood
f0aae55b81 MDL-67882 message: Add notification setting changes to config_log 2021-03-25 10:34:48 +11:00
Paul Holden
6846ff49f1 MDL-71090 tool_dataprivacy: convert cancellation of requests to ES6. 2021-03-23 08:49:18 +00:00
Paul Holden
4cd11a3f3f MDL-71090 tool_dataprivacy: convert contact DPO to modal forms. 2021-03-23 08:49:18 +00:00
Eloy Lafuente (stronk7)
3edac87e20 Merge branch 'MDL-70689-master' of git://github.com/sarjona/moodle 2021-03-17 23:20:37 +01:00
Jun Pataleta
ebf078458d Merge branch 'MDL-71036' of https://github.com/stronk7/moodle 2021-03-17 20:05:25 +08:00
Eloy Lafuente (stronk7)
f0733b2f41 Merge branch 'MDL-67748-master-managewebservices' of git://github.com/mudrd8mz/moodle 2021-03-16 19:02:10 +01:00
David Mudrák
4a9f864969 MDL-67748 admin: Add Behat tests for tokens filtering features
Credit goes to Andrew for Behat data generators for webservices.

Co-authored-by: Andrew Nicols <andrew@nicols.co.uk>
2021-03-16 10:51:39 +01:00
David Mudrák
c4ad1bf2f6 MDL-67748 admin: Add filter to the WS tokens management page
The patch adds ability to filter the list of token by the token value,
the user and the service. Also the button to create a new token is made
more prominent and easier to spot.
2021-03-15 21:24:06 +01:00
David Mudrák
bcd8692fef MDL-67748 admin: Improve the display of tokens the user cannot see 2021-03-15 21:24:06 +01:00
David Mudrák
2c177ae4c1 MDL-67748 admin: Refactor tokens management as an external page
No need to have a dedicated admin_setting_managewebservicetokens admin
setting subclass, and yet do not use almost any of its features. So the
patch merges the list and the forms handling into a single external
page.

Similarly, it feels like overkill to have a renderer method for a
simple confirmation widget - especially given that the URLs were
hard-coded in it. So that one was dropped.
2021-03-15 21:24:06 +01:00
David Mudrák
596b0bb23e MDL-67748 admin: Improve the display of missing capabilities
The patch improves the display of the missing capabilities on the Manage
tokens page and the Select authorised users page. The list of
capabilities is rendered in a collapsible area and does not occupy too
much space by default.

Additionally on the later page, the patch improves the display of the
list of existing authorised users so that it respects the configured
identity fields.
2021-03-15 21:24:06 +01:00
David Mudrák
db723ad066 MDL-67748 admin: Move the web service token form to its own file 2021-03-15 21:21:43 +01:00
David Mudrák
2bf6db2d5a MDL-67748 admin: Move the web services under the server administration
I suppose the original reasoning was that the web services protocols are
pluggable and that plugins can provide external function. But those are
not good reasons to put the whole Web services section under plugins.
Web services are not a plugin type and they always felt very
counter-intuitive there.

From the server administrtaion perspective, web services are similar to
scheduled tasks and therefore, they should live in the same section.
2021-03-15 21:21:43 +01:00
Mihail Geshoski
c14242c807 MDL-44613 tool_behat: Update datetime format usages to strftime
Updates all existing datetime format usages to strftime in the
'time to timestamp' transformation in tool_behat behat tests.
2021-03-15 08:22:12 +08:00
Sara Arjona
4211787141 MDL-70689 oauth2: unit tests for new IMS OBv2.1
Apart from adding new unit tests for covering new IMS OBv2.1 issuer,
some extra tests have been added to test existing issuers and confirm
they are still working as expected after the changes.
2021-03-12 12:31:24 +01:00
Sara Arjona
57d9354505 MDL-70689 oauth2: deprecate unused strings 2021-03-12 12:31:24 +01:00
Sara Arjona
0f59f19d3b MDL-70689 oauth2: self-register IMS OBv2.1 services
IMS OBv2.1 services have a registration endpoint to get client id
and secret.
This patch adds and implements the "register" method for the IMS
Open Badges Connect discovery system, to get the proper client id
and secret values.
2021-03-12 12:31:24 +01:00
Sara Arjona
5066c60206 MDL-70689 oauth2: add support to IMS OBv2.1 service
In order to make easier to create and maintain new OAuth2 services,
a couple of classes have been added:

- discovery\* contains methods related to the discovery system. Until
now, only OpenID Connect was supported by Moodle so all the code was
centralised in api.php.
With this patch, as IMS OBv2.1 has a different discovery system, a new
abstract class (base_definition) has been added to be called and let
every discovery system (OpenID Connect, IMS Badge Connect...)
implement their own methods.

- service\* . Instead of keep adding methods to the api, the service
namespace has been created to store all the standard issuer services.
An interface (issuer_interface) has been created and all the services
should implement it.
This patch creates the "IMS OBv2.1" and "Custom" services and moves
the methods for "Google" service because it uses the OpenID connect
discovery system.
2021-03-12 12:31:22 +01:00