Skip to content

Commit

Permalink
Merge branch 'moodle:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
CD.CER authored Sep 22, 2023
2 parents 14fa659 + 4ade47c commit 03196c9
Show file tree
Hide file tree
Showing 72 changed files with 1,763 additions and 207 deletions.
3 changes: 3 additions & 0 deletions .markdownlint-cli2.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,9 @@ config.renamedLinks = {
renames: [{
oldFile: '/docs/apis/plugintypes/tinymce/index.md',
newFile: '/docs/apis/plugintypes/tiny/legacy.md',
}, {
oldFile: '/docs/apis/subsystems/output.md',
newFile: '/docs/apis/subsystems/output/index.md',
}, {
oldFile: '/docs/apis/subsystems/tool/index.md',
newFile: '/docs/apis/subsystems/admin/index.md',
Expand Down
48 changes: 42 additions & 6 deletions data/libraries.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,33 @@
"repository": "https://github.com/olivernn/lunr.js",
"customised": false
},
{
"copyrightHolders": [],
"location": "admin/tool/mfa/factor/totp/extlib/Assert",
"name": "Assert",
"version": "2.1",
"license": "MIT",
"repository": "https://github.com/beberlei/assert",
"customised": false
},
{
"copyrightHolders": [],
"location": "admin/tool/mfa/factor/totp/extlib/OTPHP",
"name": "OTPHP",
"version": "9.1.1",
"license": "MIT",
"repository": "https://github.com/Spomky-Labs/otphp",
"customised": false
},
{
"copyrightHolders": [],
"location": "admin/tool/mfa/factor/totp/extlib/ParagonIE/ConstantTime",
"name": "Constant-Time Encoding",
"version": "2.1.1",
"license": "MIT",
"repository": "https://github.com/paragonie/constant_time_encoding",
"customised": false
},
{
"copyrightHolders": [
"2015 Richard Dancsi"
Expand Down Expand Up @@ -138,7 +165,7 @@
"location": "lib/amd/src/chartjs-lazy.js",
"name": "Chart.js",
"description": "Simple yet flexible JavaScript charting for designers & developers.",
"version": "4.2.1",
"version": "4.4.0",
"license": "MIT",
"repository": "https://github.com/chartjs/Chart.js",
"customised": true
Expand Down Expand Up @@ -234,7 +261,7 @@
"location": "lib/editor/atto/plugins/html/yui/src/codemirror",
"name": "codemirror",
"description": "CodeMirror is a versatile text editor implemented in JavaScript for the browser.",
"version": "5.65.12",
"version": "5.65.15",
"license": "MIT",
"repository": "https://github.com/codemirror/codemirror5",
"customised": false
Expand Down Expand Up @@ -287,7 +314,7 @@
"location": "lib/emoji-data",
"name": "Emoji data",
"description": "Library to parse easily data and sprite sheets for emoji.",
"version": "14.0.1",
"version": "15.0.1",
"license": "MIT",
"repository": "https://github.com/iamcal/emoji-data/",
"customised": true
Expand Down Expand Up @@ -435,7 +462,7 @@
"location": "lib/jquery",
"name": "jQuery",
"description": "jQuery is a fast, small, and feature-rich JavaScript library widely used on moodle.",
"version": "3.6.4",
"version": "3.7.1",
"license": "MIT",
"repository": "https://github.com/jquery/jquery",
"customised": false
Expand All @@ -459,7 +486,7 @@
"location": "lib/lti1p3",
"name": "LTI 1.3 Tool Library",
"description": "A library used for building IMS-certified LTI 1.3 tool providers in PHP.",
"version": "5.2.6",
"version": "5.4.1",
"license": "Apache",
"licenseversion": "2.0",
"repository": "https://github.com/packbackbooks/lti-1-3-php-library",
Expand Down Expand Up @@ -680,7 +707,7 @@
"location": "lib/phpspreadsheet",
"name": "PhpSpreadsheet",
"description": "Library to read, write and create spreadsheet documents in PHP.",
"version": "1.28.0",
"version": "1.29.0",
"license": "MIT",
"repository": "https://github.com/PHPOffice/PhpSpreadsheet",
"customised": true
Expand Down Expand Up @@ -879,6 +906,15 @@
"licenseversion": "2.0+",
"customised": true
},
{
"copyrightHolders": [],
"location": "lib/webauthn/src",
"name": "WebAuthn",
"version": "2.0.1",
"license": "MIT",
"repository": "https://github.com/lbuchs/WebAuthn",
"customised": false
},
{
"copyrightHolders": [
"2009 Phacility"
Expand Down
22 changes: 20 additions & 2 deletions data/migratedPages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ AJAX:
AMD_Modal:
- filePath: "/docs/guides/javascript/modal/index.md"
slug: "/docs/guides/javascript/modal/"
Acceptance_testing:
- filePath: "/general/development/tools/behat/index.md"
slug: "/general/development/tools/behat/"
Acceptance_testing/Browsers:
- filePath: "/general/development/tools/behat/browsers/index.md"
slug: "/general/development/tools/behat/browsers/"
Expand Down Expand Up @@ -37,6 +40,9 @@ Adding_a_web_service_to_a_plugin:
Admin_settings:
- filePath: "/docs/apis/subsystems/admin/index.md"
slug: "/docs/apis/subsystems/admin/"
Admin_tools:
- filePath: "/general/projects/api/admin-tools.md"
slug: "/general/projects/api/admin-tools"
Advanced_grading_API:
- filePath: "/docs/apis/core/grading/index.md"
slug: "/docs/apis/core/grading/"
Expand Down Expand Up @@ -112,6 +118,9 @@ Composer:
Conditional_activities_API:
- filePath: "/docs/apis/core/conditionalactivities/index.md"
slug: "/docs/apis/core/conditionalactivities/"
Contributing_to_Moodle:
- filePath: "/general/community/contribute.md"
slug: "/general/community/contribute"
Core_APIs:
- filePath: "/docs/apis.md"
slug: "/docs/apis"
Expand All @@ -130,6 +139,9 @@ Credits:
Custom_Moodle_Apps:
- filePath: "/general/app/customisation/custom-apps.md"
slug: "/general/app/customisation/custom-apps"
Custom_fields_API:
- filePath: "/docs/apis/core/customfields/index.md"
slug: "/docs/apis/core/customfields/"
DDL_functions:
- filePath: "/docs/apis/core/dml/ddl.md"
slug: "/docs/apis/core/dml/ddl"
Expand Down Expand Up @@ -240,6 +252,9 @@ Groups_API:
Hardening_new_Roles_system:
- filePath: "/docs/apis/subsystems/roles.md"
slug: "/docs/apis/subsystems/roles"
Inplace_editable:
- filePath: "/docs/apis/subsystems/output/inplace.md"
slug: "/docs/apis/subsystems/output/inplace"
Integration_Review:
- filePath: "/general/development/process/integration/index.md"
slug: "/general/development/process/integration"
Expand All @@ -258,6 +273,9 @@ Lock_API:
Machine_learning_backends:
- filePath: "/docs/apis/plugintypes/mlbackend/index.md"
slug: "/docs/apis/plugintypes/mlbackend/"
Message_API:
- filePath: "/docs/apis/core/message/index.md"
slug: "/docs/apis/core/message/"
Mission:
- filePath: "/general/community/mission.md"
slug: "/general/community/mission"
Expand Down Expand Up @@ -1468,10 +1486,10 @@ New_docs_version_process:
- filePath: "/general/development/process/release/newuserdocs.md"
slug: "/general/development/process/release/newuserdocs"
Output_API:
- filePath: "/docs/apis/subsystems/output.md"
- filePath: "/docs/apis/subsystems/output/index.md"
slug: "/docs/apis/subsystems/output"
Output_functions:
- filePath: "/docs/apis/subsystems/output.md"
- filePath: "/docs/apis/subsystems/output/index.md"
slug: "/docs/apis/subsystems/output#output-functions"
Overview:
- filePath: "/general/community/intro.md"
Expand Down
12 changes: 12 additions & 0 deletions data/moodle-contributors.txt
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ Candilio
Carlos
Carrick
Carrier
Carrillo
Carson
Carsten
Carter
Expand Down Expand Up @@ -221,6 +222,7 @@ Cunningham
Curry
D'souza
Dageförde
Dale
Dallimore
Dalton
Damian
Expand All @@ -240,6 +242,7 @@ Dave
Davenport
David
Davidson
Davies
Davis
Davitasvili
Davo
Expand Down Expand Up @@ -293,6 +296,7 @@ Eberhardt
Eddin
Eduardo
Ehringer
Eichelberger
Eijdenberg
EizEddin
Elbert
Expand Down Expand Up @@ -389,6 +393,7 @@ Gray
Green
Greeve
Greg
Gregor
Gregory
Greidanus
Grigory
Expand Down Expand Up @@ -443,6 +448,7 @@ Hoobin
Howard
Hugh
Hughes
Hummel
HungTran
Hunkler
Hunt
Expand All @@ -468,6 +474,7 @@ Iurii
Iyer
Iñaki
Iñigo
Jablon
Jackson
Jacob
Jade
Expand All @@ -492,11 +499,13 @@ Jean-Roch
Jeff
Jenkins
Jenny
Jeremy
Jerome
Jess
Jesse
Jetha
Jinu
Joachim
Joby
Jody
Joey
Expand Down Expand Up @@ -935,6 +944,7 @@ Schach
Schmadel
Schrenk
Schroeder
Schulz
Scotson
ScottVerbeek
Scribner
Expand Down Expand Up @@ -1142,6 +1152,7 @@ Wirianto
Wojciech
Woldeselassie
Wolf
Wolfgang
Woloszyn
Wolters
Woods
Expand Down Expand Up @@ -1403,6 +1414,7 @@ skaldrom
skodak
spvickers
stabijoh
stemiwe
stevando
stigbjarne
stronk7
Expand Down
16 changes: 16 additions & 0 deletions data/projects.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,22 @@
}
]
},
"api/admin-tools": {
"title": "Admin tools",
"status": "Complete",
"owners": [
{
"name": "Petr Škoda",
"githubUsername": "škoďák"
}
],
"issueLinks": [
{
"link": "https://tracker.moodle.org/browse/MDL-29029",
"title": "MDL-29029"
}
]
},
"api/amos": {
"title": "Automated Manipulation of Strings (AMOS)",
"status": "Complete",
Expand Down
6 changes: 3 additions & 3 deletions docs/apis.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ The [Page API](https://docs.moodle.org/dev/Page_API) is used to set up the curre

### Output API (output)

The [Output API](./apis/subsystems/output.md) is used to render the HTML for all parts of the page.
The [Output API](./apis/subsystems/output/index.md) is used to render the HTML for all parts of the page.

### String API (string)

Expand Down Expand Up @@ -139,7 +139,7 @@ The [Lock API](./apis/core/lock/index.md) lets you synchronise processing betwee

### Message API (message)

The [Message API](https://docs.moodle.org/dev/Message_API) lets you post messages to users. They decide how they want to receive them.
The [Message API](./apis/core/message/index.md) lets you post messages to users. They decide how they want to receive them.

### Media API (media)

Expand Down Expand Up @@ -217,7 +217,7 @@ The [https://docs.moodle.org/dev/OpenBadges_User_Documentation Badges] user docu

### Custom fields API (customfield)

The [Custom fields API](https://docs.moodle.org/dev/Custom_fields_API) allows you to configure and add custom fields for different entities
The [Custom fields API](./apis/core/customfields/index.md) allows you to configure and add custom fields for different entities

## Activity module APIs

Expand Down
2 changes: 1 addition & 1 deletion docs/apis/_files/db-messages-php.mdx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- markdownlint-disable first-line-heading -->
The `db/messages.php` file allows you to declare the messages that your plugin sends.

See the [Message API](https://docs.moodle.org/dev/Message_API) documentation for further information.
See the [Message API](../core/message/index.md) documentation for further information.
Loading

0 comments on commit 03196c9

Please sign in to comment.