Skip to content

Commit 1ef03c0

Browse files
authored
Merge pull request #19713 from wordpress-mobile/release/23.8
Merge 23.8-rc-3 and editorialized release notes to trunk
2 parents 5594c34 + 0a3337b commit 1ef03c0

83 files changed

Lines changed: 3110 additions & 2461 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

WordPress/build.gradle

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ android {
142142
buildConfigField "boolean", "ENABLE_DOMAIN_MANAGEMENT_FEATURE", "false"
143143
buildConfigField "boolean", "PLANS_IN_SITE_CREATION", "false"
144144
buildConfigField "boolean", "READER_IMPROVEMENTS", "false"
145+
buildConfigField "boolean", "BLOGANUARY_DASHBOARD_NUDGE", "false"
145146

146147
// Override these constants in jetpack product flavor to enable/ disable features
147148
buildConfigField "boolean", "ENABLE_SITE_CREATION", "true"
@@ -420,14 +421,8 @@ dependencies {
420421
implementation "androidx.lifecycle:lifecycle-process:$androidxLifecycleVersion"
421422
implementation "com.android.volley:volley:$androidVolleyVersion"
422423
implementation "com.google.android.gms:play-services-auth:$googlePlayServicesAuthVersion"
424+
implementation "com.google.android.gms:play-services-code-scanner:$googlePlayServicesCodeScannerVersion"
423425
implementation "com.google.mlkit:barcode-scanning-common:$googleMLKitBarcodeScanningVersion"
424-
implementation "com.google.mlkit:text-recognition:$mlkitTextRecognitionVersion"
425-
implementation "com.google.mlkit:barcode-scanning:$mlkitBarcodeScanningVersion"
426-
427-
// CameraX
428-
implementation "androidx.camera:camera-camera2:$androidxCameraVersion"
429-
implementation "androidx.camera:camera-lifecycle:$androidxCameraVersion"
430-
implementation "androidx.camera:camera-view:$androidxCameraVersion"
431426

432427
implementation "com.android.installreferrer:installreferrer:$androidInstallReferrerVersion"
433428
implementation "com.github.chrisbanes:PhotoView:$chrisbanesPhotoviewVersion"

WordPress/jetpack_metadata/PlayStoreStrings.po

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@ msgstr ""
1010
"X-Generator: VsCode\n"
1111
"Project-Id-Version: Jetpack - Apps - Android - Release Notes\n"
1212

13+
msgctxt "release_note_238"
14+
msgid ""
15+
"23.8:\n"
16+
"- Block editor only shows the “ungroup” option for nested blocks that support it.\n"
17+
"- Optimize Images setting uses optimal size and quality by default.\n"
18+
"- Themes install properly for sites on Business and Commerce plans.\n"
19+
msgstr ""
20+
1321
msgctxt "release_note_237"
1422
msgid ""
1523
"23.7:\n"
@@ -18,15 +26,6 @@ msgid ""
1826
"- We fixed block editor issues caused by pasting deeply nested content, or using text colors in older site themes.\n"
1927
msgstr ""
2028

21-
msgctxt "release_note_236"
22-
msgid ""
23-
"23.6:\n"
24-
"- New domain/plan options and checkout screens in site creation process\n"
25-
"- My Site navigation has links to common sections\n"
26-
"- Inactive social icons and Synced Pattern titles are visible in dark mode for block-based themes\n"
27-
"- Content can be converted into blocks in the Classic editor\n"
28-
msgstr ""
29-
3029
#. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
3130
#. translators: Title to be displayed in the Play Store. Limit to 30 characters including spaces and commas!
3231
msgctxt "play_store_app_title"
Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
* [*] [Jetpack-only] Block Editor: Ensure text is always visible within Contact Info block [https://github.com/Automattic/jetpack/pull/33873]
2-
* [*] Block Editor: Ensure uploaded audio is always visible within Audio block [https://github.com/WordPress/gutenberg/pull/55627]
3-
* [*] Block Editor: In the deeply nested block warning, only display the ungroup option for blocks that support it [https://github.com/WordPress/gutenberg/pull/56445]
4-
* [**] Enable Optimize Image setting (via Me → App Settings) by default, and change default compression and resolution values. [https://github.com/wordpress-mobile/WordPress-Android/pull/19581]
5-
* [*] Fixed an issue that prevented theme installation on atomic sites [https://github.com/wordpress-mobile/WordPress-Android/pull/19668]
6-
1+
- Block editor only shows the “ungroup” option for nested blocks that support it.
2+
- Optimize Images setting uses optimal size and quality by default.
3+
- Themes install properly for sites on Business and Commerce plans.

WordPress/metadata/PlayStoreStrings.po

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,21 @@ msgstr ""
1010
"X-Generator: VsCode\n"
1111
"Project-Id-Version: Release Notes & Play Store Descriptions\n"
1212

13+
msgctxt "release_note_238"
14+
msgid ""
15+
"23.8:\n"
16+
"- Block editor only shows the “ungroup” option for nested blocks that support it.\n"
17+
"- Optimize Images setting uses optimal size and quality by default.\n"
18+
"- Themes install properly for sites on Business and Commerce plans.\n"
19+
msgstr ""
20+
1321
msgctxt "release_note_237"
1422
msgid ""
1523
"23.7:\n"
1624
"- The Posts & Pages screen now has clean, simple display options. The context menu also lets you access comments, settings, and other actions for a post or page.\n"
1725
"- We fixed block editor issues caused by pasting deeply nested content, or using text colors in older site themes.\n"
1826
msgstr ""
1927

20-
msgctxt "release_note_236"
21-
msgid ""
22-
"23.6:\n"
23-
"- Inactive social icons and Synced Pattern titles are no longer invisible in block-based themes using dark mode. Good try, fellas, but you’re not as ninja as you think.\n"
24-
"- In the Classic editor, you can now convert your content into blocks with the click of a button.\n"
25-
msgstr ""
26-
2728
#. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
2829
#. translators: Shorter Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
2930
msgctxt "sample_post_content"
Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
* [*] Block Editor: Ensure uploaded audio is always visible within Audio block [https://github.com/WordPress/gutenberg/pull/55627]
2-
* [*] Block Editor: In the deeply nested block warning, only display the ungroup option for blocks that support it [https://github.com/WordPress/gutenberg/pull/56445]
3-
* [**] Enable Optimize Image setting (via Me → App Settings) by default, and change default compression and resolution values. [https://github.com/wordpress-mobile/WordPress-Android/pull/19581]
4-
* [*] Fixed an issue that prevented theme installation on atomic sites [https://github.com/wordpress-mobile/WordPress-Android/pull/19668]
1+
- Block editor only shows the “ungroup” option for nested blocks that support it.
2+
- Optimize Images setting uses optimal size and quality by default.
3+
- Themes install properly for sites on Business and Commerce plans.

WordPress/src/main/java/org/wordpress/android/modules/CodeScannerModule.kt

Lines changed: 0 additions & 38 deletions
This file was deleted.

WordPress/src/main/java/org/wordpress/android/ui/barcodescanner/BarcodeScanner.kt

Lines changed: 0 additions & 99 deletions
This file was deleted.

WordPress/src/main/java/org/wordpress/android/ui/barcodescanner/BarcodeScannerScreen.kt

Lines changed: 0 additions & 146 deletions
This file was deleted.

0 commit comments

Comments
 (0)