Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop into rc/v11.0.0 #7928

Closed
wants to merge 39 commits into from
Closed

Merge develop into rc/v11.0.0 #7928

wants to merge 39 commits into from

Conversation

BeksOmega
Copy link
Collaborator

Re-merge after #7893 but this time actually merge commit instead of squashing so we can track where V11 is relative to develop.

BeksOmega and others added 30 commits February 2, 2024 14:48
Bumps [prettier](https://github.com/prettier/prettier) from 3.1.1 to 3.2.5.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](prettier/prettier@3.1.1...3.2.5)

---
updated-dependencies:
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Merge pull request #7858 from google/rc/v10.4.0
fix: connection previewer disposing too early
fix: connection previewer disposing too early
(cherry picked from commit da3ec25)
Merge pull request #7860 from google/rc/v10.4.1
chore: merge master into develop following v10.4.1
fix: typo in Click event class docs
Bumps [undici](https://github.com/nodejs/undici) from 5.26.3 to 5.28.3.
- [Release notes](https://github.com/nodejs/undici/releases)
- [Commits](nodejs/undici@v5.26.3...v5.28.3)

---
updated-dependencies:
- dependency-name: undici
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* fix: insertion marker drag scaling

* chore: added docs for other params
* fix: insertion marker drag scaling

* chore: added docs for other params

(cherry picked from commit 0e3a6e9)
release: v10.4.2
dependabot bot and others added 9 commits February 27, 2024 17:45
Bumps [eslint](https://github.com/eslint/eslint) from 8.56.0 to 8.57.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](eslint/eslint@v8.56.0...v8.57.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
chore: master into develop following v10.4.2
definiton -> definition
* fix: shouldPreventMove not being respected

* fix: PR comments
* fix: special case zelos for connection previewing

* chore: add TODO
@BeksOmega BeksOmega changed the title Merge develope into rc/v11.0.0 Merge develop into rc/v11.0.0 Mar 12, 2024
@BeksOmega BeksOmega closed this Mar 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants