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.

Sign up for GitHub

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

Jump to bottom

Merge 13.0 into master #10308

Merged
merged 493 commits into from
Jul 31, 2019
Merged

Merge 13.0 into master #10308

merged 493 commits into from
Jul 31, 2019

Conversation

jkmassel
Copy link
Contributor

Contains all changes except the release notes. Those will be merged in a separate PR as soon as they're ready.

theck13 added 30 commits July 23, 2019 14:58
@theck13
Update color resource from purple 200 (#beabce) to purple 20 (#d48fc8)
cf57c0f
@theck13
Update color resource from purple 300 (#a88ebe) to purple 30 (#c475bd)
85e7a29
@theck13
Update color resource from purple 400 (#9273af) to purple 40 (#b35eb1)
7d15d47
@theck13
Update color resource from purple 500 (#7c589f) to purple 50 (#984a9c)
d2803b8
@theck13
Update color resource from purple 600 (#634581) to purple 60 (#7c3982)
ddb5054
@theck13
Update color resource from purple 700 (#4b3264) to purple 70 (#662c6e)
129a02d
@theck13
Update color resource from purple 800 (#342148) to purple 80 (#4d2054)
8835008
@theck13
Update color resource from purple 900 (#1f112e) to purple 90 (#35163b)
534d105
@theck13
Add color resource purple 100 (#1e0c21)
09732f1
@theck13
Update color resource from red 0 (#fdf3f1) to red 0 (#f7edee)
1287a67
@theck13
Update color resource from red 50 (#fadad3) to red 5 (#ffccd0)
55199e9
@theck13
Update color resource from red 100 (#f8bfb4) to red 10 (#ffa6ab)
99918b1
@theck13
Update color resource from red 200 (#f19d8d) to red 20 (#ff8085)
a68117c
@theck13
Update color resource from red 300 (#e77a68) to red 30 (#f86368)
f2e6e4f
@theck13
Update color resource from red 400 (#da5544) to red 40 (#e65054)
1ea1b8b
@theck13
Update color resource from red 500 (#ca2622) to red 50 (#d63638)
12b4f2c
@theck13
Update color resource from red 600 (#a82620) to red 60 (#b32d2e)
4ccf665
@theck13
Update color resource from red 700 (#87241d) to red 70 (#8a2424)
e78b970
@theck13
Update color resource from red 800 (#68211a) to red 80 (#691c1c)
e30f478
@theck13
Update color resource from red 900 (#491d17) to red 90 (#451313)
1a873f7
@theck13
Add color resource red 100 (#240a0a)
de07cbe
@theck13
Update color resource from yellow 0 (#fdfaf4) to yellow 0 (#f7f2e6)
873c4b8
@theck13
Update color resource from yellow 50 (#faf0db) to yellow 5 (#f7e1ae)
651ae6d
@theck13
Update color resource from yellow 100 (#f7e5c0) to yellow 10 (#f2cf75)
532951c
@theck13
Update color resource from yellow 200 (#f1d79d) to yellow 20 (#f0c443)
a0b9e9b
@theck13
Update color resource from yellow 300 (#e9ca7a) to yellow 30 (#dbae17)
1b2b694
@theck13
Update color resource from yellow 400 (#e0bd56) to yellow 40 (#b69000)
e1f817b
@theck13
Update color resource from yellow 500 (#d6b02c) to yellow 50 (#907300)
f589752
@theck13
Update color resource from yellow 600 (#ba9830) to yellow 60 (#705b00)
c9d47f0
@theck13
Update color resource from yellow 700 (#9e8132) to yellow 70 (#5c4b00)
1d0e028
daniloercoli and others added 22 commits July 29, 2019 12:23
@daniloercoli
Make sure to reload editor details from the remote backend at startup…
5780209 
…, together with site details.

This happens only when the migration v12.9 -> 13.0 has already happened.
@daniloercoli
Update FluxC hash and make sure to write the value of the editor imme…
aff188f 
…diatelly to the DB, before starting network calls.
@JavonDavis
add additional check to wait for overflow menu and renable tests on PRs
73f46d5
@JavonDavis
remove Slack notifications from config
073f74f
@JavonDavis
Merge pull request #10294 from wordpress-mobile/fix/flaky-connected-t…
cae47f9 
…ests

Run connected tests on CI for every PR(round 2)
@daniloercoli
Use FluxC tagged version
8b2de41
@hypest
Revise the RELEASE-NOTES.txt to mention auto-enable on block post open
f3e4493
@daniloercoli
Merge pull request #10254 from wordpress-mobile/gb/move-editor-prefer…
8163d8d 
…ence-toggle-to-site-settings

Move editor preference option to Site Settings screen
@jkmassel
Fix translations
10a8556
@jkmassel
Fix broken CI
9ee1afe
@jkmassel
Merge pull request #10291 from wordpress-mobile/release/12.9
6f78d89 
Merge Release/12.9 into develop
@malinajirka
Merge pull request #10289 from wordpress-mobile/issue/10288-retry-sub…
00c735a 
…mit-for-review

Show retry when submit for review fails
@jtreanor
Revert "Run connected tests on CI for every PR(round 2)"
0fa7038
@daniloercoli
Fix a crash on the help screen (issue reported at login phase) where …
cb7d24c 
…we were accessing the selected site, but there isn't any site in the app yet.
@jtreanor
Don't revert EditorPage change
54fc26c
@jtreanor
Don't revert firebase test-targets change
34773e1
@malinajirka
Merge pull request #10302 from wordpress-mobile/fix/NPE-tapping-help-…
b1af64d 
…on-login-screen

Fix NPE on login screen when tapping Help icon
@planarvoid
Merge pull request #10304 from wordpress-mobile/revert-10294-fix/flak…
5a9683b 
…y-connected-tests

Revert "Run connected tests on CI for every PR(round 2)"
@jkmassel
Merge the bumped version number
086e2d2
@jkmassel
Bump version number
751c6e9
@jkmassel
Update release notes.
dd63754
@jkmassel
Add some additional release notes
44b33e2
@jkmassel jkmassel added the Releases Label related to managing releases label Jul 30, 2019
@jkmassel jkmassel added this to the 13.0 ❄️ milestone Jul 30, 2019
@jkmassel jkmassel requested a review from jtreanor July 30, 2019 22:03
@jkmassel jkmassel self-assigned this Jul 30, 2019
@peril-wordpress-mobile
Copy link

Warnings
⚠️ The PlayStoreStrings.po file must be updated any time changes are made to release notes
⚠️ PR has more than 500 lines of code changing. Consider splitting into smaller PRs if possible.
Messages
📖

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!
WARNING: Make sure your git version is 2.19.x or lower - there is currently a bug in later versions that will corrupt the subtree history!

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

Generated by 🚫 dangerJS

@jkmassel jkmassel merged commit 68721ec into master Jul 31, 2019
@jkmassel jkmassel deleted the merge/13.0-into-master branch July 31, 2019 21:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtreanor jtreanor jtreanor approved these changes

Assignees

@jkmassel jkmassel

Labels
Releases Label related to managing releases
Projects
None yet
Milestone
13.0
Development

Successfully merging this pull request may close these issues.