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 14.3 code freeze into master #11371

Merged
merged 203 commits into from
Feb 24, 2020
Merged

Conversation

oguzkocer
Copy link
Contributor

Merges all code changes present in 14.3-rc-1 into master.

Also merges 14.3 code freeze.

jd-alexander and others added 30 commits December 24, 2019 11:18
a15de7604a Merge pull request #25 from wordpress-mobile/deprecate-buggy-date-time-utils-methods
5026dc0904 Mark DateTimeUtils.localDateToUTC and DateTimeUtils.nowUTC as deprecated
58cd5bf239 Mark DateTimeUtils.localDateToUTC and DateTimeUtils.nowUTC as deprecated
4360e5d41f Merge pull request #23 from wordpress-mobile/update-bintray-config
48277981d8 Bump version to 1.23
81f224bd56 Fix Javadoc lint build error when releasing to Bintray
240f2492fa Update Bintray plugin to latest
b6abdcae2a Merge pull request #22 from wordpress-mobile/merge-wpa
8260cdce57 Update style and lint configs
7c08103ff2 Update Gradle wrapper version
9666183e69 Merge commit 'a4a756b60bcbf144ed8527f693c4e974fa6e365d' into subtree-updates-v3
cdeb3eb7f1 Merge pull request #9215 from wordpress-mobile/feature/update-support-lib-28
e8dbd8f404 Revert update of targetSdkVersion
f7014365ea Update supportLib version to 28.0.0
b3ad4c795e Fix low hanging deprecation warnings
b028488305 Remove all instances of LOCATION
bd194edb49 Merge pull request #9114 from wordpress-mobile/issue/8177-applog-testing
e081d898e7 Merge pull request #9044 from wordpress-mobile/gradle-4-10
2ba6f52024 Move fake AppLog(the one for testing) from utils to the main project
3f74b509d0 Create copy of AppLog for unit testing purposes
78d9bfbf13 fixed merge conflict
b3b6665bfd fixed merge conflict
c2fa689153 Update to Gradle 4.10.3/Android Gradle plugin 3.2.1
62b03547dc Merge remote-tracking branch 'origin/develop' into feature/master-site-creation
f55c4c33b1 Removed duplicated dots from image URL
818c1691c7 Rename NewSiteCreationService props
ab051f9083 removed unused imports
0ea8d2aab7 moved unused getDate() method from MediaUtils to getFormattedDateForLastModified() in PostUtils
6e4cecb37b Make the progress of NewSiteCreationService indeterminate
4434057372 Merge branch 'develop' into feature/master-site-creation
e7e89ad67e Fix SiteCreation segment icon color tint
2259033733 Merge branch 'develop' into feature/deep-link-main-activity
0671724495 Merge remote-tracking branch 'origin/develop' into feature/deep-linking-improvements
8f5238e5ef Reorder repositories in build.gradle to fix Gradle
4f18db4eb3 Reorder repositories in build.gradle to fix Gradle
e695cb4a6b Refactor isDeepLinking to be outside MyProfileActivity
d85b6dbb16 Remove unused WPImageGetter
44d63ede88 Add a new type of log tag for pages
5b4a4f09ae Move the logging wrapper class to FluxCUtils for convenience
c7c1ff782a Add Crashlytics logging to make sure we're keeping track of problems uploading media
d12f32a4a7 Remove coroutines and replace them with standard event driven architecture
5580689d26 Remove unused code - ImageUtils.getThumbnail

git-subtree-dir: libs/utils
git-subtree-split: a15de7604a34a9e989884fb84b8c9adfaeeb97b0
If Android decides to recreate a Fragment later, it's going to call the no-argument constructor of the fragment.
BottomSheetDialog's width always matches its parent, even if its content does not, root cause coming from BottomSheetDialog.onCreate() setting the window to MATCH_PARENT both ways:
https://issuetracker.google.com/issues/37089648

We're explicitly setting the width of the bottom sheet and centering it inside it's parent coordinator layout.
…oid/login/widgets/WPBottomSheetDialogFragment.java

Co-Authored-By: Tyler Heck <[email protected]>
…sible-with-signup-sheet

# Conflicts:
#	libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/SignupBottomSheetDialog.java
renanferrari and others added 22 commits February 21, 2020 13:01
…-site-bottom-sheet

Update My Site bottom sheet layout
Centering vertically the items of reader bottom sheet.
…elease_1.23.0

Gutenberg/integrate release 1.23.0
…fix_api_29

Media Sharing - Latitude Column Fix
…-note

Add the missing release note for the Block editor
@oguzkocer oguzkocer added the Releases Label related to managing releases label Feb 24, 2020
@oguzkocer oguzkocer added this to the 14.3 ❄️ milestone Feb 24, 2020
@oguzkocer oguzkocer requested a review from jkmassel February 24, 2020 22:25
@peril-wordpress-mobile
Copy link

Warnings
⚠️ 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-mobile/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/14.3-code-freeze-to-master
  3. git subtree push --prefix=libs/login/ https://github.com/wordpress-mobile/WordPress-Login-Flow-Android.git merge/WordPress-Android/11371
  4. Browse to https://github.com/wordpress-mobile/WordPress-Login-Flow-Android/pull/new/merge/WordPress-Android/11371 and open a new PR.

Generated by 🚫 dangerJS

@peril-wordpress-mobile
Copy link

peril-wordpress-mobile bot commented Feb 24, 2020

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

@jkmassel jkmassel merged commit f9d5993 into master Feb 24, 2020
@jkmassel jkmassel deleted the merge/14.3-code-freeze-to-master branch February 24, 2020 23:22
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.