Skip to content

Instantly share code, notes, and snippets.

Jayson Basañes shiki

Block or report user

Report or block shiki

Hide content and notifications from this user.

Learn more about blocking users

Contact Support about this user’s behavior.

Learn more about reporting abuse

Report abuse
View GitHub Profile
View conflict.diff
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)
View test.diff
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 = {
View gist:75f404614649627389c139f08fc5b7a1
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)
View gist:206dd346052eef9268c96b57be1fc165
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
@shiki
shiki / enable-quick-start.diff
Created Jul 8, 2019
WordPress-iOS: Make Post button enable Quick Start for the current site
View enable-quick-start.diff
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.")
View NetworkAware.diff
diff --git a/WordPress/Classes/ViewRelated/System/NetworkAware.swift b/WordPress/Classes/ViewRelated/System/NetworkAware.swift
index 2a15b3b88d..3533976cd8 100644
--- a/WordPress/Classes/ViewRelated/System/NetworkAware.swift
+++ b/WordPress/Classes/ViewRelated/System/NetworkAware.swift
@@ -1,3 +1,4 @@
+import WordPressFlux
/// Abstracts elements that need to be aware of the network connection status.
protocol NetworkAware {
@@ -31,9 +32,11 @@ extension NetworkAwareUI {
@shiki
shiki / git.diff
Created Feb 14, 2019
WordPress-Android with local Automattic-Tracks-Android
View git.diff
diff --git a/libs/analytics/WordPressAnalytics/build.gradle b/libs/analytics/WordPressAnalytics/build.gradle
index ab9ca52842..f1de0bbf65 100644
--- a/libs/analytics/WordPressAnalytics/build.gradle
+++ b/libs/analytics/WordPressAnalytics/build.gradle
@@ -19,7 +19,7 @@ repositories {
}
dependencies {
- implementation 'com.automattic:tracks:1.1.5'
+ api project(':tracks')
View keybase.md

Keybase proof

I hereby claim:

  • I am shiki on github.
  • I am shiki (https://keybase.io/shiki) on keybase.
  • I have a public key ASBaTL2eS2p_By6IuQMrY9yrTRT7jYHIA3ONmtkkw4B91go

To claim this, I am signing this object:

View clear-apc.php
#!/usr/bin/env php
<?php
/*
Copyright 2013 Stuart Carnie and other contributors
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
@shiki
shiki / gist:5225349
Created Mar 22, 2013
php54-imagick install config.log
View gist:5225349
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by configure, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ ./configure --prefix=/opt/boxen/homebrew/Cellar/php54-imagick/3.1.0RC2 --with-php-config=/opt/boxen/homebrew/Cellar/php54/5.4.12/bin/php-config
## --------- ##
## Platform. ##
You can’t perform that action at this time.