Merge 15.2 code freeze to master #12314
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
…-editor-ui-tests Re-enable editor UI tests
…ss-Android into feature/whats-new-v2 # Conflicts: # WordPress/src/main/java/org/wordpress/android/ui/prefs/AppSettingsFragment.java # build.gradle
Make the strings used uniform with iOS and web.
…tent_metrics-hypest Display content information metrics
…ui-state Issue/12028 discover ui state
…e-to-develop Merge 15.1 code freeze to develop
…logging-in # Conflicts: # WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java # libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java
…elease_1.31.0 Gutenberg/integrate release 1.31.0
Merge gutenberg/after_1.31.0 to develop
…-material-theming RI: Post Card UI - Use default material theme colors
Fix build in develop
…-start-site-view-indicator-postion Added a special focus point position for VIEW_SITE task
…aint-creation Remove java/kotlin code constraint creation in ReaderPostAdapter with xml
…n-reader Fix npe in Reader
* Set user agent to WebView * Fix lint errors * Remove debuggable WebView option * fix lint errors
Merge 15.1 final to develop
…Colors [Gutenberg] Adjust the fetching of custom colors
|
You can trigger optional UI/connected tests for these changes by visiting CircleCI here. |
|
You can test the changes on this Pull Request by downloading the APK here. |
loremattei
approved these changes
Jun 30, 2020
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.
No description provided.