2.3.19

nagyistge · Jan 28, 2016 · f082f60 · f082f60
1 parent 3ea2bf4
commit f082f60
Show file tree

Hide file tree

Showing 34 changed files with 19 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Intercom
 
+## 2.3.19 (2016-01-28)
+
+* Added workaround for iOS issue outlined in [#117](https://github.com/intercom/intercom-ios/issues/117).
+* Fixed issue where "Error loading conversation" could be shown when coming from background.
+
 ## 2.3.18 (2015-12-21)
 
 * Added workaround for apps with incorrectly sized windows on iOS 9.

diff --git a/Intercom.bundle/images/intercom_logo.png b/Intercom.bundle/images/intercom_logo.png
diff --git a/Intercom.bundle/images/intercom_logo@2x.png b/Intercom.bundle/images/intercom_logo@2x.png
diff --git a/Intercom.bundle/images/intercom_logo@3x.png b/Intercom.bundle/images/intercom_logo@3x.png
diff --git a/Intercom.framework/Versions/A/Headers/Intercom.h b/Intercom.framework/Versions/A/Headers/Intercom.h
@@ -1,6 +1,6 @@
 //
 //  Intercom.h
-//  Intercom for iOS - Version 2.3.18
+//  Intercom for iOS - Version 2.3.19
 //
 //  Created by Intercom on 8/01/2015.
 //  Copyright (c) 2014 Intercom. All rights reserved.
@@ -10,7 +10,7 @@
 #import <UIKit/UIKit.h>
 
 #if __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_7_0
-#error This version (2.3.18) of Intercom for iOS supports iOS 7.0 upwards.
+#error This version (2.3.19) of Intercom for iOS supports iOS 7.0 upwards.
 #endif
 
 NS_ASSUME_NONNULL_BEGIN

diff --git a/Intercom.framework/Versions/A/Intercom b/Intercom.framework/Versions/A/Intercom
diff --git a/Intercom.podspec b/Intercom.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                = 'Intercom'
-  s.version             = '2.3.18'
+  s.version             = '2.3.19'
   s.summary             = 'The Intercom iOS SDK, for integrating Intercom into your iOS application.'
   s.license             = { :type => "Apache license", :file => "LICENSE" }
   s.authors             = {"Adam McCarthy"=>"adam@intercom.io", "James Treanor"=>"james@intercom.io"}

diff --git a/...iOS-SDK-2.3.18.docset/Contents/Info.plist → ...iOS-SDK-2.3.19.docset/Contents/Info.plist b/...iOS-SDK-2.3.18.docset/Contents/Info.plist → ...iOS-SDK-2.3.19.docset/Contents/Info.plist
@@ -5,9 +5,9 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleIdentifier</key>
-	<string>io.intercom.Intercom-iOS-SDK-2.3.18</string>
+	<string>io.intercom.Intercom-iOS-SDK-2.3.19</string>
 	<key>CFBundleName</key>
-	<string>Intercom iOS SDK 2.3.18 Documentation</string>
+	<string>Intercom iOS SDK 2.3.19 Documentation</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
@@ -17,7 +17,7 @@
 
 
 	<key>DocSetFeedName</key>
-	<string>Intercom iOS SDK 2.3.18 Documentation</string>
+	<string>Intercom iOS SDK 2.3.19 Documentation</string>
 
 	<key>DocSetMinimumXcodeVersion</key>
 	<string>3.0</string>

diff --git a/...Resources/Documents/Classes/Intercom.html → ...Resources/Documents/Classes/Intercom.html b/...Resources/Documents/Classes/Intercom.html → ...Resources/Documents/Classes/Intercom.html
@@ -14,7 +14,7 @@
 		<div class="container" class="hide-in-xcode">
 
 			<h1 id="library-title">
-				<a href="../index.html">Intercom iOS SDK 2.3.18 </a>
+				<a href="../index.html">Intercom iOS SDK 2.3.19 </a>
 			</h1>
 
 			<p id="developer-home">

diff --git a/...cuments/Constants/ICMPreviewPosition.html → ...cuments/Constants/ICMPreviewPosition.html b/...cuments/Constants/ICMPreviewPosition.html → ...cuments/Constants/ICMPreviewPosition.html
@@ -14,7 +14,7 @@
 		<div class="container" class="hide-in-xcode">
 
 			<h1 id="library-title">
-				<a href="../index.html">Intercom iOS SDK 2.3.18 </a>
+				<a href="../index.html">Intercom iOS SDK 2.3.19 </a>
 			</h1>
 
 			<p id="developer-home">

diff --git a/.../Resources/Documents/css/scss/_index.scss → .../Resources/Documents/css/scss/_index.scss b/.../Resources/Documents/css/scss/_index.scss → .../Resources/Documents/css/scss/_index.scss
diff --git a/...Resources/Documents/css/scss/_layout.scss → ...Resources/Documents/css/scss/_layout.scss b/...Resources/Documents/css/scss/_layout.scss → ...Resources/Documents/css/scss/_layout.scss
diff --git a/...ources/Documents/css/scss/_normalize.scss → ...ources/Documents/css/scss/_normalize.scss b/...ources/Documents/css/scss/_normalize.scss → ...ources/Documents/css/scss/_normalize.scss
diff --git a/...Resources/Documents/css/scss/_object.scss → ...Resources/Documents/css/scss/_object.scss b/...Resources/Documents/css/scss/_object.scss → ...Resources/Documents/css/scss/_object.scss
diff --git a/.../Resources/Documents/css/scss/_print.scss → .../Resources/Documents/css/scss/_print.scss b/.../Resources/Documents/css/scss/_print.scss → .../Resources/Documents/css/scss/_print.scss
diff --git a/...ources/Documents/css/scss/_variables.scss → ...ources/Documents/css/scss/_variables.scss b/...ources/Documents/css/scss/_variables.scss → ...ources/Documents/css/scss/_variables.scss
diff --git a/.../Resources/Documents/css/scss/_xcode.scss → .../Resources/Documents/css/scss/_xcode.scss b/.../Resources/Documents/css/scss/_xcode.scss → .../Resources/Documents/css/scss/_xcode.scss
diff --git a/...s/Resources/Documents/css/scss/style.scss → ...s/Resources/Documents/css/scss/style.scss b/...s/Resources/Documents/css/scss/style.scss → ...s/Resources/Documents/css/scss/style.scss
diff --git a/...ontents/Resources/Documents/css/style.css → ...ontents/Resources/Documents/css/style.css b/...ontents/Resources/Documents/css/style.css → ...ontents/Resources/Documents/css/style.css
diff --git a/...ntents/Resources/Documents/hierarchy.html → ...ntents/Resources/Documents/hierarchy.html b/...ntents/Resources/Documents/hierarchy.html → ...ntents/Resources/Documents/hierarchy.html
@@ -3,7 +3,7 @@
 <head>
 	<meta charset="utf-8">
 
-	<title>Intercom iOS SDK 2.3.18 Hierarchy</title>
+	<title>Intercom iOS SDK 2.3.19 Hierarchy</title>
 
 	<link rel="stylesheet" href="css/style.css">
 	<meta name="viewport" content="initial-scale=1, maximum-scale=1.4">
@@ -14,7 +14,7 @@
 		<div class="container" class="hide-in-xcode">
 
 			<h1 id="library-title">
-				<a href="index.html">Intercom iOS SDK 2.3.18 </a>
+				<a href="index.html">Intercom iOS SDK 2.3.19 </a>
 			</h1>
 
 			<p id="developer-home">
@@ -38,7 +38,7 @@ <h1 id="library-title">
 		<div id="overview-contents" class="container">
 			<div id="content">
 				<main role="main">
-					<h1 class="title">Intercom iOS SDK 2.3.18 Hierarchy</h1>
+					<h1 class="title">Intercom iOS SDK 2.3.19 Hierarchy</h1>
 
 
 					<div class="index-column hierarchy-column">

diff --git a/...s/Documents/img/button_bar_background.png → ...s/Documents/img/button_bar_background.png b/...s/Documents/img/button_bar_background.png → ...s/Documents/img/button_bar_background.png
diff --git a/...ts/Resources/Documents/img/disclosure.png → ...ts/Resources/Documents/img/disclosure.png b/...ts/Resources/Documents/img/disclosure.png → ...ts/Resources/Documents/img/disclosure.png
diff --git a/...sources/Documents/img/disclosure_open.png → ...sources/Documents/img/disclosure_open.png b/...sources/Documents/img/disclosure_open.png → ...sources/Documents/img/disclosure_open.png
diff --git a/...rces/Documents/img/library_background.png → ...rces/Documents/img/library_background.png b/...rces/Documents/img/library_background.png → ...rces/Documents/img/library_background.png
diff --git a/...ources/Documents/img/title_background.png → ...ources/Documents/img/title_background.png b/...ources/Documents/img/title_background.png → ...ources/Documents/img/title_background.png
diff --git a/...t/Contents/Resources/Documents/index.html → ...t/Contents/Resources/Documents/index.html b/...t/Contents/Resources/Documents/index.html → ...t/Contents/Resources/Documents/index.html
@@ -3,7 +3,7 @@
 <head>
 	<meta charset="utf-8">
 
-	<title>Intercom iOS SDK 2.3.18 Reference</title>
+	<title>Intercom iOS SDK 2.3.19 Reference</title>
 
 	<link rel="stylesheet" href="css/style.css">
 	<meta name="viewport" content="initial-scale=1, maximum-scale=1.4">
@@ -14,7 +14,7 @@
 		<div class="container" class="hide-in-xcode">
 
 			<h1 id="library-title">
-				<a href="index.html">Intercom iOS SDK 2.3.18 </a>
+				<a href="index.html">Intercom iOS SDK 2.3.19 </a>
 			</h1>
 
 			<p id="developer-home">
@@ -38,7 +38,7 @@ <h1 id="library-title">
 		<div id="overview-contents" class="container">
 			<div id="content">
 				<main role="main">
-					<h1 class="title">Intercom iOS SDK 2.3.18 Reference</h1>
+					<h1 class="title">Intercom iOS SDK 2.3.19 Reference</h1>
 
 
 

diff --git a/...Contents/Resources/Documents/js/script.js → ...Contents/Resources/Documents/js/script.js b/...Contents/Resources/Documents/js/script.js → ...Contents/Resources/Documents/js/script.js
diff --git a/...18.docset/Contents/Resources/docSet.dsidx → ...19.docset/Contents/Resources/docSet.dsidx b/...18.docset/Contents/Resources/docSet.dsidx → ...19.docset/Contents/Resources/docSet.dsidx
diff --git a/...ocset/Contents/Resources/docSet.dsidx-shm → ...ocset/Contents/Resources/docSet.dsidx-shm b/...ocset/Contents/Resources/docSet.dsidx-shm → ...ocset/Contents/Resources/docSet.dsidx-shm
diff --git a/...ocset/Contents/Resources/docSet.dsidx-wal → ...ocset/Contents/Resources/docSet.dsidx-wal b/...ocset/Contents/Resources/docSet.dsidx-wal → ...ocset/Contents/Resources/docSet.dsidx-wal
diff --git a/...3.18.docset/Contents/Resources/docSet.mom → ...3.19.docset/Contents/Resources/docSet.mom b/...3.18.docset/Contents/Resources/docSet.mom → ...3.19.docset/Contents/Resources/docSet.mom
diff --git a/...18.docset/Contents/Resources/docSet.skidx → ...19.docset/Contents/Resources/docSet.skidx b/...18.docset/Contents/Resources/docSet.skidx → ...19.docset/Contents/Resources/docSet.skidx
diff --git a/...3.18.docset/Contents/Resources/docSet.toc → ...3.19.docset/Contents/Resources/docSet.toc b/...3.18.docset/Contents/Resources/docSet.toc → ...3.19.docset/Contents/Resources/docSet.toc
diff --git a/...cset/Contents/Resources/docSet.tokencache → ...cset/Contents/Resources/docSet.tokencache b/...cset/Contents/Resources/docSet.tokencache → ...cset/Contents/Resources/docSet.tokencache