Merge release/25.6 into trunk #21613
Open
+2,166
−1,686
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
Utilizing the existing `FeatureConfig` implementation meant the experimental features were always disabled in production builds, regardless if a user manually enabled the associated toggle. This occurred because `FeatureConfig` ignores manual overrides in production, instead respecting the build or remote configuration. The new experimental feature implementation relies solely on `AppPrefs` for experimental features, allowing toggling their active state in all build types. The new implementation does not support build- or remote-controlled configuration.
* Add editorialized release notes for version * Update WordPress `PlayStoreStrings.po` for version 25.6 * Update Jetpack `PlayStoreStrings.po` for version 25.6 --------- Co-authored-by: Oguz Kocer <oguz.kocer@automattic.com>
* Use a webview for WP.com login * Use Custom Chrome Tabs * Rename showEmailLoginScreen->showWPcomLoginScreen * Use showWPcomLoginScreen to reauthenticate * Don’t compile if secrets are missing * Use the latest secrets.properties * Changed start and exit animations * Preload the login page * Fix Detekt issues * Move redirect URI into build.grade It’s not a secret * Fix merge issue --------- Co-authored-by: Nick Bradbury <nick.bradbury@gmail.com>
Generated by 🚫 Danger |
|
|
| App Name |  WordPress |
|
| Flavor | Jalapeno | |
| Build Type | Debug | |
| Version | pr21613-13c2b25 | |
| Commit | 13c2b25 | |
| Direct Download | wordpress-prototype-build-pr21613-13c2b25.apk |
|
| App Name |  Jetpack |
|
| Flavor | Jalapeno | |
| Build Type | Debug | |
| Version | pr21613-13c2b25 | |
| Commit | 13c2b25 | |
| Direct Download | jetpack-prototype-build-pr21613-13c2b25.apk |
|
@oguzkocer I can take care of these merge conflicts, but I'll need to pull |
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.6intotrunk.Via intermediate branch
merge/release-25.6-into-trunk, to help fix conflicts if any: