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/11.6 master #8987

Merged
merged 273 commits into from
Jan 16, 2019
Merged

Merge release/11.6 master #8987

merged 273 commits into from
Jan 16, 2019

Conversation

jtreanor
Copy link
Contributor

Merge release/11.6 master for glotpress to pick it up.

Update release notes:

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

theck13 and others added 30 commits December 26, 2018 15:54
@theck13
Add error details to dialog when message contains password
f898e9e
@theck13
Rename error dialog for avatar method to error dialog with close button
6125f56
@theck13
Add locale to lower case usage in password in error message method in…
982cec3 
… signup epilogue fragment class
@oguzkocer
Merge pull request #8875 from wordpress-mobile/issue/8443-signup-pass…
019e1e3 
…word-errors

Issue/8443 signup password errors
@theck13
Add image tint to icon of view holder in reader menu adapter class
af76a26
@theck13
Remove unnecessary conditional for icon image resource in reader menu…
7fba95e 
… adapter class
@theck13
Rename variable to color resource in reader menu adapter class
8be38c2
@theck13
Add tint to image in reader follow button class
ffd7d57
@theck13
Add tint attribute to views with reader follow blue medium drawable i…
934d223 
…n layout
@theck13
Update icon reader follow blue medium drawable references to white
0ab31c3
@theck13
Add tint attribute to views with reader following alert green drawabl…
b9ac163 
…e in layout
@theck13
Update reader popup menu item layout with follow icon and text
6b00daa
@theck13
Update icon reader following alert green drawable references to white
7ca42b1
@theck13
Update icon block grey dark drawable references to white
42844c1
@theck13
Update icon bell alert green drawable references to white
2f9c7be
@theck13
Update icon bell grey dark drawable references to white
56ecc64
@theck13
Update icon share grey dark drawable references to white
5fdd80c
@theck13
Update icon list checkmark grey drawable references to white
79ecf15
@theck13
Update icon stats alt grey drawable references to white
56e7bd1
@theck13
Update icon history alt grey drawable references to white
8efcafa
@theck13
Update icon plans grey drawable references to white
6e9302b
@theck13
Update icon pages grey drawable references to white
9d81386
@theck13
Update icon posts grey drawable references to white
13bb2f8
@theck13
Update icon media grey drawable references to white
c62b39d
@theck13
Update icon comment grey drawable references to white
348dc3c
@theck13
Update icon themes grey drawable references to white
b7fe044
@theck13
Update icon user grey drawable references to white
aaf1d46
@theck13
Update icon cog grey drawable references to white
745fc0c
@theck13
Update icon globe grey drawable references to white
45bbc9f
@theck13
Update icon external black drawable references to white
45a4a15
0nko and others added 27 commits January 14, 2019 12:50
@0nko
Merge pull request #8859 from garrett-eclipse/patch-1
470990b 
Updated Customise to Customize
@malinajirka
Merge pull request #8930 from wordpress-mobile/fix/open_premium_theme…
7387a39 
…s_in_customizer

Fix opening premium themes in customizer
@malinajirka
Merge pull request #8939 from wordpress-mobile/issue/7272-Non-admins-…
75f0b3a 
…on-self-hosted-site-cant-update-password-in-app

Self Hosted- Site Settings: Do not hide the account section (username/pass) on non-admins
@mzorz
updated fluxc hash
f6e8cc0
@mzorz
Merge branch 'develop' into issue/8932-dont-overwrite-local-changes
afb1758
@oguzkocer
Merge pull request #8940 from wordpress-mobile/issue/8932-dont-overwr…
23a5218 
…ite-local-changes

Updated FluxC hash to avoid overwriting locally changed Posts
@khaykov
Fixed weird indentation.
5dc0745
@khaykov
Using app context to start reader updated service.
6b56cad
@jtreanor
Merge pull request #8938 from wordpress-mobile/fix/show_images_when_p…
881cc63 
…reviewing_local_draft

Remove specific logic for local drafts preview
@jtreanor
Merge develop into release/11.5
07b11f8
@jtreanor
Merge pull request #8963 from wordpress-mobile/merge-release-11-5-dev…
eabc59d 
…elop

Merge release/11.5 into develop
@theck13
Merge pull request #8941 from wordpress-mobile/issue/8390-missing-rea…
c9f5471 
…der-tags-after-account-creation

Issue/8390 missing reader tags after account creation for non-english locales
@jtreanor
Update FluxC to latest
2b4adf9
@jtreanor
Merge pull request #8967 from wordpress-mobile/update-fluxc
c09d497 
Update FluxC to latest
@jtreanor
Merge develop into release/11.5.1
27091fd
@jtreanor
Merge pull request #8968 from wordpress-mobile/merge-release-11-5-1-d…
c999495 
…evelop

Merge release/11.5.1 into develop
@jtreanor
Use alpha version name
3c8f3f3
@jtreanor
Fix code freeze when not updating release branch
467b054
@jtreanor
Update release notes for code freeze
3fea8fe
@jtreanor
11.6-rc-1 / 662 version bump
3112c59
@jtreanor
Update release_notes.txt
91e931e
@jtreanor
Update release_notes.txt to fit character limit
9628c30
@jtreanor
Update release notes from editorial
d4e333d
@jtreanor
Update fluxc version to fix date format crash
f9ad67f
@jtreanor
Merge pull request #8982 from wordpress-mobile/update-fluxc-hash
d817b9f 
Update fluxc version to fix date format crash
@jtreanor
11.6-rc-2 / 665 version bump
1f235ea
@jtreanor
Merge master into release/11.6
30a186a
@wpmobilebot
Copy link
Contributor

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

Generated by 🚫 Danger

@jtreanor jtreanor merged commit c9d4515 into master Jan 16, 2019
@jtreanor jtreanor deleted the merge-release/11.6-master branch January 16, 2019 17:49
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
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.