Merge branch 'release/3.8'

Conflicts: WordPress/Info-beta.plist WordPress/Info-dev.plist WordPress/Info.plist
wordpress-mobile · Sep 16, 2013 · 8cc2e4f · 8cc2e4f
2 parents cccc97b + 100b9aa
commit 8cc2e4f
Show file tree

Hide file tree

Showing 946 changed files with 27,243 additions and 60,521 deletions.
diff --git a/.gitignore b/.gitignore
@@ -51,6 +51,7 @@ WordPress.xcworkspace/*.perspectivev3
 WordPress.xcworkspace/*.xcuserdata
 WordPress.xcworkspace/project.xcworkspace
 WordPress.xcworkspace/xcuserdata
+WordPress.xcworkspace/xcshareddata/WordPress.xccheckout
 WordPress/Entitlements.plist
 WordPress/WordPress.xcodeproj/*.mode1v3
 WordPress/WordPress.xcodeproj/*.mode2v3

diff --git a/Podfile b/Podfile
@@ -3,10 +3,10 @@ xcodeproj 'WordPress/WordPress.xcodeproj'
 platform :ios, '5.0'
 pod 'AFNetworking',	'1.2'
 pod 'Reachability',	'~> 3.0.0'
-pod 'JSONKit',		  '~> 1.4'
+pod 'JSONKit',		  '~> 1.4', :inhibit_warnings => true
 pod 'NSURL+IDN', :podspec => 'https://raw.github.com/koke/NSURL-IDN/master/Podfile'
 pod 'CTidy', :git => 'git://github.com/wordpress-mobile/CTidy.git'
-pod 'DTCoreText',   '~> 1.5'
+pod 'DTCoreText',   '~> 1.6'
 pod 'UIDeviceIdentifier', '~> 0.1'
 pod 'SVProgressHUD', '~> 0.9'
 pod 'SSKeychain',   '~> 0.2'
@@ -15,7 +15,7 @@ pod 'wpxmlrpc', '~> 0.1'
 pod 'WordPressApi', :podspec => 'https://raw.github.com/koke/WordPressApi/master/WordPressApi.podspec'
 pod 'NSObject-SafeExpectations', :podspec => 'https://raw.github.com/koke/NSObject-SafeExpectations/master/NSObject-SafeExpectations.podspec'
 pod 'Mixpanel'
-pod 'google-plus-ios-sdk', '~> 1.2'
+pod 'google-plus-ios-sdk', '~> 1.3.0'
 pod 'MGImageUtilities', :git => 'git://github.com/wordpress-mobile/MGImageUtilities.git'
 pod 'Quantcast-Measure'
 

diff --git a/Podfile.lock b/Podfile.lock
@@ -1,16 +1,16 @@
 PODS:
   - AFNetworking (1.2.0)
   - CTidy (0.3.0)
-  - DTCoreText (1.5.3):
-    - DTFoundation/Core (~> 1.4.3)
-    - DTFoundation/DTHMLParser (~> 1.4.3)
-    - DTFoundation/UIKit (~> 1.4.3)
-  - DTFoundation/Core (1.4.4)
-  - DTFoundation/DTHMLParser (1.4.4):
+  - DTCoreText (1.6.5):
+    - DTFoundation/Core (~> 1.5.1)
+    - DTFoundation/DTHTMLParser (~> 1.5.1)
+    - DTFoundation/UIKit (~> 1.5.1)
+  - DTFoundation/Core (1.5.2)
+  - DTFoundation/DTHTMLParser (1.5.2):
     - DTFoundation/Core
-  - DTFoundation/UIKit (1.4.4):
+  - DTFoundation/UIKit (1.5.2):
     - DTFoundation/Core
-  - google-plus-ios-sdk (1.2.1)
+  - google-plus-ios-sdk (1.3.0)
   - JSONKit (1.5pre)
   - MGImageUtilities (0.0.1)
   - Mixpanel (2.0.0)
@@ -31,8 +31,8 @@ PODS:
 DEPENDENCIES:
   - AFNetworking (= 1.2)
   - CTidy (from `git://github.com/wordpress-mobile/CTidy.git`)
-  - DTCoreText (~> 1.5)
-  - google-plus-ios-sdk (~> 1.2)
+  - DTCoreText (~> 1.6)
+  - google-plus-ios-sdk (~> 1.3.0)
   - JSONKit (~> 1.4)
   - MGImageUtilities (from `git://github.com/wordpress-mobile/MGImageUtilities.git`)
   - Mixpanel
@@ -63,12 +63,12 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   AFNetworking: 3cbae45f61a9f995cdbd56bd571223910d7f4e44
   CTidy: 6a35875a96dd441822e620732c1113be19769067
-  DTCoreText: 5fd652092630ef9254c538d870c115ee548bfe18
-  DTFoundation: c2fd15b2163d8245773911e990ac665b888c4d76
-  google-plus-ios-sdk: fd312bf0eed88cfc708fe2cdcb9c1084598af99e
+  DTCoreText: 8798221d6da3bc079be24e808f152910c6f5e264
+  DTFoundation: 6138b5437df0217bbeba2b5cec89d5e95cf7f0e8
+  google-plus-ios-sdk: 38378c4094a72a4fcdd5254c03fdd1813b345fb9
   JSONKit: 409734ab3407fce90ef7eaa95d7168f38d9a6601
   MGImageUtilities: ab3580f2161b10f8a41331baea87aaafbd688950
-  Mixpanel: d456c27f7520e22784a15d0bcd9d5c287080b0cd
+  Mixpanel: e4af97adb60a10541b7869929a83d734025058a6
   NSObject-SafeExpectations: 241ab1289cbc33a00307cd025d22883646f2e1f0
   NSURL+IDN: 22633c0149b86d6391f32f23776bc0e6ecc532e2
   OHHTTPStubs: cb1cef742f2fba18b192fb92ede52a69cf3a04d5
@@ -81,4 +81,4 @@ SPEC CHECKSUMS:
   WordPressApi: 76f9d7752b090197c172e2c5e6fccbffbaf7c336
   wpxmlrpc: 0b27d4c3734db9470f0dccc3c8d4a6f8e491fd0b
 
-COCOAPODS: 0.22.3
+COCOAPODS: 0.23.0
diff --git a/Pods/BuildHeaders/DTCoreText/DTAccessibilityElement.h b/Pods/BuildHeaders/DTCoreText/DTAccessibilityElement.h
diff --git a/Pods/BuildHeaders/DTCoreText/DTAccessibilityViewProxy.h b/Pods/BuildHeaders/DTCoreText/DTAccessibilityViewProxy.h
diff --git a/Pods/BuildHeaders/DTCoreText/DTCoreTextLayoutFrame+Cursor.h b/Pods/BuildHeaders/DTCoreText/DTCoreTextLayoutFrame+Cursor.h
diff --git a/Pods/BuildHeaders/DTCoreText/DTCoreTextLayoutFrameAccessibilityElementGenerator.h b/Pods/BuildHeaders/DTCoreText/DTCoreTextLayoutFrameAccessibilityElementGenerator.h
diff --git a/Pods/BuildHeaders/DTFoundation/DTASN1BitString.h b/Pods/BuildHeaders/DTFoundation/DTASN1BitString.h
diff --git a/Pods/BuildHeaders/DTFoundation/DTASN1Parser.h b/Pods/BuildHeaders/DTFoundation/DTASN1Parser.h
diff --git a/Pods/BuildHeaders/DTFoundation/DTASN1Serialization.h b/Pods/BuildHeaders/DTFoundation/DTASN1Serialization.h
diff --git a/Pods/BuildHeaders/DTFoundation/DTActionSheet.h b/Pods/BuildHeaders/DTFoundation/DTActionSheet.h
diff --git a/Pods/BuildHeaders/DTFoundation/DTAlertView.h b/Pods/BuildHeaders/DTFoundation/DTAlertView.h
diff --git a/Pods/BuildHeaders/DTFoundation/DTAsyncFileDeleter.h b/Pods/BuildHeaders/DTFoundation/DTAsyncFileDeleter.h
diff --git a/Pods/BuildHeaders/DTFoundation/DTFolderMonitor.h b/Pods/BuildHeaders/DTFoundation/DTFolderMonitor.h
diff --git a/Pods/BuildHeaders/DTFoundation/DTLog.h b/Pods/BuildHeaders/DTFoundation/DTLog.h
diff --git a/Pods/BuildHeaders/DTFoundation/DTObjectBlockExecutor.h b/Pods/BuildHeaders/DTFoundation/DTObjectBlockExecutor.h
diff --git a/Pods/BuildHeaders/DTFoundation/DTScriptExpression.h b/Pods/BuildHeaders/DTFoundation/DTScriptExpression.h
diff --git a/Pods/BuildHeaders/DTFoundation/DTScriptVariable.h b/Pods/BuildHeaders/DTFoundation/DTScriptVariable.h
diff --git a/Pods/BuildHeaders/DTFoundation/NSObject+DTRuntime.h b/Pods/BuildHeaders/DTFoundation/NSObject+DTRuntime.h
diff --git a/Pods/BuildHeaders/DTFoundation/NSScanner+DTScripting.h b/Pods/BuildHeaders/DTFoundation/NSScanner+DTScripting.h
diff --git a/Pods/BuildHeaders/DTFoundation/UIColor+DTDebug.h b/Pods/BuildHeaders/DTFoundation/UIColor+DTDebug.h
diff --git a/Pods/BuildHeaders/DTFoundation/UIView+DTActionHandlers.h b/Pods/BuildHeaders/DTFoundation/UIView+DTActionHandlers.h
diff --git a/Pods/BuildHeaders/DTFoundation/UIView+DTDebug.h b/Pods/BuildHeaders/DTFoundation/UIView+DTDebug.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GPPDeepLink.h b/Pods/BuildHeaders/google-plus-ios-sdk/GPPDeepLink.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GPPShare.h b/Pods/BuildHeaders/google-plus-ios-sdk/GPPShare.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GPPSignIn.h b/Pods/BuildHeaders/google-plus-ios-sdk/GPPSignIn.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GPPSignInButton.h b/Pods/BuildHeaders/google-plus-ios-sdk/GPPSignInButton.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GPPURLHandler.h b/Pods/BuildHeaders/google-plus-ios-sdk/GPPURLHandler.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTLBase64.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTLBase64.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTLBatchQuery.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTLBatchQuery.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTLBatchResult.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTLBatchResult.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTLDateTime.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTLDateTime.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTLDefines.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTLDefines.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTLErrorObject.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTLErrorObject.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTLFramework.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTLFramework.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTLJSONParser.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTLJSONParser.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTLObject.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTLObject.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTLPlus.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTLPlus.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTLPlusAcl.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTLPlusAcl.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTLPlusAclentryResource.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTLPlusAclentryResource.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTLPlusActivity.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTLPlusActivity.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTLPlusActivityFeed.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTLPlusActivityFeed.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTLPlusComment.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTLPlusComment.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTLPlusCommentFeed.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTLPlusCommentFeed.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTLPlusConstants.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTLPlusConstants.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTLPlusItemScope.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTLPlusItemScope.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTLPlusMoment.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTLPlusMoment.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTLPlusMomentsFeed.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTLPlusMomentsFeed.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTLPlusPeopleFeed.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTLPlusPeopleFeed.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTLPlusPerson.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTLPlusPerson.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTLQuery.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTLQuery.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTLQueryPlus.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTLQueryPlus.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTLRuntimeCommon.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTLRuntimeCommon.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTLService.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTLService.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTLServicePlus.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTLServicePlus.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTLTargetNamespace.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTLTargetNamespace.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTLUploadParameters.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTLUploadParameters.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTLUtilities.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTLUtilities.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTMDefines.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTMDefines.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTMGarbageCollection.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTMGarbageCollection.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTMHTTPFetchHistory.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTMHTTPFetchHistory.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTMHTTPFetcher.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTMHTTPFetcher.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTMHTTPFetcherLogging.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTMHTTPFetcherLogging.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTMHTTPFetcherService.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTMHTTPFetcherService.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTMLogger.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTMLogger.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTMMethodCheck.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTMMethodCheck.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTMNSDictionary+URLArguments.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTMNSDictionary+URLArguments.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTMNSString+URLArguments.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTMNSString+URLArguments.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTMOAuth2Authentication.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTMOAuth2Authentication.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTMOAuth2SignIn.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTMOAuth2SignIn.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTMOAuth2ViewControllerTouch.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTMOAuth2ViewControllerTouch.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/GTMObjC2Runtime.h b/Pods/BuildHeaders/google-plus-ios-sdk/GTMObjC2Runtime.h
diff --git a/Pods/BuildHeaders/google-plus-ios-sdk/OpenInChromeController.h b/Pods/BuildHeaders/google-plus-ios-sdk/OpenInChromeController.h
diff --git a/Pods/DTCoreText/Core/Source/DTAccessibilityElement.h b/Pods/DTCoreText/Core/Source/DTAccessibilityElement.h
diff --git a/Pods/DTCoreText/Core/Source/DTAccessibilityElement.m b/Pods/DTCoreText/Core/Source/DTAccessibilityElement.m