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 14.7-rc-2 to master #11733

Merged
merged 1,021 commits into from
Apr 23, 2020
Merged

Merge 14.7-rc-2 to master #11733

merged 1,021 commits into from
Apr 23, 2020

Conversation

oguzkocer
Copy link
Contributor

No description provided.

khaykov and others added 30 commits April 5, 2020 20:13
@khaykov
Cookie check in reader post list.
5fe31c3
@khaykov
Private AT photon support in featured image helper.
a58aae0
@khaykov
Cookie support at webview activity.
12d02d2
@khaykov
Semi-blocking cookie check on app start.
21c02af
@khaykov
Minor cleanup.
20eaedd
@khaykov
Updated flux-c reference.
4fcea3d
@khaykov
Merge branch 'feature/support-private-at-sites' of https://github.com…
6fac659 
…/wordpress-mobile/WordPress-Android into feature/support-private-at-sites
@khaykov
Temporary progress dialog.
8c7ddf6
@khaykov
Added missing temp progress dialog.
37e8c87
@khaykov
Merge branch 'feature/support-private-at-sites' of https://github.com…
a9e1d18 
…/wordpress-mobile/WordPress-Android into feature/support-private-at-sites

# Conflicts:
#	WordPress/src/main/java/org/wordpress/android/ui/PrivateAtCookieRefreshProgressDialog.kt
@hypest
Revert "Gutenberg/integrate release 1.25.0 with dark mode (#11580)"
99c619d 
This reverts commit 4585d19.
@hypest
Merge branch 'gutenberg/integrate_release_1.25.0-with-dark-mode' into…
7b5ef00 
… replay-dark-mode-commits
@hypest
Point to gutenberg-mobile release
1e8b26a
@malinajirka
Merge branch 'develop' into issue/9854-site-creation-loading
db3253f 
# Conflicts:
#	WordPress/src/main/res/layout-land/site_creation_preview_screen.xml
#	WordPress/src/main/res/layout/site_creation_preview_screen_default.xml
@malinajirka
Update site creation loading screen for dark mode
1eebd97
@khaykov
Merge branch 'develop' of https://github.com/wordpress-mobile/WordPre…
6ff531f 
…ss-Android into feature/support-multiple-auth-headers-in-gb

# Conflicts:
#	libs/gutenberg-mobile
@khaykov
Merge branch 'feature/support-multiple-auth-headers-in-gb' of https:/…
88995b4 
…/github.com/wordpress-mobile/WordPress-Android into feature/support-private-at-sites
@develric
Adding dedicated dimension for menu width.
f96b19a
@develric
Adding USER icon management in ImagePlaceholderManager.
d4769cb
@develric
Adding me with gravatar menu item.
3366193
@develric
Using MeGravatarLoader in MeFragment and MySiteFragment.
770152c
@ThomazFB
Added Tenor library and API key reference
06f49e1
@ThomazFB
Changed giphy package name to gifs
be9e118
@ThomazFB
Created TenorProvider infrastructure and basic search
47ac89a
@ThomazFB
Added GifProvider and TenorProvider documentation
99751e6
@ThomazFB
GifProvider is now available through injection with Dagger and provid…
d393dca 
…ed to the PickerDataSourceFactory
@ThomazFB
Replaced Giphy name to Gif from all packages and classes
c401c4c
@ThomazFB
Connected the TenorProvider implementation to the expected GifMediaVi…
6554d88 
…ewModel and GifPickerDataSource
@ThomazFB
Improved test suite for TenorProvider with code refactor and more tes…
e376715 
…t cases
@ThomazFB
Improved code reuse, naming and deprecated assertion methods
b2d093f
SergioEstevao and others added 22 commits April 20, 2020 16:46
@SergioEstevao
Fix lint error.
a458f0b
@maxme
Merge pull request #11670 from wordpress-mobile/issue/insert_captions…
1d6c7cf 
…_for_media_library

Update media insertion to send caption information.
@oguzkocer
Merge remote-tracking branch 'origin/develop' into merge/14.6-final-t…
4a6964e 
…o-develop
@shiki
Merge pull request #11703 from wordpress-mobile/merge/14.6-final-to-d…
4acc67c 
…evelop

Merge 14.6 final to develop
@oguzkocer
Merge pull request #11702 from wordpress-mobile/speed_up_suggestion_i…
ee116f1 
…nsertion

Speed up suggestion insertion by using a single transaction
@oguzkocer
Bump version number
ce4d16f
@oguzkocer
Update release notes.
c9bcf31
@cameronvoell
Revert "Update media insertion to send caption information."
c993d10
@mchowning
Merge pull request #11706 from wordpress-mobile/revert-11670-issue/in…
54592b0 
…sert_captions_for_media_library

Revert "Update media insertion to send caption information."
@oguzkocer
Update FluxC version to 1.6.10
9447d22
@renanferrari
Add translatable=false flag to app_theme_entries array
e533f6f
@oguzkocer
Bump version number
f4effcf
@renanferrari
Remove unnecessary translations for app_theme_entries array
bc5ea31
@oguzkocer
Merge pull request #11725 from wordpress-mobile/issue/11724-app-setti…
97ba825 
…ngs-crash

Issue/11724 app settings crash
@khaykov
Added a new icon for unknown file type.
aba96b7
@oguzkocer
Merge remote-tracking branch 'origin/release/14.7' into merge/14.6.1-…
f869b8e 
…to-release/14.7
@oguzkocer
Merge pull request #11729 from wordpress-mobile/issue/11617-add-place…
71e162e 
…holder-for-unknown-file

Added a new icon for unknown file type.
@oguzkocer
Merge pull request #11731 from wordpress-mobile/merge/14.6.1-to-relea…
ec48654 
…se/14.7

Merge 14.6.1 to release/14.7
@oguzkocer
Bump version number
e615dfd
@oguzkocer
Bump alpha version to 855
f8ccf25
@oguzkocer
Fix alpha and beta version numbers
6bf77d9
@oguzkocer
Merge remote-tracking branch 'origin/master' into merge/14.7-rc-2-to-…
c34aa33 
…master
@oguzkocer oguzkocer added the Releases Label related to managing releases label Apr 22, 2020
@oguzkocer oguzkocer requested a review from loremattei April 22, 2020 21:56
@peril-wordpress-mobile
Copy link

You can trigger optional UI/connected tests for these changes by visiting CircleCI here.

@peril-wordpress-mobile
Copy link

peril-wordpress-mobile bot commented Apr 22, 2020 •
edited
Loading

Warnings
⚠️ PR is not assigned to a milestone.
⚠️ 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/mocks/. It is your responsibility to ensure these changes are merged back into wordpress-mobile/WordPressMocks. 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/14.7-rc-2-to-master
  3. git subtree push --prefix=libs/mocks/ https://github.com/wordpress-mobile/WordPressMocks.git merge/WordPress-Android/11733
  4. Browse to https://github.com/wordpress-mobile/WordPressMocks/pull/new/merge/WordPress-Android/11733 and open a new PR.

Generated by 🚫 dangerJS

@peril-wordpress-mobile
Copy link

You can test the changes on this Pull Request by downloading the APK here.

@loremattei loremattei merged commit cb375d1 into master Apr 23, 2020
@loremattei loremattei deleted the merge/14.7-rc-2-to-master branch April 23, 2020 08:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@loremattei loremattei loremattei approved these changes

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.