moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-76183-master' of https://github.com/davewoloszyn/moodle

Browse source
This commit is contained in:
Andrew Nicols 2022-11-30 11:45:23 +08:00 • committed by Ilya Tregubov
commit 0646f7ea5a
13 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
badges/classes/assertion.php
View file

@ -27,7 +27,7 @@
defined('MOODLE_INTERNAL') || die(); defined('MOODLE_INTERNAL') || die();
/** /**
* Open Badges Assertions specification 1.0 {@link https://github.com/mozilla/openbadges/wiki/Assertions} * Open Badges Assertions specification 1.0 {@link https://github.com/mozilla/openbadges-backpack/wiki/Assertions}
* *
* Badge asserion is defined by three parts: * Badge asserion is defined by three parts:
* - Badge Assertion (information regarding a specific badge that was awarded to a badge earner) * - Badge Assertion (information regarding a specific badge that was awarded to a badge earner)

2
cache/stores/redis/README.md vendored
View file

@ -3,4 +3,4 @@ Redis Cache Store for Moodle
A Moodle cache store plugin for [Redis](http://redis.io). A Moodle cache store plugin for [Redis](http://redis.io).
This plugin requires the [PhpRedis](https://github.com/nicolasff/phpredis) extension. The PhpRedis extension can be installed via PECL with `pecl install redis`. This plugin requires the [PhpRedis](https://github.com/phpredis/phpredis) extension. The PhpRedis extension can be installed via PECL with `pecl install redis`.

2
lib/editor/atto/plugins/html/thirdpartylibs.xml
View file

@ -6,7 +6,7 @@
<description>CodeMirror is a versatile text editor implemented in JavaScript for the browser.</description> <description>CodeMirror is a versatile text editor implemented in JavaScript for the browser.</description>
<version>5.65.9</version> <version>5.65.9</version>
<license>MIT</license> <license>MIT</license>
<repository>https://github.com/codemirror/CodeMirror</repository> <repository>https://github.com/codemirror/codemirror5</repository>
</library> </library>
<library> <library>
<location>yui/src/beautify</location> <location>yui/src/beautify</location>

2
lib/editor/atto/plugins/html/yui/build/moodle-atto_html-codemirror/moodle-atto_html-codemirror-debug.js vendored
View file

@ -1957,7 +1957,7 @@ var define = null; // Remove require.js support in this context.
if (m.startStyle && sp.from == pos) { spanStartStyle += " " + m.startStyle; } if (m.startStyle && sp.from == pos) { spanStartStyle += " " + m.startStyle; }
if (m.endStyle && sp.to == nextChange) { (endStyles || (endStyles = [])).push(m.endStyle, sp.to); } if (m.endStyle && sp.to == nextChange) { (endStyles || (endStyles = [])).push(m.endStyle, sp.to); }
// support for the old title property // support for the old title property
// https://github.com/codemirror/CodeMirror/pull/5673 // https://github.com/codemirror/codemirror5/pull/5673
if (m.title) { (attributes || (attributes = {})).title = m.title; } if (m.title) { (attributes || (attributes = {})).title = m.title; }
if (m.attributes) { if (m.attributes) {
for (var attr in m.attributes) for (var attr in m.attributes)

2
lib/editor/atto/plugins/html/yui/build/moodle-atto_html-codemirror/moodle-atto_html-codemirror.js vendored
View file

@ -1957,7 +1957,7 @@ var define = null; // Remove require.js support in this context.
if (m.startStyle && sp.from == pos) { spanStartStyle += " " + m.startStyle; } if (m.startStyle && sp.from == pos) { spanStartStyle += " " + m.startStyle; }
if (m.endStyle && sp.to == nextChange) { (endStyles || (endStyles = [])).push(m.endStyle, sp.to); } if (m.endStyle && sp.to == nextChange) { (endStyles || (endStyles = [])).push(m.endStyle, sp.to); }
// support for the old title property // support for the old title property
// https://github.com/codemirror/CodeMirror/pull/5673 // https://github.com/codemirror/codemirror5/pull/5673
if (m.title) { (attributes || (attributes = {})).title = m.title; } if (m.title) { (attributes || (attributes = {})).title = m.title; }
if (m.attributes) { if (m.attributes) {
for (var attr in m.attributes) for (var attr in m.attributes)

2
lib/editor/atto/plugins/html/yui/src/codemirror/js/codemirror.js vendored
View file

@ -1953,7 +1953,7 @@
if (m.startStyle && sp.from == pos) { spanStartStyle += " " + m.startStyle; } if (m.startStyle && sp.from == pos) { spanStartStyle += " " + m.startStyle; }
if (m.endStyle && sp.to == nextChange) { (endStyles || (endStyles = [])).push(m.endStyle, sp.to); } if (m.endStyle && sp.to == nextChange) { (endStyles || (endStyles = [])).push(m.endStyle, sp.to); }
// support for the old title property // support for the old title property
// https://github.com/codemirror/CodeMirror/pull/5673 // https://github.com/codemirror/codemirror5/pull/5673
if (m.title) { (attributes || (attributes = {})).title = m.title; } if (m.title) { (attributes || (attributes = {})).title = m.title; }
if (m.attributes) { if (m.attributes) {
for (var attr in m.attributes) for (var attr in m.attributes)

2
lib/google/readme_moodle.txt
View file

@ -49,7 +49,7 @@ Local changes (to reapply until upstream upgrades contain them):
Information Information
----------- -----------
Repository: https://github.com/google/google-api-php-client Repository: https://github.com/googleapis/google-api-php-client
Documentation: https://developers.google.com/api-client-library/php/ Documentation: https://developers.google.com/api-client-library/php/
Global documentation: https://developers.google.com Global documentation: https://developers.google.com

2
lib/ltiprovider/README.md
View file

@ -14,7 +14,7 @@ Whilst supporting LTI is relatively simple, the benefits to using a class librar
* set up arrangements such that users from different resource links can all collaborate together within a single tool provider link; * set up arrangements such that users from different resource links can all collaborate together within a single tool provider link;
* tool providers can take advantage of LTI updates with minimal impact on their application code. * tool providers can take advantage of LTI updates with minimal impact on their application code.
The wiki area of this repository contains [documentation](https://github.com/IMSGlobal/LTI-Tool-Provider-Library-PHP/wiki) for this library. The [rating LTI application](https://github.com/IMSGlobal/LTI-Sample-Tool-Provider-PHP) is based on this library to further illustrate how it can be used. The wiki area of this repository contains [documentation](https://github.com/1EdTech/LTI-Tool-Provider-Library-PHP/wiki) for this library. The [rating LTI application](https://github.com/1EdTech/LTI-Sample-Tool-Provider-PHP) is based on this library to further illustrate how it can be used.
&copy; 2016 IMS Global Learning Consortium Inc. All Rights Reserved. Trademark Policy - (www.imsglobal.org/trademarks) &copy; 2016 IMS Global Learning Consortium Inc. All Rights Reserved. Trademark Policy - (www.imsglobal.org/trademarks)

16
lib/ltiprovider/readme_moodle.txt
View file

@ -8,10 +8,10 @@ Some changes from the upstream version have been made:
* Do not require tool_consumer_instance_guid * Do not require tool_consumer_instance_guid
* Prevent modification of the request to the provider * Prevent modification of the request to the provider
These changes can be reverted once the following pull requests have been integrated upstream: These changes can be reverted once the following pull requests have been integrated upstream:
* https://github.com/IMSGlobal/LTI-Tool-Provider-Library-PHP/pull/10 * https://github.com/1EdTech/LTI-Tool-Provider-Library-PHP/pull/10
* https://github.com/IMSGlobal/LTI-Tool-Provider-Library-PHP/pull/11 * https://github.com/1EdTech/LTI-Tool-Provider-Library-PHP/pull/11
* https://github.com/IMSGlobal/LTI-Tool-Provider-Library-PHP/pull/47 * https://github.com/1EdTech/LTI-Tool-Provider-Library-PHP/pull/47
* https://github.com/IMSGlobal/LTI-Tool-Provider-Library-PHP/pull/48 * https://github.com/1EdTech/LTI-Tool-Provider-Library-PHP/pull/48
This local changes can be reverted once it's checked that they are present upstream (note the This local changes can be reverted once it's checked that they are present upstream (note the
LTI-Tool-Provider-Library-PHP repo has been archived so it doesn't accept pull requests anymore): LTI-Tool-Provider-Library-PHP repo has been archived so it doesn't accept pull requests anymore):
@ -25,14 +25,14 @@ with an autoloader so it's better to do it manually.
Information Information
----------- -----------
URL: https://github.com/IMSGlobal/LTI-Tool-Provider-Library-PHP/wiki URL: https://github.com/1EdTech/LTI-Tool-Provider-Library-PHP/wiki
License: Apache License, Version 2.0 License: Apache License, Version 2.0
Installation Installation
------------ ------------
1) Download the latest version of the provider library 1) Download the latest version of the provider library
wget https://github.com/IMSGlobal/LTI-Tool-Provider-Library-PHP/archive/3.0.3.zip wget https://github.com/1EdTech/LTI-Tool-Provider-Library-PHP/archive/3.0.3.zip
2) Unzip the archive 2) Unzip the archive
unzip 3.0.3.zip unzip 3.0.3.zip
@ -43,7 +43,7 @@ mv LTI-Tool-Provider-Library-PHP-3.0.3/* lib/ltiprovider/
4) Updates 4) Updates
Check that the following pull request is included in the release. Check that the following pull request is included in the release.
Then remove this step from this file. Then remove this step from this file.
https://github.com/IMSGlobal/LTI-Tool-Provider-Library-PHP/pull/13 https://github.com/1EdTech/LTI-Tool-Provider-Library-PHP/pull/13
If not, apply manually. If not, apply manually.
5) Run unit tests on enrol_lti_testsuite 5) Run unit tests on enrol_lti_testsuite
@ -54,7 +54,7 @@ Upgrading Notes
Check if there are any new changes to the database schema. To do this, view the logs Check if there are any new changes to the database schema. To do this, view the logs
since the last release for the data connector base class and the mysql data connector. since the last release for the data connector base class and the mysql data connector.
https://github.com/IMSGlobal/LTI-Tool-Provider-Library-PHP/compare/3.0.2...3.0.3 https://github.com/1EdTech/LTI-Tool-Provider-Library-PHP/compare/3.0.2...3.0.3
src/ToolProvider/DataConnector/DataConnector.php src/ToolProvider/DataConnector/DataConnector.php
src/ToolProvider/DataConnector/DataConnector_mysql.php src/ToolProvider/DataConnector/DataConnector_mysql.php

2
lib/thirdpartylibs.xml
View file

@ -428,7 +428,7 @@ All rights reserved.</copyright>
<version>3.0.2</version> <version>3.0.2</version>
<license>Apache</license> <license>Apache</license>
<licenseversion>2.0</licenseversion> <licenseversion>2.0</licenseversion>
<repository>https://github.com/IMSGlobal/LTI-Tool-Provider-Library-PHP</repository> <repository>https://github.com/1EdTech/LTI-Tool-Provider-Library-PHP</repository>
<copyrights> <copyrights>
<copyright>2016 IMS Global Learning Consortium Inc. All Rights Reserved. Trademark Policy - (www.imsglobal.org/trademarks)</copyright> <copyright>2016 IMS Global Learning Consortium Inc. All Rights Reserved. Trademark Policy - (www.imsglobal.org/trademarks)</copyright>
</copyrights> </copyrights>

2
lib/upgrade.txt
View file

@ -1264,7 +1264,7 @@ the groupid field.
- test_get_user_timezone_offset() - test_get_user_timezone_offset()
* The google api library has been updated to version 1.1.7. There was some important changes * The google api library has been updated to version 1.1.7. There was some important changes
on the SSL handling. Now the SSL version will be determined by the underlying library. on the SSL handling. Now the SSL version will be determined by the underlying library.
For more information see https://github.com/google/google-api-php-client/pull/644 For more information see https://github.com/googleapis/google-api-php-client/pull/644
* The get_role_users() function will now add the $sort fields that are not part * The get_role_users() function will now add the $sort fields that are not part
of the requested fields to the query result and will throw a debugging message of the requested fields to the query result and will throw a debugging message
with the added fields when that happens. with the added fields when that happens.

2
message/output/airnotifier/message_output_airnotifier.php
View file

@ -15,7 +15,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>. // along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/** /**
* Airnotifier message processor to send messages to the APNS provider: airnotfier. (https://github.com/dongsheng/airnotifier) * Airnotifier message processor to send messages to the APNS provider: airnotfier. (https://github.com/dcai/airnotifier)
* *
* @package message_airnotifier * @package message_airnotifier
* @category external * @category external

2
theme/boost/readme_moodle.txt
View file

@ -7,7 +7,7 @@ Sass:
This theme uses Bootstrap version 4.6.0 This theme uses Bootstrap version 4.6.0
The Bootstrap repository is available on: The Bootstrap repository is available on:
https://github.com/twitter/bootstrap.git https://github.com/twbs/bootstrap
To update to the latest release of twitter bootstrap: To update to the latest release of twitter bootstrap: