Merge remote-tracking branch 'origin/master' into develop

CHANGES.rst

@@ -1,3 +1,28 @@
+Changes in Vector iOS in 0.1.3 (2016-04-08)
+===============================================
+
+Improvements:
+ * Upgrade MatrixKit version (v0.3.5).
+ * Room members: Make UI more intuitive.
+ * Registration support - Support the 2 following flows: m.login.email.identity and m.login.recaptcha.
+ * Settings: Handle user's linked emails.
+ * Room members: Include address book emails in search result #196.
+
+Bug fixes:
+ * App crashes when the user did not grant permission to access Photos.
+ * Member details: Multiple invitations on Start Chat action.
+ * Room members: Invite text box uses the email keyboard which has no colon! #146.
+ * Messages - Wait for the end of action before hiding swipe menu
+#52.
+ * Messages - Plus button (new room creation) is inactive.
+ * Chat screen: the user's avatar is missing in input toolbar.
+ * App crashes on iPhone 6S in case of rotation on login screen.
+ * Do not stop registration process when app is backgrounded.
+ * Authentication screen: Handle correctly custom server options.
+ * Tapping on room name in expanded header should let you edit it #195.
+ * Chat screen: Resume on empty room (Please select a room) #128.
+ * Room members: Keyboard is dismissed at each tap (when search result has been scrolled once).
+
 Changes in Vector iOS in 0.1.2 (2016-03-17)
 ===============================================
 

Podfile

@@ -8,7 +8,7 @@ target "Vector" do
 
 # Different flavours of pods to MatrixKit
 # The tagged version on which this version of Console has been built
-#pod 'MatrixKit', '~> 0.3.4'
+#pod 'MatrixKit', '~> 0.3.5'
 
 # The lastest release available on the CocoaPods repository 
 #pod 'MatrixKit'

Podfile.lock

@@ -25,11 +25,11 @@ PODS:
   - GBJailbreakDetection (1.3.0)
   - HPGrowingTextView (1.1)
   - libPhoneNumber-iOS (0.8.11)
-  - MatrixKit (0.3.4):
+  - MatrixKit (0.3.5):
     - HPGrowingTextView (~> 1.1)
     - libPhoneNumber-iOS (~> 0.8.7)
-    - MatrixSDK (~> 0.6.4)
-  - MatrixSDK (0.6.4):
+    - MatrixSDK (~> 0.6.5)
+  - MatrixSDK (0.6.5):
     - AFNetworking (~> 2.6.0)
 
 DEPENDENCIES:
@@ -47,10 +47,10 @@ EXTERNAL SOURCES:
 
 CHECKOUT OPTIONS:
   MatrixKit:
-    :commit: 3b32de74a72729d7f4ca70aa4abda7826ec80590
+    :commit: b4cc5e3530216023fa78cadcae42624b8af1b60e
     :git: https://github.com/matrix-org/matrix-ios-kit.git
   MatrixSDK:
-    :commit: c22c99d3e3a30fc9e3b1016a9990b9dcba4a8919
+    :commit: 48e2580540dbd5bf312f75d60c8922f6e2ca11d5
     :git: https://github.com/matrix-org/matrix-ios-sdk.git
 
 SPEC CHECKSUMS:
@@ -59,7 +59,7 @@ SPEC CHECKSUMS:
   GBJailbreakDetection: a216773574b62dddb6c876ffdb52c54ac05e27e0
   HPGrowingTextView: 88a716d97fb853bcb08a4a08e4727da17efc9b19
   libPhoneNumber-iOS: ded33fab2c51ee847979556aa504c9e70f32d703
-  MatrixKit: 304cc6847da4d8e5212705333b1f3219cb8794e9
-  MatrixSDK: 09985a664b3b158129421eeb096b17147a2f1bf9
+  MatrixKit: defac2bf01d1397e00cf4b1a72a25ac10c2c901c
+  MatrixSDK: 598925faff319441724db8a6af2a9cfc21d167e5
 
 COCOAPODS: 0.39.0

Vector/Info.plist

@@ -34,7 +34,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.1.2</string>
+	<string>0.1.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>