Merge release/26.4 into trunk #22388
Open
+5,353
−2,159
Conversation
This file contains hidden or 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
* Add editorialized release notes for 26.4 * Update WordPress `PlayStoreStrings.po` for version 26.4 * Update Jetpack `PlayStoreStrings.po` for version 26.4 --------- Co-authored-by: Tony Li <[email protected]>
* Adding a loading spinner to the recommended blogs subscribe button * Fixing the loading wrong state * Fixing it for the post details screen * Fixing blog screen subscription as well * detekt * lint fix * Using suspend function to iterate over cards * Removing the withContext, but keeping the scope usage * Some refactoring * Adding tests * Update WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderSiteHeaderView.java Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com> * Compile fix * chore: trigger CI --------- Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com>
* Supporting read and discovery deeplinks * Fixing discovery issue * Handling feed links * Handling search and tags * Some improvements * Re-adding deleted code * Lint fixes * Adding tests for ReaderActivityLauncher * Update WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com> * chore: trigger CI * Supporting the new Calypso banner specs * Adding some tests --------- Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com>
* Update editorial release notes * Update WordPress `PlayStoreStrings.po` for version 26.4 * Update Jetpack `PlayStoreStrings.po` for version 26.4 --------- Co-authored-by: Tony Li <[email protected]>
Collaborator
Generated by 🚫 Danger |
|
Contributor
Author
|
| App Name | Jetpack | |
| Flavor | Jalapeno | |
| Build Type | Debug | |
| Version | pr22388-451d107 | |
| Commit | 451d107 | |
| Direct Download | jetpack-prototype-build-pr22388-451d107.apk |
Contributor
Author
|
| App Name | WordPress | |
| Flavor | Jalapeno | |
| Build Type | Debug | |
| Version | pr22388-451d107 | |
| Commit | 451d107 | |
| Direct Download | wordpress-prototype-build-pr22388-451d107.apk |
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| <string name="he_support_new_conversation_content_description">Conversație nouă</string> | ||
| <string name="he_support_conversations_title">Conversații cu suportul</string> | ||
| <string name="ai_bot_time_weeks_ago">Acum %1$d săptămâni</string> | ||
| <string name="ai_bot_time_week_ago">Acum o săptămână</string> |
Check failure
Code scanning / Android Lint
Formatting argument types incomplete or inconsistent Error
| <string name="ai_bot_time_weeks_ago">Acum %1$d săptămâni</string> | ||
| <string name="ai_bot_time_week_ago">Acum o săptămână</string> | ||
| <string name="ai_bot_time_days_ago">Acum %1$d zile</string> | ||
| <string name="ai_bot_time_day_ago">Acum o zi</string> |
Check failure
Code scanning / Android Lint
Formatting argument types incomplete or inconsistent Error
| <string name="ai_bot_time_days_ago">Acum %1$d zile</string> | ||
| <string name="ai_bot_time_day_ago">Acum o zi</string> | ||
| <string name="ai_bot_time_hours_ago">Acum %1$d ore</string> | ||
| <string name="ai_bot_time_hour_ago">Acum o oră</string> |
Check failure
Code scanning / Android Lint
Formatting argument types incomplete or inconsistent Error
| context.startActivity(intent); | ||
| } | ||
|
|
||
| public static void viewReaderDiscoverInNewStack(Context context) { |
Check notice
Code scanning / Android Lint
Nullable/NonNull annotation missing on method parameter Note
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/26.4intotrunk.Via intermediate branch
merge/release-26.4-into-trunk, to help fix conflicts if any: