This file contains 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
Index: Classes/WPWebViewController.m | |
=================================================================== | |
--- Classes/WPWebViewController.m (revision 2231) | |
+++ Classes/WPWebViewController.m (working copy) | |
@@ -23,7 +23,7 @@ | |
@end | |
@implementation WPWebViewController | |
-@synthesize url,username,password; | |
+@synthesize url,username,password, htmlString; |
This file contains 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
(function( $, undefined ) { | |
var fakeBody = $( "<body>" ).prependTo( "html" ), | |
fbCSS = fakeBody[ 0 ].style, | |
vendors = [ "Webkit", "Moz", "O" ], | |
webos = !! "palmGetResource" in window, //only used to rule out scrollTop | |
bb = !! window.blackberry; //only used to rule out box shadow, as it's filled opaque on BB | |
// thx Modernizr |
This file contains 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/src/org/wordpress/android/ui/themes/ThemeBrowserActivity.java b/src/org/wordpress/android/ui/themes/ThemeBrowserActivity.java | |
index 13c5a3b..0fb3fbc 100644 | |
--- a/src/org/wordpress/android/ui/themes/ThemeBrowserActivity.java | |
+++ b/src/org/wordpress/android/ui/themes/ThemeBrowserActivity.java | |
@@ -518,6 +518,8 @@ public class ThemeBrowserActivity extends WPActionBarActivity implements | |
ft.hide(mDetailsFragment); | |
} | |
} | |
+ | |
+ ft.remove(mPreviewFragment); |
This file contains 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/Blog.m b/WordPress/Classes/Blog.m | |
index 8f50178..2d85f3c 100644 | |
--- a/WordPress/Classes/Blog.m | |
+++ b/WordPress/Classes/Blog.m | |
@@ -552,7 +552,7 @@ static NSInteger const ImageSizeLargeHeight = 480; | |
_api = [[WPXMLRPCClient alloc] initWithXMLRPCEndpoint:[NSURL URLWithString:self.xmlrpc]]; | |
// Enable compression for wp.com only, as some self hosted have connection issues | |
if (self.isWPcom) { | |
- [_api setDefaultHeader:@"gzip, deflate" value:@"Accept-Encoding"]; | |
+ [_api setDefaultHeader:@"Accept-Encoding" value:@"gzip, deflate"]; |
This file contains 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
package org.xmlrpc.android; | |
import java.io.ByteArrayInputStream; | |
import java.io.File; | |
import java.io.FileWriter; | |
import java.io.InputStream; | |
import java.io.SequenceInputStream; | |
import java.io.StringWriter; | |
import java.net.URI; | |
import java.net.URL; |
This file contains 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/src/org/xmlrpc/android/XMLRPCClient.java b/src/org/xmlrpc/android/XMLRPCClient.java | |
index b632ca2..189ee00 100644 | |
--- a/src/org/xmlrpc/android/XMLRPCClient.java | |
+++ b/src/org/xmlrpc/android/XMLRPCClient.java | |
@@ -28,7 +28,9 @@ import org.apache.http.auth.UsernamePasswordCredentials; | |
import org.apache.http.client.methods.HttpPost; | |
import org.apache.http.entity.FileEntity; | |
import org.apache.http.entity.StringEntity; | |
+import org.apache.http.impl.client.DefaultHttpClient; | |
import org.apache.http.params.CoreConnectionPNames; |
This file contains 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/src/org/wordpress/android/util/WPHtml.java b/src/org/wordpress/android/util/WPHtml.java | |
index c320531..c7c9302 100644 | |
--- a/src/org/wordpress/android/util/WPHtml.java | |
+++ b/src/org/wordpress/android/util/WPHtml.java | |
@@ -54,6 +54,7 @@ import org.ccil.cowan.tagsoup.HTMLSchema; | |
import org.ccil.cowan.tagsoup.Parser; | |
import org.wordpress.android.R; | |
import org.wordpress.android.WordPress; | |
+import org.wordpress.android.models.Blog; | |
import org.wordpress.android.models.MediaFile; |
This file contains 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 WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderActivityLauncher.java WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderActivityLauncher.java | |
index b9ac290..095c466 100644 | |
--- WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderActivityLauncher.java | |
+++ WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderActivityLauncher.java | |
@@ -122,41 +122,6 @@ public class ReaderActivityLauncher { | |
context.startActivity(intent); | |
} | |
- /* | |
- * this method works but is marked deprecated since it should be avoided in favor of |
This file contains 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
@@ -1,7 +1,6 @@ | |
<?xml version="1.0" encoding="utf-8"?> | |
<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us --> | |
<manifest xmlns:android="http://schemas.android.com/apk/res/android" | |
- xmlns:tools="http://schemas.android.com/tools" | |
package="com.wordpress.notereader.tests" | |
android:versionCode="1" | |
android:versionName="1.0"> | |
@@ -13,13 +12,4 @@ | |
<uses-library android:name="android.test.runner" /> |
This file contains 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/packages/editor/src/components/plain-text/index.native.js b/packages/editor/src/components/plain-text/index.native.js | |
index 35ffd2782..7a0e6643e 100644 | |
--- a/packages/editor/src/components/plain-text/index.native.js | |
+++ b/packages/editor/src/components/plain-text/index.native.js | |
@@ -47,6 +47,7 @@ export default class PlainText extends Component { | |
} } | |
onFocus={ this.props.onFocus } // always assign onFocus as a props | |
onBlur={ this.props.onBlur } // always assign onBlur as a props | |
+ fontFamily={ 'serif' } | |
/> |
OlderNewer