Merge 15.4 release notes to master #12568
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
…ified-login-interaction-tracking
…arted-flow Rename get started flow
…-for-wordpress-com-login Change source for wordpress_com login
…n-failure-tracking
…ified-login-interaction-tracking
…-failure-tracking Unified login failure tracking
…-interaction-tracking Add click tracking to unified login and signup flow
Merge develop into branch
…mation-screen-tracking Unified Login & Sign-Up: Add tracking to Signup Confirmation screen
…low-tracking-source Unified Login & Sign-Up: Fix tracking source for default login flow
# Conflicts: # WordPress/build.gradle # WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java # WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java # WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.java # WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.java # WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerAdapter.java # WordPress/src/main/java/org/wordpress/android/util/image/ImageManager.kt # WordPress/src/main/java/org/wordpress/android/util/image/ImagePlaceholderManager.kt # WordPress/src/main/java/org/wordpress/android/util/image/ImageType.kt # WordPress/src/main/res/layout/login_epilogue_sites_listitem.xml # WordPress/src/main/res/layout/site_picker_listitem.xml # WordPress/src/main/res/values-es/strings.xml # build.gradle # libs/utils/WordPressUtils/build.gradle
…ck-event Remove unnecessary click event
…-created-event Signup: Add source property to account creation event
…ed-layout-params-in-aev Updated layout params logic in AEV
…api-results-from-repo RI: Fetch "Interests" tags from ReaderTagRepository
…po-refresh-posts Add fun to support refresh requests
…buttons-issues Prevent LoginEmailFragment from trying to disable nonexistent button when using old layout
…ttom_sheet_x Prepublishing Nudges : Remove the close button from the bottom sheet
…cy-detected-issue Turn off predictive item animations for WrappingLinearLayoutManager
…lls-in-upload-completion-processors Guard for json nulls in upload completion processors
Merge Release/15.3 into develop
jkmassel
approved these changes
Jul 30, 2020
Generated by 🚫 dangerJS |
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.
Now that we are reading the strings from
develop, we don't need to merge code freeze tomasteranymore. However, I don't know if we still need to do it for release notes. I am creating this PR just to be on the safe side.@loremattei could you please confirm that we don't need to do this anymore so I can remove this step from the release scenario?