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.

Sign up for GitHub

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 25.1 code freeze into trunk #20963

Merged
merged 7 commits into from
Jun 10, 2024
Merged

Merge 25.1 code freeze into trunk #20963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d00d666
Bump version number
wpmobilebot Jun 10, 2024
fc548cb
Update draft release notes for 25.1.
wpmobilebot Jun 10, 2024
013f171
Update draft release notes for Jetpack 25.1.
wpmobilebot Jun 10, 2024
16023f4
Release Notes: add new section for next version (25.2)
wpmobilebot Jun 10, 2024
be1ff2e
Update FluxC version to 2.84.0
oguzkocer Jun 10, 2024
0361cab
Merge strings from libraries for translation
wpmobilebot Jun 10, 2024
f3a8d01
Freeze strings for translation
wpmobilebot Jun 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions RELEASE-NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
*** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]

25.2
-----


25.1
-----
* [*] [internal] Block editor: Add onContentUpdate bridge functionality [https://github.com/wordpress-mobile/gutenberg-mobile/pull/20852]
Expand Down
3 changes: 1 addition & 2 deletions WordPress/jetpack_metadata/release_notes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
The Tags feed is live! You can now see content with specific tags, all in one place. Tag, you’re it.
* [*] [internal] Block editor: Add onContentUpdate bridge functionality [https://github.com/wordpress-mobile/gutenberg-mobile/pull/20852]

We fixed assorted crashes on the login and Posts List screens, as well as actions associated with blogging reminders, feature images, and user removal. Less crashing? How smashing.
3 changes: 2 additions & 1 deletion WordPress/metadata/release_notes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
We fixed assorted crashes on the login and Posts List screens, as well as actions associated with blogging reminders, feature images, and user removal. Less crashing? How smashing.
* [*] [internal] Block editor: Add onContentUpdate bridge functionality [https://github.com/wordpress-mobile/gutenberg-mobile/pull/20852]

1 change: 1 addition & 0 deletions WordPress/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4903,5 +4903,6 @@ translators: %s: Select control option value e.g: "Auto, 25%". -->
<!-- Voice to Content -->
<string name="voice_to_content_permissions_required_title">Audio Recording Permission Required</string>
<string name="voice_to_content_permissions_required_msg">To record audio, this app needs permission to access your microphone. You have previously denied this permission. Please enable the microphone permission in the app settings to use this feature.</string>
<string name="gutenberg_native_tap_to_edit" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">Tap to edit</string>

</resources>
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ ext {
automatticTracksVersion = '5.1.0'
gutenbergMobileVersion = 'v1.120.0'
wordPressAztecVersion = 'v2.1.3'
wordPressFluxCVersion = 'trunk-f111f9d00446395f16550bca872c6098c23529e9'
wordPressFluxCVersion = '2.84.0'
wordPressLoginVersion = '1.15.0'
wordPressPersistentEditTextVersion = '1.0.2'
wordPressUtilsVersion = '3.14.0'
Expand Down
7 changes: 7 additions & 0 deletions fastlane/resources/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3100,6 +3100,7 @@
<string name="permission_images_video_audio">Photos and videos &amp; Music and audio</string>
<string name="permission_camera">Camera</string>
<string name="permission_microphone">Microphone</string>
<string name="permission_access_media_location">Media Location</string>

<!-- Login -->
<!-- If any of these appear unused, be sure to check the same string in the login library -
Expand Down Expand Up @@ -4898,4 +4899,10 @@ translators: %s: Select control option value e.g: "Auto, 25%". -->
<string name="gutenberg_native_you_can_copy_your_post_text_in_case_your_content_is_impacted_copy" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">You can copy your post text in case your content is impacted. Copy error details to debug and share with support.</string>
<string name="gutenberg_native_clear_selected_color" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">Clear selected color</string>
<string name="gutenberg_native_link_label" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">Link label</string>

<!-- Voice to Content -->
<string name="voice_to_content_permissions_required_title">Audio Recording Permission Required</string>
<string name="voice_to_content_permissions_required_msg">To record audio, this app needs permission to access your microphone. You have previously denied this permission. Please enable the microphone permission in the app settings to use this feature.</string>
<string name="gutenberg_native_tap_to_edit" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">Tap to edit</string>

</resources>
4 changes: 2 additions & 2 deletions version.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
versionName=25.0
versionCode=1435
versionName=25.1-rc-1
versionCode=1436
Loading