This repository was archived by the owner on Nov 12, 2020. It is now read-only.
Sync with wpandroid #474
Open
Sync with wpandroid #474
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ss-Android into issue/8828-Aztec-crash-Android-8 * 'develop' of https://github.com/wordpress-mobile/WordPress-Android: (29 commits) Make utils sinletons Handle case without a browser FluxC hash updated to 1.5.1-beta-3 Add signup flow name parameter to signup auth email request Change FluxC hash to 1.5.1-beta-2 Update gutenberg-mobile ref to v1.15.0 release CircleCI: Bump Orbs to use any 1.0.x version Update gutenberg ref Update gutenberg ref Add NEW_TASK flag to the open file intent Update to Aztec v1.3.33, including gutenberg's ref Update gutenberg ref Update Aztec ref to v1.3.32 Update RELEASE-NOTES with block editor improvements Enable downloads from private sites Update gutenberg ref to release 1.15.0 capitalizeWithLocaleWithoutLint string extension introduced Implement specific comparison for LocalOrRemoteId in PostListDiffItemCallback Fix staticFieldLeak errors in lint-baseline.xml Refresh data on request completed ... # Conflicts: # libs/editor/WordPressEditor/build.gradle # libs/gutenberg-mobile
…-editor Clean up after legacy editor
…h-Android-8 Disable HW acceleration on Aztec when it crashes on Android 8 - Release Gutenberg to v1.15.1
…add-media-to-editor-functionality
…for image preview requests from gb-editor
…ute image preview requests from GB editor to MediaPreviewActivity.
…tract-upload-media-phase-2
# Conflicts: # WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java
…so we can access its fields with reflection
…25-media-upload-errors-editor
…k-sso-enabled # Conflicts: # libs/gutenberg-mobile
# Conflicts: # libs/gutenberg-mobile
Fix build and tests on JDK11
…in with WordPress.com is requested.
|
Hey @malinajirka – I'm not sure how to meaningfully review this – if it's just a sync it's probably ok? Do we have a way of verifying consistency between the two repos to ensure the sync worked right? |
|
Hi @jkmassel ! In summary
|
jkmassel
approved these changes
Oct 13, 2020
There was a problem hiding this comment.
I can see that the history is present, and it looks correct. However, there are files in WordPress-Editor-Android that aren't present in WPAndroid:
WordPressEditor/src/androidTest/java/org.wordpress.android.editor/EditorFragmentTest.java
WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragment.java
Apart from these two files, the trees are identical. If this seems ok, then it's ok to merge.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.