diff --git a/CHANGES.rst b/CHANGES.rst
index 0b7f748a4..c199ac154 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,45 @@
+Changes in Vector iOS in 0.1.8 (2016-06-01)
+===============================================
+
+Improvements:
+ * Upgrade MatrixKit version (v0.3.8).
+ * Authentication: Support forgot password option.
+ * Messages: Display badges for missed notifications and unread msgs #290.
+ * Handle missing VoIP better #323.
+ * Add login information to the settings page #330.
+ * Directory should be accessible from search even if the search field is empty #104.
+ * Settings: Publish third party licenses #304.
+ * Settings: Prompt user when notifications are denied.
+ * Settings: Disable spell-checking on add email field.
+ * Permalinks: Use the beta path of the web app instead of /develop.
+ * Authentication: Update the default login flow to the vector.im HS.
+ * Authentication: Support automatic fallback to matrix.org HS for existing users.
+ * Chat screen: Improved images & videos sending failure UX: Show a red border when the attachment sending failed.
+ * Change App badge handling: Replace the missed notifications count with the missed discussions count.
+ * Created Room: replace active member label with "invite members" #346.
+
+Bug fixes:
+ * Settings: App crashes when user goes back during saving #345.
+ * Tapping on icons in recents view doesn't work #298.
+ * Crash when the ?, the punctuation mark, is considered as part of a link #320.
+ * Messages: All blank after upgrade; no spinner #311.
+ * The client should automatically log out when the password is updated from another client #247.
+ * Application can crash when a video failed to be converted before sending #318.
+ * Room Participants - Search result: the user id should be displayed when 2 members has the same display name #293.
+ * Loading one image thumbnail in a sequence seems to set all fullres images downloading #316.
+ * It's too hard to press names to auto-insert nicks #309.
+ * Need to check push notification registration #333.
+ * Option to autocomplete nicknames from their member info page #317.
+ * Messages: Apply apple look&feel on overscroll #179.
+ * It sounds like something is filling up the logs #344.
+ * When images & videos fail to send, it is not clear that they are stuck as 'red' unsent messges #313.
+ * Chat screen: Tap on clock status bar should scroll you up #289.
+ * tap-on-recents-status-bar doesn't scroll me to top #125.
+ * Signout button gives zero user feedback when tapped #302.
+ * Champagne search bubbles appears over the rooms list while searching a room member #64.
+ * Settings: Profile avatar is not clickable #351.
+ * Default text in the memberlist search box would be less confusing if it was 'Search/invite by...' instead of the other way around #349.
+
Changes in Vector iOS in 0.1.6 (2016-05-04)
===============================================
diff --git a/Podfile b/Podfile
index c7a05d59e..28d1591e1 100644
--- a/Podfile
+++ b/Podfile
@@ -8,14 +8,14 @@ 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.7'
+pod 'MatrixKit', '~> 0.3.8'
# The lastest release available on the CocoaPods repository
#pod 'MatrixKit'
# The develop branch version
-pod 'MatrixSDK', :git => 'https://github.com/matrix-org/matrix-ios-sdk.git', :branch => 'develop'
-pod 'MatrixKit', :git => 'https://github.com/matrix-org/matrix-ios-kit.git', :branch => 'develop'
+#pod 'MatrixSDK', :git => 'https://github.com/matrix-org/matrix-ios-sdk.git', :branch => 'develop'
+#pod 'MatrixKit', :git => 'https://github.com/matrix-org/matrix-ios-kit.git', :branch => 'develop'
# The one used for developping both MatrixSDK and MatrixKit
# Note that MatrixSDK must be cloned into a folder called matrix-ios-sdk next to the MatrixKit folder
diff --git a/Podfile.lock b/Podfile.lock
index 241a21f57..4f6c4aafc 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -24,42 +24,25 @@ PODS:
- GBJailbreakDetection (~> 1.0)
- GBJailbreakDetection (1.3.0)
- HPGrowingTextView (1.1)
- - libPhoneNumber-iOS (0.8.12)
- - MatrixKit (0.3.7):
+ - libPhoneNumber-iOS (0.8.13)
+ - MatrixKit (0.3.8):
- HPGrowingTextView (~> 1.1)
- libPhoneNumber-iOS (~> 0.8.7)
- - MatrixSDK (~> 0.6.7)
- - MatrixSDK (0.6.7):
+ - MatrixSDK (~> 0.6.8)
+ - MatrixSDK (0.6.8):
- AFNetworking (~> 2.6.0)
DEPENDENCIES:
- GBDeviceInfo (~> 3.4.0)
- - MatrixKit (from `https://github.com/matrix-org/matrix-ios-kit.git`, branch `develop`)
- - MatrixSDK (from `https://github.com/matrix-org/matrix-ios-sdk.git`, branch `develop`)
-
-EXTERNAL SOURCES:
- MatrixKit:
- :branch: develop
- :git: https://github.com/matrix-org/matrix-ios-kit.git
- MatrixSDK:
- :branch: develop
- :git: https://github.com/matrix-org/matrix-ios-sdk.git
-
-CHECKOUT OPTIONS:
- MatrixKit:
- :commit: f11f4db8316de760e0bf97b7a623c83d82aebca3
- :git: https://github.com/matrix-org/matrix-ios-kit.git
- MatrixSDK:
- :commit: 33b97ce44c93e2936dcd437bd7eeafe4f83f82e5
- :git: https://github.com/matrix-org/matrix-ios-sdk.git
+ - MatrixKit (~> 0.3.8)
SPEC CHECKSUMS:
AFNetworking: cb8d14a848e831097108418f5d49217339d4eb60
GBDeviceInfo: bab0f43d351b6f641a626cd7d21492abef1afe46
GBJailbreakDetection: a216773574b62dddb6c876ffdb52c54ac05e27e0
HPGrowingTextView: 88a716d97fb853bcb08a4a08e4727da17efc9b19
- libPhoneNumber-iOS: 3f1889b70403cf7848c0e4136780a0d0aef9016d
- MatrixKit: 579965124d6095186a80a827494b9babcd7be91c
- MatrixSDK: 0ee4a7fbf85ee6e966d36aeccf767e82245f0cc0
+ libPhoneNumber-iOS: 3a37004baf779b4262ab29a31a87d2ae668159d4
+ MatrixKit: 41e89abd182910c5f52a4e7239886552fd6e0a6b
+ MatrixSDK: 6810a9781ad61ac26a52bd127b136000af7eb622
COCOAPODS: 0.39.0
diff --git a/Vector/Info.plist b/Vector/Info.plist
index bcd815e36..ef6beccbd 100644
--- a/Vector/Info.plist
+++ b/Vector/Info.plist
@@ -36,7 +36,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 0.1.7
+ 0.1.8
CFBundleSignature
????
CFBundleVersion