Updated to v1.2.6

apptentive · Jan 28, 2014 · 4c835e2 · 4c835e2
1 parent 504799a
commit 4c835e2
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/ApptentiveConnect/source/ATConnect.h b/ApptentiveConnect/source/ATConnect.h
@@ -13,7 +13,7 @@
 #import <Cocoa/Cocoa.h>
 #endif
 
-#define kATConnectVersionString @"1.2.6a"
+#define kATConnectVersionString @"1.2.6"
 
 #if TARGET_OS_IPHONE
 #	define kATConnectPlatformString @"iOS"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,10 @@
-2014-01-?? wooster, pkamb v1.2.6 (in progress)
+2014-01-27 wooster, pkamb v1.2.6
 --------------------------------
 
 Fixes:
 
+* IOS-368 Added cases for always or never showing an interaction based on its criteria.
+* IOS-363 Changed key to "hardware" from "model". Human readable string "model" will now be set on server.
 * IOS-172 Prevent duplicate Message Center automated messages
 * [Issue #70](https://github.com/apptentive/apptentive-ios/issues/70) unreadCount incremented when typing a message
 * IOS-310 unreadMessageCount incremented when typing a message

diff --git a/README.md b/README.md
@@ -340,6 +340,18 @@ Custom data should be of type `NSString`, `NSNumber`, `NSDate`, or `NSNull`.
 
 When Message Center is presented with custom data, that custom data will be attached to the first message in the Message Center session.
 
+#### Attachments
+
+The methods below can be used to attach text, images, or files to the user's feedback.
+
+These attachments will appear in your online Apptentive dashboard, but will *not* appear in Message Center on the user's device. They may be useful for sending debug logs or other pertinent information.
+
+``` objective-c
+- (void)sendAttachmentText:(NSString *)text;
+- (void)sendAttachmentImage:(UIImage *)image;
+- (void)sendAttachmentFile:(NSData *)fileData withMimeType:(NSString *)mimeType;
+```
+
 #### Push Notifications
 
 Apptentive can integrate with your existing [Urban Airship](http://urbanairship.com/) account to offer push notifications when new Apptentive messages are available.

diff --git a/apptentive-ios.podspec b/apptentive-ios.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'apptentive-ios'
-  s.version  = '1.2.5'
+  s.version  = '1.2.6'
   s.license  = 'BSD'
   s.summary  = 'Apptentive Customer Communications SDK.'
   s.homepage = 'https://www.apptentive.com/'