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 release/12.2 into master #9593

Merged
merged 269 commits into from
Apr 11, 2019
Merged

Merge release/12.2 into master #9593

merged 269 commits into from
Apr 11, 2019

Conversation

jtreanor
Copy link
Contributor

Merge release/12.2 into master

Update release notes:

  • If there are user facing changes, I have added an item to RELEASE-NOTES.txt.

khaykov and others added 30 commits March 22, 2019 04:29
@khaykov
Removed commented out code.
6bad1d4
@khaykov
Updated logic to proceed to plugin installation if no credits available.
0772675
@khaykov
Minor refactoring.
0038f67
@khaykov
Added better error handling.
77df9dc
@khaykov
Missed semicolon. Renamed error message.
bbc6953
@khaykov
Removed unused import.
8211ed3
@theck13
Update color resources with semantic references
9d83748
@theck13
Update color references from color primary to primary
4cccaf4
@theck13
Update color references from color primary dark to primary dark
b275951
@theck13
Update color references from color accent to accent
8eb0f32
@theck13
Update color references from color control activated to primary 300
c8a5409
@theck13
Update color references from color control highlight to neutral 100
940de34
@develric
Modified the onPageSelected callback of NotificationsDetailActivity V…
636c403 
…iewPager to fix issue #9340.
@khaykov
Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Andro…
8c6d898 
…id into issue/9426-domain-registration-prompt
@theck13
Remove color references of fab pressed
faaca95
@theck13
Update color references from transparent to android resource
3ea3d8d
@theck13
Update color references from light gray to gray 0
d96abad
@theck13
Update color references from white to android resource
c3a7212
@theck13
Update color references from black to android resource
fcfd603
@theck13
Update color references from default background to neutral 0
cc1cc86
@theck13
Update color references from blue wordpress to primary 500
79e013a
@theck13
Update color references from blue light to primary 300
f08ac48
@theck13
Update color references from blue medium to primary 400
5251c2c
@theck13
Update color references from blue dark to primary 700
b5b55d3
@theck13
Update color references from grey to neutral 300
74485cd
@theck13
Update color references from grey light to neutral 0
1480292
@theck13
Update color references from grey dark to neutral 700
9d4b74e
@theck13
Update color references from grey disabled to neutral 400
0f755cc
@theck13
Update color references from grey lighten 30 to neutral 0
0b83ddf
@theck13
Update color references from grey lighten 20 to neutral 100
b7c1e7d
mzorz and others added 26 commits April 5, 2019 21:24
@mzorz
Merge pull request #9523 from wordpress-mobile/fix/8964_Images-on-pri…
4bb7499 
…vate-sites-are-broken-in-local-preview_quick_fix

Fixes broken Images on private sites in local preview
@theck13
Add color resource for login primary color
6f8e846
@0nko
Merge pull request #9495 from wordpress-mobile/issue/update-color-scheme
fa4f422 
Issue/update color scheme
@maxme
Fix visit button padding
c645635
@maxme
Reader: align site name and date with 72dp Material recommendation
95ce264
@maxme
Merge branch 'develop' into issue/fix-minor-margin-issue-with-reader-…
95e7ba6 
…visit-button
@jtreanor
Merge remote-tracking branch 'origin/develop' into merge-release/12.1…
b64445e 
…-develop
@jtreanor
Merge branch 'release/12.1' into merge-release/12.1-develop
3783490
@theck13
Merge pull request #9525 from maxme/issue/fix-minor-margin-issue-with…
a898057 
…-reader-visit-button

Fix a minor visual issue in the reader post cards
@jtreanor
Merge pull request #9537 from wordpress-mobile/merge-release/12.1-dev…
5421087 
…elop

Merge release/12.1 into develop
@jtreanor
Update release notes for code freeze
d519d35
@jtreanor
12.2-rc-1 / 705 version bump
a481ee1
@jtreanor
Updated draft release notes
46f67a8
@mzorz
reusing pre-existing utility method PostUtils.isFirstTimePublish(post)
e0c155d
@mzorz
when publishing, only set the PUBLISHED status once we have finished …
e06af40 
…making isFirstTimePublish() checks on the Post
@mzorz
Merge pull request #9544 from wordpress-mobile/try/fix-first-publish-…
9dcbb26 
…analytics

Fix first publish analytics
@planarvoid
Do not parse empty date in AllTimeStats
dafce6f
@planarvoid
Remove unnecessary space
f9dfcb8
@0nko
Merge pull request #9552 from wordpress-mobile/fix_crashin_all_time_s…
dcf5aa3 
…tats

Fix crash in all time stats
@jtreanor
Merge branch 'release/12.2' into merge-release/12.1-release/12.2
b367a53
@jtreanor
Merge pull request #9579 from wordpress-mobile/merge-release/12.1-rel…
517f9ba 
…ease/12.2

Merge release/12.1 into release/12.2
@jtreanor
Merge branch 'release/12.1' into release/12.2
5608026
@jtreanor
12.2-rc-2 / 709 version bump
ad8b5e4
@jtreanor
Update edited release notes
5c153b6
@jtreanor
Update metadata strings
5f44720
@jtreanor
Merge branch 'master' into merge-release/12.2-master
1fa5b73
@jtreanor jtreanor added the Releases Label related to managing releases label Apr 11, 2019
@peril-wordpress-mobile
Copy link

Warnings
⚠️ PR is not assigned to a milestone.
⚠️ PR has more than 500 lines of code changing. Consider splitting into smaller PRs if possible.

Generated by 🚫 dangerJS

@jtreanor jtreanor merged commit 4874a3b into master Apr 11, 2019
@jtreanor jtreanor deleted the merge-release/12.2-master branch April 11, 2019 09:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Releases Label related to managing releases
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.