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

chore: Merge master back into develop following v10.1.1 release #7378

Merged
merged 11 commits into from
Aug 10, 2023

Conversation

ericblackmonGoogle
Copy link
Contributor

@ericblackmonGoogle ericblackmonGoogle commented Aug 10, 2023

The basics

  • My pull request is against develop
  • My code follows the style guide

The details

Proposed Changes

Merge master back into develop

ericblackmonGoogle and others added 11 commits July 17, 2023 16:30
* fix(generators): Changes to exports and access controls for TypeScript compatibility (#7295)

* fix(generators): Add missing declarations for Order enums

* chore(generators): Remove spurious whitespace

* fix(generators): Make provideFunction_ etc. public

  Remove the protected declaration on provideFunction_ and
  FUNCTION_NAME_PLACEHOLDER_ so they can be used from generator
  functions written in TypeScript.

  Not strictly part of #7283, but closely related and required to
  fixing the related issue google/blockly-samples#1785.

* chore(generators): format

(cherry picked from commit d503fbb)

* fix: Correct errors in `HSV_SATURATION`, `HSV_VALUE` accessors (#7297)

* fix: Correct errors in HSV_SATURATION, HSV_VALUE accessors

  Fix the comment / message errors noted in
  #7249 (comment)

* chore: Add renamings for HSV_SATURATION, HSV_VALUE

(cherry picked from commit 1bc4f67)

* release: Update version number to 10.0.2

---------

Co-authored-by: Christopher Allen <cpcallen+git@google.com>
Merge pull request #7371 from google/rc/v10.1.0
…To (#7333)" (#7375)

This reverts commit dbe926d.

The reverted commit made it so that RTL flyouts were rendered incorrectly.

(cherry picked from commit 7bca438)
@ericblackmonGoogle ericblackmonGoogle requested a review from a team as a code owner August 10, 2023 21:18
@github-actions github-actions bot added the PR: chore General chores (dependencies, typos, etc) label Aug 10, 2023
@github-actions github-actions bot added PR: chore General chores (dependencies, typos, etc) and removed PR: chore General chores (dependencies, typos, etc) labels Aug 10, 2023
@ericblackmonGoogle ericblackmonGoogle merged commit a8fca2d into develop Aug 10, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PR: chore General chores (dependencies, typos, etc)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants