chore: Merge branch `master` into `rc/v11.0.0` by cpcallen · Pull Request #2348 · RaspberryPiFoundation/blockly-samples

cpcallen · 2024-05-10T14:01:39Z

The basics

I validated my changes

The details

Proposed Changes

Merge branch master into rc/v11.0.0.

Reason for Changes

To pull in certain changes (e.g. #2339, #2344) that are needed in both branches.

Additional Information

Please verify manual resolution of conflicting changes to plugins/dev-tools/src/screenshot.js is correct.

CLOSE THIS PR BY MERGE COMMIT

) Bumps [webpack-dev-middleware](https://github.com/webpack/webpack-dev-middleware) from 5.3.3 to 5.3.4. - [Release notes](https://github.com/webpack/webpack-dev-middleware/releases) - [Changelog](https://github.com/webpack/webpack-dev-middleware/blob/v5.3.4/CHANGELOG.md) - [Commits](webpack/webpack-dev-middleware@v5.3.3...v5.3.4) --- updated-dependencies: - dependency-name: webpack-dev-middleware dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…ins/dev-scripts (RaspberryPiFoundation#2262) * chore(deps): Bump webpack-dev-middleware in /plugins/dev-scripts Bumps [webpack-dev-middleware](https://github.com/webpack/webpack-dev-middleware) from 5.3.1 to 5.3.4. - [Release notes](https://github.com/webpack/webpack-dev-middleware/releases) - [Changelog](https://github.com/webpack/webpack-dev-middleware/blob/v5.3.4/CHANGELOG.md) - [Commits](webpack/webpack-dev-middleware@v5.3.1...v5.3.4) --- updated-dependencies: - dependency-name: webpack-dev-middleware dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> * chore: update package-locks [dependabot skip] --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: blockly[bot] <blockly-github-robot@google.com>

) Bumps [webpack-dev-middleware](https://github.com/webpack/webpack-dev-middleware) from 5.3.3 to 5.3.4. - [Release notes](https://github.com/webpack/webpack-dev-middleware/releases) - [Changelog](https://github.com/webpack/webpack-dev-middleware/blob/v5.3.4/CHANGELOG.md) - [Commits](webpack/webpack-dev-middleware@v5.3.3...v5.3.4) --- updated-dependencies: - dependency-name: webpack-dev-middleware dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…aspberryPiFoundation#2264) Bumps [webpack-dev-middleware](https://github.com/webpack/webpack-dev-middleware) from 5.3.3 to 5.3.4. - [Release notes](https://github.com/webpack/webpack-dev-middleware/releases) - [Changelog](https://github.com/webpack/webpack-dev-middleware/blob/v5.3.4/CHANGELOG.md) - [Commits](webpack/webpack-dev-middleware@v5.3.3...v5.3.4) --- updated-dependencies: - dependency-name: webpack-dev-middleware dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…oc (RaspberryPiFoundation#2269)

…on#2272)

…RaspberryPiFoundation#2213) Bumps [ip](https://github.com/indutny/node-ip) from 1.1.5 to 1.1.9. - [Commits](indutny/node-ip@v1.1.5...v1.1.9) --- updated-dependencies: - dependency-name: ip dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.4 to 1.15.6. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](follow-redirects/follow-redirects@v1.15.4...v1.15.6) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…ts (RaspberryPiFoundation#2259) Bumps [webpack-dev-middleware](https://github.com/webpack/webpack-dev-middleware) from 5.3.3 to 5.3.4. - [Release notes](https://github.com/webpack/webpack-dev-middleware/releases) - [Changelog](https://github.com/webpack/webpack-dev-middleware/blob/v5.3.4/CHANGELOG.md) - [Commits](webpack/webpack-dev-middleware@v5.3.3...v5.3.4) --- updated-dependencies: - dependency-name: webpack-dev-middleware dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

) Bumps [webpack-dev-middleware](https://github.com/webpack/webpack-dev-middleware) from 5.3.3 to 5.3.4. - [Release notes](https://github.com/webpack/webpack-dev-middleware/releases) - [Changelog](https://github.com/webpack/webpack-dev-middleware/blob/v5.3.4/CHANGELOG.md) - [Commits](webpack/webpack-dev-middleware@v5.3.3...v5.3.4) --- updated-dependencies: - dependency-name: webpack-dev-middleware dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…Foundation#2277) Bumps [express](https://github.com/expressjs/express) from 4.18.2 to 4.19.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](expressjs/express@4.18.2...4.19.2) --- updated-dependencies: - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…undation#2276) Bumps [express](https://github.com/expressjs/express) from 4.18.2 to 4.19.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](expressjs/express@4.18.2...4.19.2) --- updated-dependencies: - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…ndation#2280) Bumps [express](https://github.com/expressjs/express) from 4.18.2 to 4.19.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](expressjs/express@4.18.2...4.19.2) --- updated-dependencies: - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…aspberryPiFoundation#2284) Bumps [express](https://github.com/expressjs/express) from 4.18.2 to 4.19.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](expressjs/express@4.18.2...4.19.2) --- updated-dependencies: - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…ts (RaspberryPiFoundation#2282) * chore(deps): Bump express from 4.18.2 to 4.19.2 in /plugins/dev-scripts Bumps [express](https://github.com/expressjs/express) from 4.18.2 to 4.19.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](expressjs/express@4.18.2...4.19.2) --- updated-dependencies: - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> * chore: update package-locks [dependabot skip] --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: blockly[bot] <blockly-github-robot@google.com>

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.4 to 1.15.6. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](follow-redirects/follow-redirects@v1.15.4...v1.15.6) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…ation#2251) Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.4 to 1.15.6. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](follow-redirects/follow-redirects@v1.15.4...v1.15.6) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…spberryPiFoundation#2252) Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.4 to 1.15.6. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](follow-redirects/follow-redirects@v1.15.4...v1.15.6) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

) Bumps [webpack-dev-middleware](https://github.com/webpack/webpack-dev-middleware) from 5.3.3 to 5.3.4. - [Release notes](https://github.com/webpack/webpack-dev-middleware/releases) - [Changelog](https://github.com/webpack/webpack-dev-middleware/blob/v5.3.4/CHANGELOG.md) - [Commits](webpack/webpack-dev-middleware@v5.3.3...v5.3.4) --- updated-dependencies: - dependency-name: webpack-dev-middleware dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…aspberryPiFoundation#2265) Bumps [webpack-dev-middleware](https://github.com/webpack/webpack-dev-middleware) from 5.3.3 to 5.3.4. - [Release notes](https://github.com/webpack/webpack-dev-middleware/releases) - [Changelog](https://github.com/webpack/webpack-dev-middleware/blob/v5.3.4/CHANGELOG.md) - [Commits](webpack/webpack-dev-middleware@v5.3.3...v5.3.4) --- updated-dependencies: - dependency-name: webpack-dev-middleware dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…PiFoundation#2279) Bumps [express](https://github.com/expressjs/express) from 4.18.2 to 4.19.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](expressjs/express@4.18.2...4.19.2) --- updated-dependencies: - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

RaspberryPiFoundation#2281) Bumps [express](https://github.com/expressjs/express) from 4.18.2 to 4.19.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](expressjs/express@4.18.2...4.19.2) --- updated-dependencies: - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…aspberryPiFoundation#2275) Bumps [express](https://github.com/expressjs/express) from 4.18.2 to 4.19.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](expressjs/express@4.18.2...4.19.2) --- updated-dependencies: - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…dation#2283) Bumps [express](https://github.com/expressjs/express) from 4.18.2 to 4.19.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](expressjs/express@4.18.2...4.19.2) --- updated-dependencies: - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

- @blockly/block-dynamic-connection@0.6.1 - @blockly/block-plus-minus@7.0.3 - @blockly/block-shareable-procedures@4.1.2 - @blockly/workspace-content-highlight@4.0.13 - @blockly/continuous-toolbox@5.0.14 - @blockly/plugin-cross-tab-copy-paste@5.0.7 - @blockly/dev-tools@7.1.7 - @blockly/disable-top-blocks@0.4.11 - @blockly/field-angle@3.0.13 - @blockly/field-bitmap@4.0.14 - @blockly/field-colour@3.0.13 - @blockly/field-colour-hsv-sliders@4.2.2 - @blockly/field-date@8.0.13 - @blockly/field-dependent-dropdown@3.0.13 - @blockly/field-grid-dropdown@4.0.12 - @blockly/field-multilineinput@3.0.14 - @blockly/field-slider@6.1.6 - @blockly/fixed-edges@4.0.12 - @blockly/keyboard-navigation@0.5.9 - @blockly/plugin-modal@6.0.11 - @blockly/plugin-scroll-options@5.0.13 - @blockly/shadow-block-converter@5.0.2 - @blockly/plugin-strict-connection-checker@4.0.12 - @blockly/suggested-blocks@4.1.7 - @blockly/theme-deuteranopia@5.0.6 - @blockly/toolbox-search@1.2.7 - @blockly/plugin-typed-variable-modal@7.0.11 - @blockly/workspace-backpack@5.3.5 - @blockly/workspace-minimap@0.1.15 - @blockly/plugin-workspace-search@8.1.4 - @blockly/zoom-to-fit@5.0.14

…dation#2294) Also update JS-Interpreter to latest version.

…ndation#2300)

…PiFoundation#2302) * fix: remove references to colour fields and blocks (RaspberryPiFoundation#2241) * chore: delete uses of colour blocks from most other plugins * chore: delete colour blocks from shadow block converter * chore: stop using colour fields in block-test plugin * fix: param order * chore: remove uses of the multiline block or field in other plugins (RaspberryPiFoundation#2239)

- @blockly/field-bitmap@4.0.16

…ation#2329)

…Foundation#2328)

No security issue.

- @blockly/block-dynamic-connection@0.6.3 - @blockly/block-plus-minus@7.0.5 - @blockly/block-shareable-procedures@4.1.4 - @blockly/workspace-content-highlight@4.0.15 - @blockly/continuous-toolbox@5.0.16 - @blockly/plugin-cross-tab-copy-paste@5.0.9 - @blockly/dev-tools@7.1.9 - @blockly/disable-top-blocks@0.4.13 - @blockly/field-angle@4.0.2 - @blockly/field-bitmap@4.0.17 - @blockly/field-colour@4.0.2 - @blockly/field-colour-hsv-sliders@4.2.5 - @blockly/field-date@8.0.15 - @blockly/field-dependent-dropdown@3.0.15 - @blockly/field-grid-dropdown@4.0.14 - @blockly/field-multilineinput@4.0.2 - @blockly/field-slider@6.1.8 - @blockly/fixed-edges@4.0.14 - @blockly/keyboard-navigation@0.5.11 - @blockly/plugin-modal@6.0.13 - @blockly/plugin-scroll-options@5.0.16 - @blockly/shadow-block-converter@5.0.4 - @blockly/plugin-strict-connection-checker@4.0.14 - @blockly/suggested-blocks@4.1.9 - @blockly/toolbox-search@1.2.9 - @blockly/plugin-typed-variable-modal@7.0.13 - @blockly/workspace-backpack@5.3.7 - @blockly/workspace-minimap@0.1.17 - @blockly/plugin-workspace-search@8.1.6 - @blockly/zoom-to-fit@5.0.16

…re is no selection (RaspberryPiFoundation#2337)

- @blockly/continuous-toolbox@5.0.17

* fix: add boolean to dispose function call (RaspberryPiFoundation#2217) * fix: replace block connections

We have for some time promulgated import * as Blockly from 'blockly/core'; as the correct way to import Blockly in our documentation. Update our own plugins and templates to match. Because we have been packaging Blockly until now only as CJS modules, and CJS modules always provide an (unnamed) default export consisting of the module.exports object, importing Blockly with import Blockly from 'blockly/core'; (note no "*") has worked fine (and similarly for all the other entrypoints). As the sources for the entrypoints (core/blockly.ts, blocks/blocks.ts, etc.) do not explicitly declare a default export, however, this should not be relied upon: when we start shipping Blockly as pure-ESM there will be no default export and so "import Blockly from …" will stop working.

- @blockly/block-dynamic-connection@0.6.4 - @blockly/block-plus-minus@7.0.6 - @blockly/block-shareable-procedures@4.1.5 - @blockly/block-test@5.1.2 - @blockly/workspace-content-highlight@4.0.16 - @blockly/continuous-toolbox@5.0.18 - @blockly/plugin-cross-tab-copy-paste@5.0.10 - @blockly/create-package@2.0.5 - @blockly/dev-tools@7.1.10 - @blockly/disable-top-blocks@0.4.14 - @blockly/field-angle@4.0.3 - @blockly/field-bitmap@4.0.18 - @blockly/field-colour@4.0.3 - @blockly/field-colour-hsv-sliders@4.2.6 - @blockly/field-date@8.0.16 - @blockly/field-dependent-dropdown@3.0.16 - @blockly/field-grid-dropdown@4.0.15 - @blockly/field-multilineinput@4.0.3 - @blockly/field-slider@6.1.9 - @blockly/fixed-edges@4.0.15 - @blockly/keyboard-navigation@0.5.12 - @blockly/migrate@2.0.6 - @blockly/plugin-modal@6.0.14 - @blockly/plugin-scroll-options@5.0.17 - @blockly/shadow-block-converter@5.0.5 - @blockly/plugin-strict-connection-checker@4.0.15 - @blockly/suggested-blocks@4.1.10 - @blockly/theme-dark@6.0.7 - @blockly/theme-deuteranopia@5.0.8 - @blockly/theme-highcontrast@5.0.7 - @blockly/theme-modern@5.0.7 - @blockly/theme-tritanopia@5.0.7 - @blockly/toolbox-search@1.2.10 - @blockly/plugin-typed-variable-modal@7.0.14 - @blockly/workspace-backpack@5.3.8 - @blockly/workspace-minimap@0.1.18 - @blockly/plugin-workspace-search@8.1.7 - @blockly/zoom-to-fit@5.0.17

…#2347)

…yPiFoundation#2344) This is now Blockly.dialog.prompt, and has been since 7.20211209.0.

google-cla · 2024-05-10T14:01:51Z

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

maribethb

LGTM, CLA failures are our own bots and expected/allowed.

maribethb · 2024-05-10T17:29:28Z

plugins/dev-tools/src/screenshot.js

  const textAreas = document.getElementsByTagName('textarea');
  for (let i = 0; i < textAreas.length; i++) {
-    textAreas[i].innerHTML = textAreas[i].value;
+    textAreas[i].innerText = textAreas[i].value;


Not sure where exactly the conflict was, but I think this is supposed to be textContent instead of innerText based on #2328 (comment)

not sure if it did get updated and that was lost in the merge conflict, or if it never did.

Following the previous merge commit, the state of some of the package-lock.json files was not quite in sync with their corresponding package.json files. Running npm install fixed this and resulted in the two changes in this commit.

* fix: remove angle fields from block-test * fix: remove colour label

dependabot bot and others added 30 commits March 21, 2024 13:01

fix(doc): correct image filename to make it can be displayed in the d…

82c094a

…oc (RaspberryPiFoundation#2269)

chore: stop testing on node 16 (RaspberryPiFoundation#2274)

46ec2ad

fix: readme for the dynamic connection previewer (RaspberryPiFoundati…

dc1d05d

…on#2272)

chore: Remove colour and multiline from devsite demo (RaspberryPiFoun…

ab11058

…dation#2294) Also update JS-Interpreter to latest version.

chore: allow const variables to have UPPER_CASE names (RaspberryPiFou…

2586fe6

…ndation#2300)

github-actions bot and others added 16 commits April 18, 2024 17:12

Publish

3985e4f

- @blockly/field-bitmap@4.0.16

fix: update screenshot.js DOM text reinterpreted as HTML

7a5dcea

fix: Update index.js DOM text reinterpreted as HTML (RaspberryPiFound…

69bfafc

…ation#2329)

fix: Update screenshot.js DOM text reinterpreted as HTML (RaspberryPi…

5665493

…Foundation#2328)

chore: Change innerHTML to textContent

253454d

No security issue.

fix: add typed variable plugin (RaspberryPiFoundation#2335)

d3ebb56

fix: only select the first category when the flyout is shown when the…

fe779cb

…re is no selection (RaspberryPiFoundation#2337)

Publish

177f2e9

- @blockly/continuous-toolbox@5.0.17

fix: add boolean to dispose function call (RaspberryPiFoundation#2341)

161c0d1

* fix: add boolean to dispose function call (RaspberryPiFoundation#2217) * fix: replace block connections

chore: fix multiline package lock (RaspberryPiFoundation#2340)

7f995dd

fix: remove keyboard nav option from dev-tools (RaspberryPiFoundation…

6215a7e

…#2347)

fix(block-test): Fix incorrect references to Blockly.prompt (Raspberr…

3684d45

…yPiFoundation#2344) This is now Blockly.dialog.prompt, and has been since 7.20211209.0.

chore: Merge branch 'master' into v11.0.0

73d0f9d

cpcallen requested a review from a team as a code owner May 10, 2024 14:01

cpcallen requested review from maribethb and removed request for a team May 10, 2024 14:01

github-actions bot assigned maribethb May 10, 2024

cpcallen mentioned this pull request May 10, 2024

feat: allow the dialog methods to take in extra parameters RaspberryPiFoundation/blockly#8084

Merged

1 task

fix: gh pages formatting (RaspberryPiFoundation#2343)

1d75aff

maribethb approved these changes May 10, 2024

View reviewed changes

cpcallen and others added 3 commits May 10, 2024 19:17

chore: Run npm install to update package lock files

2558c8e

Following the previous merge commit, the state of some of the package-lock.json files was not quite in sync with their corresponding package.json files. Running npm install fixed this and resulted in the two changes in this commit.

fix: remove angle fields from block-test (RaspberryPiFoundation#2346)

337ce75

* fix: remove angle fields from block-test * fix: remove colour label

chore: Merge branch 'master' into rc/v11.0.0

0b7e472

maribethb approved these changes May 10, 2024

View reviewed changes

cpcallen merged commit 610b1b5 into RaspberryPiFoundation:rc/v11.0.0 May 10, 2024

cpcallen deleted the chore/merge-master branch May 10, 2024 18:32

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: Merge branch `master` into `rc/v11.0.0`#2348

chore: Merge branch `master` into `rc/v11.0.0`#2348
cpcallen merged 60 commits intoRaspberryPiFoundation:rc/v11.0.0from
cpcallen:chore/merge-master

cpcallen commented May 10, 2024 •

edited

Loading

Uh oh!

google-cla bot commented May 10, 2024

Uh oh!

maribethb left a comment

Uh oh!

maribethb May 10, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

Conversation

cpcallen commented May 10, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

The basics

The details

Proposed Changes

Reason for Changes

Additional Information

Uh oh!

google-cla bot commented May 10, 2024

Uh oh!

maribethb left a comment

Choose a reason for hiding this comment

Uh oh!

maribethb May 10, 2024

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

cpcallen commented May 10, 2024 •

edited

Loading