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 main into release/7 #9602

Merged
merged 39 commits into from Apr 30, 2024
Merged

Merge main into release/7 #9602

merged 39 commits into from Apr 30, 2024

Conversation

tiny-ben-tran
Copy link
Contributor

Related Ticket:

Description of Changes:

  • Cut RC for 7.1

Pre-checks:

  • Changelog entry added
  • Tests have been added (if applicable)
  • Branch prefixed with feature/, hotfix/ or spike/

Review:

  • Milestone set
  • Docs ticket created (if applicable)

GitHub issues (if applicable):

TheSpyder and others added 30 commits March 12, 2024 10:29
…ent API with tests. (#9482)

* TINY-10370: cover `{$caret}` feature with tests

* TINY-10370: create separate folder for InserContent related tests
#9474)

* TINY-10590: Tree dom structure could confuse block merge boundary detection

* TINY-10590: Fixup to missed detail.
* TINY-10602: Add missing jax path to root tsconfig

* TINY-10602: Work around Safari bug with 404 responses to https requests returning an empty `statusText`

* TINY-10602: Disable lerna version on TinyMCE

* TINY-10602: Disable noUnusedLocals. Eslint picks that up, it's too frustrating to be a compiler error

* TINY-10602: Cleanup

* TINY-10602: Remove prismjs as an explicit dependency - it's transitive via oxide

* TINY-10602: Bump hook timeout to 10s for slow LambdaTest connections

* TINY-10602: Every before() hook that is async now bumps the timeout from 2 seconds to 10

* TINY-10602: Restored `noEmitOnError` as we no longer enforce build mode

* TINY-10602: Tweak build setup so that the monorepo root is not treated as a project, which might help avoid tinymce rebuilds
…S files (#9523)

* TINY-10602: The theme loader now respects the suffix when loading skin CSS files. Refactored the loader to reduce duplication.

* Tweaked wording of changelog entry

* Update .changes/unreleased/tinymce-TINY-10602-2024-04-04.yaml

Co-authored-by: spocke <spocke@moxiecode.com>

---------

Co-authored-by: spocke <spocke@moxiecode.com>
* TINY-10809: Added mathml ns element type

* TINY-10809: Added more tests

* TINY-10809: Added changelog item

* TINY-10809: Added return type for namespace type
* tabbing with alloy

* TINY-10780: little improvment

* TINY-10780: add changelog entry

* TINY-10780: fix

* TINY-10780: Revert "TINY-10780: fix"

This reverts commit a50d746.

---------

Co-authored-by: Spocke <spocke@moxiecode.com>
…kup changed to use an `h1` element (#9521)

Co-authored-by: Andrew Herron <thespyder@programmer.net>
Co-authored-by: ltrouton <46954949+ltrouton@users.noreply.github.com>
… view (#9546)

* TINY-10741: Prevent view title wrapping when overflowing

* TINY-10741: Explicitly set the height of view

* TINY-10741: Show scrollbar on the toolbar when the screen is small

* TINY-10741: Show scrollbar on revision history container when the screen is small

* TINY-10741: Fix typo

* TINY-10741: Add a button to open custom view in view demo

* TINY-10741: Add changelog entry
* TINY-10726: fix ToggleToolbarDrawer command in sliding mode

* TINY-10726: add changelog
* TINY-9932: Add new global attributes to schema

* TINY-9932: Update global attributes order in schema tests

* TINY-9932: Add changelog

* TINY-9932: Updated changelog

* Update .changes/unreleased/tinymce-TINY-9932-2024-03-06.yaml

Co-authored-by: spocke <spocke@moxiecode.com>

* TINY-9932: Update failed test

* TINY-9932: Fix space key behavior in keyboard tests

* Update .changes/unreleased/tinymce-TINY-9932-2024-03-06.yaml

Co-authored-by: ltrouton <46954949+ltrouton@users.noreply.github.com>

---------

Co-authored-by: spocke <spocke@moxiecode.com>
Co-authored-by: ltrouton <46954949+ltrouton@users.noreply.github.com>
* TINY-10804: add math-equation icon

* TINY-10804: add changelog entry

* TINY-10804: typo

* TINY-10804: fix changelog entry
Co-authored-by: Andrew Herron <thespyder@programmer.net>
…9567)

* TINY-10853: Added UI elements for math plugin

* TINY-10853: Added math plugin to help

* TINY-10853: Updated math block to be centered by default

* TINY-10853: Added default margin similar to paragraphs
…ding toolbar mode (#9574)

Co-authored-by: Andrew Herron <thespyder@programmer.net>
Co-authored-by: ltrouton <46954949+ltrouton@users.noreply.github.com>
* TINY-10806: remove role attribute from Color Swatch menu item

* TINY-10806: add changelog entry

* TINY-10806: add menuRole field to menu schema

* TINY-10806: clean up

* TINY-10806: alloy change log update
…oresize plugin is active (#9575)

* TINY-9811: Add forced-colors support to placeholder content

* TINY-9811: Add changelog

* Update .changes/unreleased/tinymce-TINY-9811-2024-04-19.yaml

Co-authored-by: Andrew Herron <thespyder@programmer.net>

* TINY-9811: Refactore media query

* Update modules/tinymce/src/plugins/autoresize/demo/html/demo.html

Co-authored-by: tiny-ben-tran <ben.tran@tiny.cloud>

---------

Co-authored-by: Andrew Herron <thespyder@programmer.net>
Co-authored-by: tiny-ben-tran <ben.tran@tiny.cloud>
…lists (#9577)

* TINY-10837: Fixed list item style retaining when toggling

* TINY-10837: Updated changelog item text
HAFRMO and others added 9 commits April 23, 2024 20:12
* TINY-10283: Added undo level to setContent

* TINY-10283: Fixed up some issues.

* TINY-10283: The tests were somewhat fixed

* Updated as per request changes
…with selection expanded over link to the outside content (#9562)

* TINY-10931: Fix open link menu item in link context menu not working with selection expanded over link to the outside content

* TINY-10391: Fix fail build

* TINY-10391: Remove a test

* TINY-10391: Rename file to match its test name

* Update .changes/unreleased/tinymce-TINY-10391-2024-04-17.yaml

Co-authored-by: Andrew Herron <thespyder@programmer.net>

* TINY-10391: Change the implementation as requested

* TINY-10391: Undo some changes

* Update modules/tinymce/src/plugins/link/main/ts/core/Actions.ts

Co-authored-by: Andrew Herron <thespyder@programmer.net>

* TINY-10741: Add more tests and proper cleanup

* TINY-10741: Change test title

* Update .changes/unreleased/tinymce-TINY-10391-2024-04-17.yaml

Co-authored-by: spocke <spocke@moxiecode.com>

* TINY-10391: Fix build errors

* TINY-10391: Use correct key for non-mac platform

* TINY-10391: Another attempt to address flakes

* TINY-10391: Comment out new tests to check

* TINY-10391: Prevent new tab being opened in tests

* TINY-10391: Fix type check

---------

Co-authored-by: Andrew Herron <thespyder@programmer.net>
Co-authored-by: spocke <spocke@moxiecode.com>
…ar buttons (#9580)

* TINY-10741: Improve the visibility of focus outline on the view toolbar buttons

* TINY-10741: Move the change to only view toolbar

* TINY-10741: Move the change to the variable instead

* TINY-10741: Use variable instead of arbitrary value
Co-authored-by: Andrew Herron <thespyder@programmer.net>
* TINY-10886: Clamp notification width to editor width

* TINY-10886: Added changelog item

* TINY-10886: Added ticket id to test label

* TINY-10886: Cleanup
…9490)

* TINY-10781: Apply high contrast colour in WHCM, retain colour swatch

* TINY-10781: Prevent system overwrite color pickers colour

* TINY-10781: Add a border when toolbar button focus/active/hover

* TINY-10781: Add border when using keyboard focus

* TINY-10781: Remove brightness filter, table toolbar popup arrow

* TINY-10781: Apply forced colors for active dialog body navigation item

* TINY-10781: Add more contrast when selecting table grid

* TINY-10781: Apply outline instead of border for toolbar button hover and focus

* TINY-10781: Apply forced colors for active tooltip in tooltip.less

* TINY-10781: Apply forced colors for active collection toolbar items

* TINY-10781: Removed unused css

* TINY-10781: Refactor color-picker change

* TINY-10781: Remove duplicate

* TINY-10781: Add changelog

* TINY-10781: Change toolbar button hover outline

* TINY-10781: Address svg and border colour in high contrast mode

* TINY-10781: Changed how colour preview looks in high contrast mode

* Update .changes/unreleased/tinymce-TINY-10781-2024-04-22.yaml

Co-authored-by: Andrew Herron <thespyder@programmer.net>

---------

Co-authored-by: Andrew Herron <thespyder@programmer.net>
…edded link (#9594)

* TINY-10391: Fix open link context menu not enabled for image with embedded link

* TINY-10391: Add changelog entry

* TINY-10391: Fix type errors and tests

* TINY-10391: Change target for opening context menu

* Update .changes/unreleased/tinymce-TINY-10391-2024-04-26.yaml

Co-authored-by: Andrew Herron <thespyder@programmer.net>

---------

Co-authored-by: Andrew Herron <thespyder@programmer.net>
@tiny-ben-tran tiny-ben-tran changed the title TINY-10631: Merge main into release/7 Merge main into release/7 Apr 30, 2024
Copy link
Contributor

@ltrouton ltrouton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Do a merge commit

@tiny-ben-tran tiny-ben-tran merged commit 1b8e094 into release/7 Apr 30, 2024
5 checks passed
@tiny-ben-tran tiny-ben-tran deleted the hotfix/merge-main-7.1 branch April 30, 2024 04:08
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.

None yet

10 participants