Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release 12.7 into master #10067

Merged
merged 198 commits into from
Jun 19, 2019
Merged

Merge release 12.7 into master #10067

merged 198 commits into from
Jun 19, 2019

Conversation

loremattei
Copy link
Contributor

Merge release 12.7 into master

adsonafonso and others added 30 commits May 6, 2019 21:51
…snackbar

replace toast with snackbar when publishing a post while offline
hypest and others added 23 commits June 14, 2019 13:55
…client-error

Handle 2FA error for OAuth client during login
78c5307f7a Merge pull request #16 from wordpress-mobile/fix_crash_in_login_email_fragment
edd8684ec4 Merge pull request #18 from wordpress-mobile/new-wpandroid-changes
71729e5e76 Merge pull request #17 from wordpress-mobile/issue/glide-4.9
aabdedf672 Merge commit '099b5a011d32283eb6c79b0e599b5272a597e849' into update-login-library
1eb7f4f156 Updated Glide to 4.9.0
a32cc8c09d Add crash fix to SignupEmailFragment
08109fa90f Adds non-null check to onActivityResult
664b67f62d Fix  #9826: make sure we Play Services are available before running the email hint picker
94a0ae2a39 Merge pull request #9743 from wordpress-mobile/feature/manage_insights_readonly
7cad17e264 Fix a few ContentDescription lint errors
9f171b55d0 Merge branch 'feature/manage_insights_readonly' into issue/9464-manage-insights
663a168903 Add the missing drawable resources

git-subtree-dir: libs/login
git-subtree-split: 78c5307f7a8a15cae1a164e4cbb0b7b924a37d37
…ain-registration-feature-flag

Remove feature flag and custom domain check from plugins row visibility check
Update libs/mocks subtree with WPiOS updates
@loremattei loremattei added the Releases Label related to managing releases label Jun 19, 2019
@loremattei loremattei added this to the 12.7 ❄️ milestone Jun 19, 2019
@loremattei loremattei requested a review from jtreanor June 19, 2019 09:29
@peril-wordpress-mobile
Copy link

Warnings
⚠️ PR has more than 500 lines of code changing. Consider splitting into smaller PRs if possible.
⚠️

This PR contains changes in the subtree libs/login/. It is your responsibility to ensure these changes are merged back into WordPress-Login-Flow-Android. Follow these handy steps!

  1. cd WordPress-Android
  2. git checkout merge-release-12.7-into-master
  3. git subtree push --prefix=libs/login/ https://github.com/wordpress-mobile/WordPress-Login-Flow-Android.git merge/WordPress-Android/10067
  4. Browse to https://github.com/wordpress-mobile/WordPress-Login-Flow-Android/pull/new/merge/WordPress-Android/10067 and open a new PR.

Generated by 🚫 dangerJS

@loremattei loremattei merged commit da7d077 into master Jun 19, 2019
@loremattei loremattei deleted the merge-release-12.7-into-master branch June 19, 2019 09:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Releases Label related to managing releases
Projects
None yet
Development

Successfully merging this pull request may close these issues.