Fixes #
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
diff --git a/WordPress/Classes/ViewRelated/System/WPTabBarController+QuickStart.swift b/WordPress/Classes/ViewRelated/System/WPTabBarController+QuickStart.swift | |
index 65f057b33e..f89e1f21c2 100644 | |
--- a/WordPress/Classes/ViewRelated/System/WPTabBarController+QuickStart.swift | |
+++ b/WordPress/Classes/ViewRelated/System/WPTabBarController+QuickStart.swift | |
@@ -47,4 +47,9 @@ extension WPTabBarController { | |
NotificationCenter.default.removeObserver(quickStartObserver as Any) | |
quickStartObserver = nil | |
} | |
+ | |
+ #warning("Temporary code. Do not commit.") |
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
E/SQLiteLog: (1) table PostModel has no column named REMOTE_AUTO_SAVE_MODIFIED | |
E/SQLiteDatabase: Error inserting AUTHOR_DISPLAY_NAME=null DATE_CREATED= AUTHOR_ID=0 LONGITUDE=9999.0 LAST_MODIFIED= CATEGORY_IDS= FEATURED_IMAGE_ID=0 SLUG= LOCAL_SITE_ID=3 STATUS= REMOTE_POST_ID=0 LINK= AUTO_SAVE_MODIFIED=null CONTENT= IS_LOCAL_DRAFT=true REMOTE_LAST_MODIFIED= CUSTOM_FIELDS= POST_FORMAT= TAG_NAMES= EXCERPT= HAS_CAPABILITY_DELETE_POST=false REMOTE_AUTO_SAVE_MODIFIED=null IS_PAGE=false PARENT_ID=0 HAS_CAPABILITY_PUBLISH_POST=false AUTO_SAVE_REVISION_ID=0 CHANGES_CONFIRMED_CONTENT_HASHCODE=0 PARENT_TITLE= PASSWORD= IS_LOCALLY_CHANGED=false REMOTE_SITE_ID=0 LAST_KNOWN_REMOTE_FEATURED_IMAGE_ID=0 HAS_CAPABILITY_EDIT_POST=false TITLE= DATE_LOCALLY_CHANGED=2019-08-07T16:16:28+00:00 LATITUDE=9999.0 AUTO_SAVE_PREVIEW_URL=null | |
android.database.sqlite.SQLiteException: table PostModel has no column named REMOTE_AUTO_SAVE_MODIFIED (code 1 SQLITE_ERROR): , while compiling: INSERT INTO PostModel(AUTHOR_DISPLAY_NAME,DATE_CREAT |
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
E/AndroidRuntime: FATAL EXCEPTION: main | |
Process: org.wordpress.android, PID: 20496 | |
java.lang.NullPointerException: Attempt to invoke virtual method 'void org.wordpress.aztec.toolbar.AztecToolbar.enableMediaMode(boolean)' on a null object reference | |
at org.wordpress.android.editor.AztecEditorFragment.enableMediaMode(AztecEditorFragment.java:764) | |
at org.wordpress.android.ui.posts.EditPostActivity.hidePhotoPicker(EditPostActivity.java:1076) | |
at org.wordpress.android.ui.posts.EditPostActivity.access$400(EditPostActivity.java:197) | |
at org.wordpress.android.ui.posts.EditPostActivity$2.onPageSelected(EditPostActivity.java:586) | |
at androidx.viewpager.widget.ViewPager.dispatchOnPageSelected(ViewPager.java:1947) | |
at androidx.viewpager.widget.ViewPager.setCurrentItemInternal(ViewPager.java:665) | |
at androidx.viewpager.widget.ViewPager.setCurrentItemInternal(ViewPager.java:631) |
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
diff --git a/WordPress/WordPressTest/PostCoordinatorTests.swift b/WordPress/WordPressTest/PostCoordinatorTests.swift | |
index cfd76d4eeb..9df5a572c3 100644 | |
--- a/WordPress/WordPressTest/PostCoordinatorTests.swift | |
+++ b/WordPress/WordPressTest/PostCoordinatorTests.swift | |
@@ -6,9 +6,14 @@ import Nimble | |
class PostCoordinatorTests: XCTestCase { | |
- private let context = TestContextManager().newDerivedContext() | |
+ private let context: NSManagedObjectContext = { |
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
diff --cc Podfile.lock | |
index 0396ee1cef,4c4b941c72..0000000000 | |
--- a/Podfile.lock | |
+++ b/Podfile.lock | |
@@@ -230,11 -230,11 +230,16 @@@ PODS | |
- UIDeviceIdentifier (~> 1.1.4) | |
- WordPressShared (~> 1.8.0) | |
- wpxmlrpc (= 0.8.4) | |
++<<<<<<< HEAD | |
+ - WordPressMocks (0.0.5) |
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
extension Alpha { | |
func copy( | |
charlie: CopiableProp<Alpha.Bravo.Charlie> = .copy, | |
optionalCharlie: NullableCopiableProp<Alpha.Bravo.Charlie> = .copy, | |
charlieArray: CopiableProp<[Alpha.Bravo.Charlie]> = .copy, | |
optionalCharlieArray: NullableCopiableProp<[Alpha.Bravo.Charlie]> = .copy, | |
bravoArray: CopiableProp<[Alpha.Bravo]> = .copy, | |
optionalBravoArray: NullableCopiableProp<[Alpha.Bravo]> = .copy, | |
stringProp: CopiableProp<String> = .copy, | |
optionalStringProp: NullableCopiableProp<String> = .copy, |
OlderNewer