Merge branch 'release/3.7'

wordpress-mobile · Aug 8, 2013 · 5553896 · 5553896
2 parents 580683f + 0c581ab
commit 5553896
Show file tree

Hide file tree

Showing 815 changed files with 53,992 additions and 14,042 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,40 @@
+# OS X
+.DS_Store
+.AppleDouble
+.LSOverride
+Icon
+._*
+.Spotlight-V100
+.Trashes
+
+# Xcode
+.DS_Store
+*/build/*
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+profile
+*.moved-aside
+DerivedData
+.idea/
+*.hmap
+
+# Windows
+Thumbs.db
+ehthumbs.db
+Desktop.ini
+$RECYCLE.BIN/
+
+# Subversion
+.svn/
+
+# Project
 /Entitlements.plist
 Pods/Documentation
 Pods/Pods.xcodeproj/*.mode1v3
@@ -22,3 +59,4 @@ WordPress/WordPress.xcodeproj/*.perspectivev3
 WordPress/WordPress.xcodeproj/project.xcworkspace
 WordPress/WordPress.xcodeproj/xcuserdata
 /build
+
diff --git a/Podfile b/Podfile
@@ -6,7 +6,7 @@ pod 'Reachability',	'~> 3.0.0'
 pod 'JSONKit',		  '~> 1.4'
 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.0.0'
+pod 'DTCoreText',   '~> 1.5'
 pod 'UIDeviceIdentifier', '~> 0.1'
 pod 'SVProgressHUD', '~> 0.9'
 pod 'SSKeychain',   '~> 0.2'
@@ -16,6 +16,8 @@ pod 'WordPressApi', :podspec => 'https://raw.github.com/koke/WordPressApi/master
 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 'MGImageUtilities', :git => 'git://github.com/wordpress-mobile/MGImageUtilities.git'
+pod 'Quantcast-Measure'
 
 target :WordPressTest, :exclusive => true do
   pod 'OHHTTPStubs', '~> 1.1'
@@ -59,11 +61,16 @@ post_install do |installer|
         if build_files.length > 0
             build_files.each { |build_file|
                 settings = build_file.settings
-                compiler_flags = settings[compiler_flags_key]
-                compiler_flags = (compiler_flags.nil?) ?
-                    new_compiler_flags :
-                    (compiler_flags + " " + new_compiler_flags)
-                settings[compiler_flags_key] = compiler_flags
+                if settings.nil?
+                  # If we don't have settings for the file we create a new hash
+                  settings = Hash[compiler_flags_key, new_compiler_flags]
+                else
+                  compiler_flags = settings[compiler_flags_key]
+                  compiler_flags = (compiler_flags.nil?) ?
+                      new_compiler_flags :
+                      (compiler_flags + " " + new_compiler_flags)
+                  settings[compiler_flags_key] = compiler_flags
+                end
                 build_file.settings = settings
             }
         else

diff --git a/Podfile.lock b/Podfile.lock
@@ -1,13 +1,23 @@
 PODS:
   - AFNetworking (1.2.0)
   - CTidy (0.3.0)
-  - DTCoreText (1.0.2)
+  - 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):
+    - DTFoundation/Core
+  - DTFoundation/UIKit (1.4.4):
+    - DTFoundation/Core
   - google-plus-ios-sdk (1.2.1)
   - JSONKit (1.5pre)
+  - MGImageUtilities (0.0.1)
   - Mixpanel (2.0.0)
   - NSObject-SafeExpectations (0.0.1)
   - NSURL+IDN (0.1)
   - OHHTTPStubs (1.1.1)
+  - Quantcast-Measure (1.2.7)
   - Reachability (3.0.0)
   - SFHFKeychainUtils (0.0.1)
   - SSKeychain (0.2.1)
@@ -21,13 +31,15 @@ PODS:
 DEPENDENCIES:
   - AFNetworking (= 1.2)
   - CTidy (from `git://github.com/wordpress-mobile/CTidy.git`)
-  - DTCoreText (~> 1.0.0)
+  - DTCoreText (~> 1.5)
   - google-plus-ios-sdk (~> 1.2)
   - JSONKit (~> 1.4)
+  - MGImageUtilities (from `git://github.com/wordpress-mobile/MGImageUtilities.git`)
   - Mixpanel
   - NSObject-SafeExpectations (from `https://raw.github.com/koke/NSObject-SafeExpectations/master/NSObject-SafeExpectations.podspec`)
   - NSURL+IDN (from `https://raw.github.com/koke/NSURL-IDN/master/Podfile`)
   - OHHTTPStubs (~> 1.1)
+  - Quantcast-Measure
   - Reachability (~> 3.0.0)
   - SFHFKeychainUtils (~> 0.0.1)
   - SSKeychain (~> 0.2)
@@ -39,6 +51,8 @@ DEPENDENCIES:
 EXTERNAL SOURCES:
   CTidy:
     :git: git://github.com/wordpress-mobile/CTidy.git
+  MGImageUtilities:
+    :git: git://github.com/wordpress-mobile/MGImageUtilities.git
   NSObject-SafeExpectations:
     :podspec: https://raw.github.com/koke/NSObject-SafeExpectations/master/NSObject-SafeExpectations.podspec
   NSURL+IDN:
@@ -49,13 +63,16 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   AFNetworking: 3cbae45f61a9f995cdbd56bd571223910d7f4e44
   CTidy: 6a35875a96dd441822e620732c1113be19769067
-  DTCoreText: 4f2b9d62554c62dd7cd412c9f50ece1e70a548b9
+  DTCoreText: 5fd652092630ef9254c538d870c115ee548bfe18
+  DTFoundation: c2fd15b2163d8245773911e990ac665b888c4d76
   google-plus-ios-sdk: fd312bf0eed88cfc708fe2cdcb9c1084598af99e
   JSONKit: 409734ab3407fce90ef7eaa95d7168f38d9a6601
+  MGImageUtilities: ab3580f2161b10f8a41331baea87aaafbd688950
   Mixpanel: d456c27f7520e22784a15d0bcd9d5c287080b0cd
   NSObject-SafeExpectations: 241ab1289cbc33a00307cd025d22883646f2e1f0
   NSURL+IDN: 22633c0149b86d6391f32f23776bc0e6ecc532e2
   OHHTTPStubs: cb1cef742f2fba18b192fb92ede52a69cf3a04d5
+  Quantcast-Measure: 534b21e7231f46f72e7d36dcb4ba392d0f6a1de2
   Reachability: 500bd76bf6cd8ff2c6fb715fc5f44ef6e4c024f2
   SFHFKeychainUtils: e828dbd9eaa509486acf95d8de2ebd414c4b7451
   SSKeychain: ffa1a79eb716d9ed1ca184fb0cf218087ca28486
@@ -64,4 +81,4 @@ SPEC CHECKSUMS:
   WordPressApi: 76f9d7752b090197c172e2c5e6fccbffbaf7c336
   wpxmlrpc: 0b27d4c3734db9470f0dccc3c8d4a6f8e491fd0b
 
-COCOAPODS: 0.20.2
+COCOAPODS: 0.22.3
diff --git a/Pods/AFNetworking/AFNetworking/AFImageRequestOperation.m b/Pods/AFNetworking/AFNetworking/AFImageRequestOperation.m
diff --git a/Pods/AFNetworking/AFNetworking/AFJSONRequestOperation.m b/Pods/AFNetworking/AFNetworking/AFJSONRequestOperation.m
diff --git a/Pods/BuildHeaders/DTCoreText/CGUtils.h b/Pods/BuildHeaders/DTCoreText/CGUtils.h
diff --git a/Pods/BuildHeaders/DTCoreText/DTAnchorHTMLElement.h b/Pods/BuildHeaders/DTCoreText/DTAnchorHTMLElement.h
diff --git a/Pods/BuildHeaders/DTCoreText/DTAttributedLabel.h b/Pods/BuildHeaders/DTCoreText/DTAttributedLabel.h
diff --git a/Pods/BuildHeaders/DTCoreText/DTBreakHTMLElement.h b/Pods/BuildHeaders/DTCoreText/DTBreakHTMLElement.h
diff --git a/Pods/BuildHeaders/DTCoreText/DTCoreTextFunctions.h b/Pods/BuildHeaders/DTCoreText/DTCoreTextFunctions.h
diff --git a/Pods/BuildHeaders/DTCoreText/DTDictationPlaceholderTextAttachment.h b/Pods/BuildHeaders/DTCoreText/DTDictationPlaceholderTextAttachment.h
diff --git a/Pods/BuildHeaders/DTCoreText/DTDictationPlaceholderView.h b/Pods/BuildHeaders/DTCoreText/DTDictationPlaceholderView.h
diff --git a/Pods/BuildHeaders/DTCoreText/DTHTMLParser.h b/Pods/BuildHeaders/DTCoreText/DTHTMLParser.h
diff --git a/Pods/BuildHeaders/DTCoreText/DTHTMLParserNode.h b/Pods/BuildHeaders/DTCoreText/DTHTMLParserNode.h
diff --git a/Pods/BuildHeaders/DTCoreText/DTHTMLParserTextNode.h b/Pods/BuildHeaders/DTCoreText/DTHTMLParserTextNode.h
diff --git a/Pods/BuildHeaders/DTCoreText/DTHTMLWriter.h b/Pods/BuildHeaders/DTCoreText/DTHTMLWriter.h
diff --git a/Pods/BuildHeaders/DTCoreText/DTHorizontalRuleHTMLElement.h b/Pods/BuildHeaders/DTCoreText/DTHorizontalRuleHTMLElement.h
diff --git a/Pods/BuildHeaders/DTCoreText/DTIframeTextAttachment.h b/Pods/BuildHeaders/DTCoreText/DTIframeTextAttachment.h
diff --git a/Pods/BuildHeaders/DTCoreText/DTImageTextAttachment.h b/Pods/BuildHeaders/DTCoreText/DTImageTextAttachment.h
diff --git a/Pods/BuildHeaders/DTCoreText/DTListItemHTMLElement.h b/Pods/BuildHeaders/DTCoreText/DTListItemHTMLElement.h
diff --git a/Pods/BuildHeaders/DTCoreText/DTObjectTextAttachment.h b/Pods/BuildHeaders/DTCoreText/DTObjectTextAttachment.h
diff --git a/Pods/BuildHeaders/DTCoreText/DTStylesheetHTMLElement.h b/Pods/BuildHeaders/DTCoreText/DTStylesheetHTMLElement.h
diff --git a/Pods/BuildHeaders/DTCoreText/DTTextAttachmentHTMLElement.h b/Pods/BuildHeaders/DTCoreText/DTTextAttachmentHTMLElement.h
diff --git a/Pods/BuildHeaders/DTCoreText/DTTextHTMLElement.h b/Pods/BuildHeaders/DTCoreText/DTTextHTMLElement.h
diff --git a/Pods/BuildHeaders/DTCoreText/DTVideoTextAttachment.h b/Pods/BuildHeaders/DTCoreText/DTVideoTextAttachment.h
diff --git a/Pods/BuildHeaders/DTCoreText/NSAttributedString+DTDebug.h b/Pods/BuildHeaders/DTCoreText/NSAttributedString+DTDebug.h
diff --git a/Pods/BuildHeaders/DTCoreText/NSData+DTBase64.h b/Pods/BuildHeaders/DTCoreText/NSData+DTBase64.h
diff --git a/Pods/BuildHeaders/DTCoreText/NSDictionary+DTCoreText.h b/Pods/BuildHeaders/DTCoreText/NSDictionary+DTCoreText.h
diff --git a/Pods/BuildHeaders/DTCoreText/NSString+UTF8Cleaner.h b/Pods/BuildHeaders/DTCoreText/NSString+UTF8Cleaner.h
diff --git a/Pods/BuildHeaders/DTCoreText/UIDevice+DTSimpleVersion.h b/Pods/BuildHeaders/DTCoreText/UIDevice+DTSimpleVersion.h
diff --git a/Pods/BuildHeaders/DTCoreText/UIFont+DTCoreText.h b/Pods/BuildHeaders/DTCoreText/UIFont+DTCoreText.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/DTActivityTitleView.h b/Pods/BuildHeaders/DTFoundation/DTActivityTitleView.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/DTBase64Coding.h b/Pods/BuildHeaders/DTFoundation/DTBase64Coding.h
diff --git a/Pods/BuildHeaders/DTFoundation/DTCustomColoredAccessory.h b/Pods/BuildHeaders/DTFoundation/DTCustomColoredAccessory.h
diff --git a/Pods/BuildHeaders/DTFoundation/DTExtendedFileAttributes.h b/Pods/BuildHeaders/DTFoundation/DTExtendedFileAttributes.h
diff --git a/Pods/BuildHeaders/DTFoundation/DTFoundationConstants.h b/Pods/BuildHeaders/DTFoundation/DTFoundationConstants.h
diff --git a/Pods/BuildHeaders/DTFoundation/DTHTMLParser.h b/Pods/BuildHeaders/DTFoundation/DTHTMLParser.h
diff --git a/Pods/BuildHeaders/DTFoundation/DTObjectBlockExecutor.h b/Pods/BuildHeaders/DTFoundation/DTObjectBlockExecutor.h
diff --git a/Pods/BuildHeaders/DTFoundation/DTPieProgressIndicator.h b/Pods/BuildHeaders/DTFoundation/DTPieProgressIndicator.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/DTSmartPagingScrollView.h b/Pods/BuildHeaders/DTFoundation/DTSmartPagingScrollView.h
diff --git a/Pods/BuildHeaders/DTFoundation/DTTiledLayerWithoutFade.h b/Pods/BuildHeaders/DTFoundation/DTTiledLayerWithoutFade.h
diff --git a/Pods/BuildHeaders/DTFoundation/DTUtils.h b/Pods/BuildHeaders/DTFoundation/DTUtils.h
diff --git a/Pods/BuildHeaders/DTFoundation/DTVersion.h b/Pods/BuildHeaders/DTFoundation/DTVersion.h
diff --git a/Pods/BuildHeaders/DTFoundation/DTWeakSupport.h b/Pods/BuildHeaders/DTFoundation/DTWeakSupport.h
diff --git a/Pods/BuildHeaders/DTFoundation/NSArray+DTError.h b/Pods/BuildHeaders/DTFoundation/NSArray+DTError.h
diff --git a/Pods/BuildHeaders/DTFoundation/NSData+DTCrypto.h b/Pods/BuildHeaders/DTFoundation/NSData+DTCrypto.h
diff --git a/Pods/BuildHeaders/DTFoundation/NSDictionary+DTError.h b/Pods/BuildHeaders/DTFoundation/NSDictionary+DTError.h
diff --git a/Pods/BuildHeaders/DTFoundation/NSFileWrapper+DTCopying.h b/Pods/BuildHeaders/DTFoundation/NSFileWrapper+DTCopying.h
diff --git a/Pods/BuildHeaders/DTFoundation/NSMutableArray+DTMoving.h b/Pods/BuildHeaders/DTFoundation/NSMutableArray+DTMoving.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/NSString+DTFormatNumbers.h b/Pods/BuildHeaders/DTFoundation/NSString+DTFormatNumbers.h
diff --git a/Pods/BuildHeaders/DTFoundation/NSString+DTPaths.h b/Pods/BuildHeaders/DTFoundation/NSString+DTPaths.h
diff --git a/Pods/BuildHeaders/DTFoundation/NSString+DTURLEncoding.h b/Pods/BuildHeaders/DTFoundation/NSString+DTURLEncoding.h
diff --git a/Pods/BuildHeaders/DTFoundation/NSString+DTUtilities.h b/Pods/BuildHeaders/DTFoundation/NSString+DTUtilities.h
diff --git a/Pods/BuildHeaders/DTFoundation/NSURL+DTAppLinks.h b/Pods/BuildHeaders/DTFoundation/NSURL+DTAppLinks.h
diff --git a/Pods/BuildHeaders/DTFoundation/NSURL+DTComparing.h b/Pods/BuildHeaders/DTFoundation/NSURL+DTComparing.h
diff --git a/Pods/BuildHeaders/DTFoundation/NSURL+DTUnshorten.h b/Pods/BuildHeaders/DTFoundation/NSURL+DTUnshorten.h
diff --git a/Pods/BuildHeaders/DTFoundation/UIApplication+DTNetworkActivity.h b/Pods/BuildHeaders/DTFoundation/UIApplication+DTNetworkActivity.h
diff --git a/Pods/BuildHeaders/DTFoundation/UIColor+DTDebug.h b/Pods/BuildHeaders/DTFoundation/UIColor+DTDebug.h
diff --git a/Pods/BuildHeaders/DTFoundation/UIImage+DTFoundation.h b/Pods/BuildHeaders/DTFoundation/UIImage+DTFoundation.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/DTFoundation/UIView+DTFoundation.h b/Pods/BuildHeaders/DTFoundation/UIView+DTFoundation.h
diff --git a/Pods/BuildHeaders/DTFoundation/UIWebView+DTFoundation.h b/Pods/BuildHeaders/DTFoundation/UIWebView+DTFoundation.h
diff --git a/Pods/BuildHeaders/MGImageUtilities/UIImage+ProportionalFill.h b/Pods/BuildHeaders/MGImageUtilities/UIImage+ProportionalFill.h
diff --git a/Pods/BuildHeaders/MGImageUtilities/UIImage+Tint.h b/Pods/BuildHeaders/MGImageUtilities/UIImage+Tint.h