Merge release/25.4 into trunk #23628
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Generated by 🚫 Danger |
|
| App Name |  WordPress Alpha |
|
| Configuration | Release-Alpha | |
| Build Number | pr23628-6b0fac6 | |
| Version | 25.4 | |
| Bundle ID | org.wordpress.alpha | |
| Commit | 6b0fac6 | |
| App Center Build | WPiOS - One-Offs #10741 |
|
| App Name |  Jetpack Alpha |
|
| Configuration | Release-Alpha | |
| Build Number | pr23628-6b0fac6 | |
| Version | 25.4 | |
| Bundle ID | com.jetpack.alpha | |
| Commit | 6b0fac6 | |
| App Center Build | jetpack-installable-builds #9784 |
oguzkocer
approved these changes
Sep 27, 2024
jkmassel
added a commit
that referenced
this pull request
Oct 2, 2024
* Merge release/25.4 into trunk (#23628) * Bump version number * Update draft release notes for 25.4. * Update draft release notes for 25.4. * Release Notes: add new section for next version (25.5) * Update strings for localization * feat: Persist GutenbergKit changes Ensure post changes are not lost. * fix: Persist changes if either post title or content changes The previous conditional erroneously ignored changes unless both values changed. * build: Update GutenbergKit ref * fix: Improve empty editor content check As noted in the code comment, this value lags behind reality. A race condition existed in production builds cause inaccurate values. This was removed to instead rely upon the existing `editorHasContent` implementation found in the `PostEditor` class. * build: Update GutenbergKit ref * build: Update GutenbergKit ref * build: Update GutenbergKit ref * Update GutenbergKit ref * Update GutenbergKit ref --------- Co-authored-by: WordPress Mobile Bot Account <mobile+wpmobilebot@automattic.com> Co-authored-by: Gerardo <gerardo.pacheco@automattic.com> Co-authored-by: Jeremy Massel <1123407+jkmassel@users.noreply.github.com>
github-merge-queue bot
pushed a commit
that referenced
this pull request
Oct 7, 2024
* Bump version number * Update draft release notes for 25.4. * Update draft release notes for 25.4. * Release Notes: add new section for next version (25.5) * Update strings for localization * Shave a few bytes off all our icons * Update app translations – `Localizable.strings` * Update WordPress metadata translations * Update Jetpack metadata translations * Bump version number * Remove alpha channel from WordPress light icon (Any Appearance) This was done to address an iTMS rejection: Asset validation failed (90717) Invalid large app icon. The large app icon in the asset catalog in “WordPress.app” can’t be transparent or contain an alpha channel. For details, visit: https://developer.apple.com/design/human-interface-guidelines/app-icons. See https://buildkite.com/automattic/wordpress-ios/builds/24053#019234f2-8086-4160-904a-328283175b3b This was done via Preview.app: Export... > PNG unticking the "Alpha" channel. * Upload Fastlane to handle occasional ASC upload issue * Update app translations – `Localizable.strings` * Bump version number * Bump version number * Stop handling WordPress.com links in the WordPress app (#23653) * Stop handling WordPress.com links in the WordPress app * Address a build failure in the tests because of unhandled `XCTSkip` --------- Co-authored-by: Gio Lodi <gio@mokacoding.com> * feat: Synchronize content with GutenbergKit (#23631) * Merge release/25.4 into trunk (#23628) * Bump version number * Update draft release notes for 25.4. * Update draft release notes for 25.4. * Release Notes: add new section for next version (25.5) * Update strings for localization * feat: Persist GutenbergKit changes Ensure post changes are not lost. * fix: Persist changes if either post title or content changes The previous conditional erroneously ignored changes unless both values changed. * build: Update GutenbergKit ref * fix: Improve empty editor content check As noted in the code comment, this value lags behind reality. A race condition existed in production builds cause inaccurate values. This was removed to instead rely upon the existing `editorHasContent` implementation found in the `PostEditor` class. * build: Update GutenbergKit ref * build: Update GutenbergKit ref * build: Update GutenbergKit ref * Update GutenbergKit ref * Update GutenbergKit ref --------- Co-authored-by: WordPress Mobile Bot Account <mobile+wpmobilebot@automattic.com> Co-authored-by: Gerardo <gerardo.pacheco@automattic.com> Co-authored-by: Jeremy Massel <1123407+jkmassel@users.noreply.github.com> * Fix an issue with comment selection state disappearing (#23658) * Disable Reader anouncemnets (#23655) * Fix an issue with Me header view alignment (#23647) * Add Gutenberg Experimental Editor Switch (#23660) * Add TipKit for Sidebar (#23648) * Enable TipKit FF (#23661) * Fix crash in TipKit (#23664) * Update strings for localization * Update app translations – `Localizable.strings` * Bump version number --------- Co-authored-by: Jeremy Massel <1123407+jkmassel@users.noreply.github.com> Co-authored-by: Ian Maia <ian.maia@automattic.com> Co-authored-by: Gio Lodi <gio@mokacoding.com> Co-authored-by: Tony Li <tony.li@automattic.com> Co-authored-by: David Calhoun <github@davidcalhoun.me> Co-authored-by: Gerardo <gerardo.pacheco@automattic.com> Co-authored-by: Alex Grebenyuk <alex.grebenyuk@automattic.com> Co-authored-by: Oguz Kocer <oguz.kocer@automattic.com>
github-merge-queue bot
pushed a commit
that referenced
this pull request
Oct 15, 2024
* Bump version number * Update draft release notes for 25.4. * Update draft release notes for 25.4. * Release Notes: add new section for next version (25.5) * Update strings for localization * Shave a few bytes off all our icons * Update app translations – `Localizable.strings` * Update WordPress metadata translations * Update Jetpack metadata translations * Bump version number * Remove alpha channel from WordPress light icon (Any Appearance) This was done to address an iTMS rejection: Asset validation failed (90717) Invalid large app icon. The large app icon in the asset catalog in “WordPress.app” can’t be transparent or contain an alpha channel. For details, visit: https://developer.apple.com/design/human-interface-guidelines/app-icons. See https://buildkite.com/automattic/wordpress-ios/builds/24053#019234f2-8086-4160-904a-328283175b3b This was done via Preview.app: Export... > PNG unticking the "Alpha" channel. * Upload Fastlane to handle occasional ASC upload issue * Update app translations – `Localizable.strings` * Bump version number * Bump version number * Stop handling WordPress.com links in the WordPress app (#23653) * Stop handling WordPress.com links in the WordPress app * Address a build failure in the tests because of unhandled `XCTSkip` --------- Co-authored-by: Gio Lodi <gio@mokacoding.com> * feat: Synchronize content with GutenbergKit (#23631) * Merge release/25.4 into trunk (#23628) * Bump version number * Update draft release notes for 25.4. * Update draft release notes for 25.4. * Release Notes: add new section for next version (25.5) * Update strings for localization * feat: Persist GutenbergKit changes Ensure post changes are not lost. * fix: Persist changes if either post title or content changes The previous conditional erroneously ignored changes unless both values changed. * build: Update GutenbergKit ref * fix: Improve empty editor content check As noted in the code comment, this value lags behind reality. A race condition existed in production builds cause inaccurate values. This was removed to instead rely upon the existing `editorHasContent` implementation found in the `PostEditor` class. * build: Update GutenbergKit ref * build: Update GutenbergKit ref * build: Update GutenbergKit ref * Update GutenbergKit ref * Update GutenbergKit ref --------- Co-authored-by: WordPress Mobile Bot Account <mobile+wpmobilebot@automattic.com> Co-authored-by: Gerardo <gerardo.pacheco@automattic.com> Co-authored-by: Jeremy Massel <1123407+jkmassel@users.noreply.github.com> * Fix an issue with comment selection state disappearing (#23658) * Disable Reader anouncemnets (#23655) * Fix an issue with Me header view alignment (#23647) * Add Gutenberg Experimental Editor Switch (#23660) * Add TipKit for Sidebar (#23648) * Enable TipKit FF (#23661) * Fix crash in TipKit (#23664) * Update strings for localization * Update app translations – `Localizable.strings` * Bump version number * Merge 25.4 release notes to `release/25.4` (#23672) * Add editorialized release notes for version * Update metadata strings * Update metadata strings --------- Co-authored-by: Automattic Release Bot <mobile+wpmobilebot@automattic.com> * Remove ios_current_branch_is_hotfix from finalize_release * Add options param to finalize_release lane * Update app translations – `Localizable.strings` * Update WordPress metadata translations * Update Jetpack metadata translations * Bump version number * Add missing FeatureFlag.sidebar * Resolve merge conflicts: Remove sidebar FF The feature flag was removed on trunk: #23663 * Resolve merge conflicts: Remove duplicated code The code was alrady merged into trunk: #23665 --------- Co-authored-by: Jeremy Massel <1123407+jkmassel@users.noreply.github.com> Co-authored-by: Ian Maia <ian.maia@automattic.com> Co-authored-by: Gio Lodi <gio@mokacoding.com> Co-authored-by: Tony Li <tony.li@automattic.com> Co-authored-by: David Calhoun <github@davidcalhoun.me> Co-authored-by: Gerardo <gerardo.pacheco@automattic.com> Co-authored-by: Alex Grebenyuk <alex.grebenyuk@automattic.com> Co-authored-by: Oguz Kocer <oguzkocer@users.noreply.github.com> Co-authored-by: Oguz Kocer <oguz.kocer@automattic.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merging
release/25.4intotrunk.Via intermediate branch
merge/release-25.4-into-trunk, to help fix conflicts if any: