Merge branch 'release/3.6.4'

wordpress-mobile · Jul 22, 2013 · 580683f · 580683f
2 parents bea2667 + 0413c1c
commit 580683f
Show file tree

Hide file tree

Showing 274 changed files with 30,332 additions and 3,635 deletions.
diff --git a/Podfile b/Podfile
@@ -15,6 +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'
 
 target :WordPressTest, :exclusive => true do
   pod 'OHHTTPStubs', '~> 1.1'

diff --git a/Podfile.lock b/Podfile.lock
@@ -2,6 +2,7 @@ PODS:
   - AFNetworking (1.2.0)
   - CTidy (0.3.0)
   - DTCoreText (1.0.2)
+  - google-plus-ios-sdk (1.2.1)
   - JSONKit (1.5pre)
   - Mixpanel (2.0.0)
   - NSObject-SafeExpectations (0.0.1)
@@ -21,6 +22,7 @@ DEPENDENCIES:
   - AFNetworking (= 1.2)
   - CTidy (from `git://github.com/wordpress-mobile/CTidy.git`)
   - DTCoreText (~> 1.0.0)
+  - google-plus-ios-sdk (~> 1.2)
   - JSONKit (~> 1.4)
   - Mixpanel
   - NSObject-SafeExpectations (from `https://raw.github.com/koke/NSObject-SafeExpectations/master/NSObject-SafeExpectations.podspec`)
@@ -48,6 +50,7 @@ SPEC CHECKSUMS:
   AFNetworking: 3cbae45f61a9f995cdbd56bd571223910d7f4e44
   CTidy: 6a35875a96dd441822e620732c1113be19769067
   DTCoreText: 4f2b9d62554c62dd7cd412c9f50ece1e70a548b9
+  google-plus-ios-sdk: fd312bf0eed88cfc708fe2cdcb9c1084598af99e
   JSONKit: 409734ab3407fce90ef7eaa95d7168f38d9a6601
   Mixpanel: d456c27f7520e22784a15d0bcd9d5c287080b0cd
   NSObject-SafeExpectations: 241ab1289cbc33a00307cd025d22883646f2e1f0
@@ -61,4 +64,4 @@ SPEC CHECKSUMS:
   WordPressApi: 76f9d7752b090197c172e2c5e6fccbffbaf7c336
   wpxmlrpc: 0b27d4c3734db9470f0dccc3c8d4a6f8e491fd0b
 
-COCOAPODS: 0.19.1
+COCOAPODS: 0.20.2
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/Headers/google-plus-ios-sdk/GPPDeepLink.h b/Pods/Headers/google-plus-ios-sdk/GPPDeepLink.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GPPShare.h b/Pods/Headers/google-plus-ios-sdk/GPPShare.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GPPSignIn.h b/Pods/Headers/google-plus-ios-sdk/GPPSignIn.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GPPSignInButton.h b/Pods/Headers/google-plus-ios-sdk/GPPSignInButton.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GPPURLHandler.h b/Pods/Headers/google-plus-ios-sdk/GPPURLHandler.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTLBase64.h b/Pods/Headers/google-plus-ios-sdk/GTLBase64.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTLBatchQuery.h b/Pods/Headers/google-plus-ios-sdk/GTLBatchQuery.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTLBatchResult.h b/Pods/Headers/google-plus-ios-sdk/GTLBatchResult.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTLDateTime.h b/Pods/Headers/google-plus-ios-sdk/GTLDateTime.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTLDefines.h b/Pods/Headers/google-plus-ios-sdk/GTLDefines.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTLErrorObject.h b/Pods/Headers/google-plus-ios-sdk/GTLErrorObject.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTLFramework.h b/Pods/Headers/google-plus-ios-sdk/GTLFramework.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTLJSONParser.h b/Pods/Headers/google-plus-ios-sdk/GTLJSONParser.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTLObject.h b/Pods/Headers/google-plus-ios-sdk/GTLObject.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTLPlus.h b/Pods/Headers/google-plus-ios-sdk/GTLPlus.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTLPlusAcl.h b/Pods/Headers/google-plus-ios-sdk/GTLPlusAcl.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTLPlusAclentryResource.h b/Pods/Headers/google-plus-ios-sdk/GTLPlusAclentryResource.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTLPlusActivity.h b/Pods/Headers/google-plus-ios-sdk/GTLPlusActivity.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTLPlusActivityFeed.h b/Pods/Headers/google-plus-ios-sdk/GTLPlusActivityFeed.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTLPlusComment.h b/Pods/Headers/google-plus-ios-sdk/GTLPlusComment.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTLPlusCommentFeed.h b/Pods/Headers/google-plus-ios-sdk/GTLPlusCommentFeed.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTLPlusConstants.h b/Pods/Headers/google-plus-ios-sdk/GTLPlusConstants.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTLPlusItemScope.h b/Pods/Headers/google-plus-ios-sdk/GTLPlusItemScope.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTLPlusMoment.h b/Pods/Headers/google-plus-ios-sdk/GTLPlusMoment.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTLPlusMomentsFeed.h b/Pods/Headers/google-plus-ios-sdk/GTLPlusMomentsFeed.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTLPlusPeopleFeed.h b/Pods/Headers/google-plus-ios-sdk/GTLPlusPeopleFeed.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTLPlusPerson.h b/Pods/Headers/google-plus-ios-sdk/GTLPlusPerson.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTLQuery.h b/Pods/Headers/google-plus-ios-sdk/GTLQuery.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTLQueryPlus.h b/Pods/Headers/google-plus-ios-sdk/GTLQueryPlus.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTLRuntimeCommon.h b/Pods/Headers/google-plus-ios-sdk/GTLRuntimeCommon.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTLService.h b/Pods/Headers/google-plus-ios-sdk/GTLService.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTLServicePlus.h b/Pods/Headers/google-plus-ios-sdk/GTLServicePlus.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTLTargetNamespace.h b/Pods/Headers/google-plus-ios-sdk/GTLTargetNamespace.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTLUploadParameters.h b/Pods/Headers/google-plus-ios-sdk/GTLUploadParameters.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTLUtilities.h b/Pods/Headers/google-plus-ios-sdk/GTLUtilities.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTMDefines.h b/Pods/Headers/google-plus-ios-sdk/GTMDefines.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTMGarbageCollection.h b/Pods/Headers/google-plus-ios-sdk/GTMGarbageCollection.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTMHTTPFetchHistory.h b/Pods/Headers/google-plus-ios-sdk/GTMHTTPFetchHistory.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTMHTTPFetcher.h b/Pods/Headers/google-plus-ios-sdk/GTMHTTPFetcher.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTMHTTPFetcherLogging.h b/Pods/Headers/google-plus-ios-sdk/GTMHTTPFetcherLogging.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTMHTTPFetcherService.h b/Pods/Headers/google-plus-ios-sdk/GTMHTTPFetcherService.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTMLogger.h b/Pods/Headers/google-plus-ios-sdk/GTMLogger.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTMMethodCheck.h b/Pods/Headers/google-plus-ios-sdk/GTMMethodCheck.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTMNSDictionary+URLArguments.h b/Pods/Headers/google-plus-ios-sdk/GTMNSDictionary+URLArguments.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTMNSString+URLArguments.h b/Pods/Headers/google-plus-ios-sdk/GTMNSString+URLArguments.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTMOAuth2Authentication.h b/Pods/Headers/google-plus-ios-sdk/GTMOAuth2Authentication.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTMOAuth2SignIn.h b/Pods/Headers/google-plus-ios-sdk/GTMOAuth2SignIn.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTMOAuth2ViewControllerTouch.h b/Pods/Headers/google-plus-ios-sdk/GTMOAuth2ViewControllerTouch.h
diff --git a/Pods/Headers/google-plus-ios-sdk/GTMObjC2Runtime.h b/Pods/Headers/google-plus-ios-sdk/GTMObjC2Runtime.h
diff --git a/Pods/Headers/google-plus-ios-sdk/OpenInChromeController.h b/Pods/Headers/google-plus-ios-sdk/OpenInChromeController.h
diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock
diff --git a/Pods/Pods-Acknowledgements.markdown b/Pods/Pods-Acknowledgements.markdown
diff --git a/Pods/Pods-Acknowledgements.plist b/Pods/Pods-Acknowledgements.plist