Skip to content

Commit

Permalink
Release version 3.0.18 (#119)
Browse files Browse the repository at this point in the history
* Release version 3.0.18

* Update Android support version
  • Loading branch information
jtreanor authored Nov 18, 2016
1 parent 181ce4e commit 691f3b8
Show file tree
Hide file tree
Showing 48 changed files with 252 additions and 132 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Intercom for Cordova/PhoneGap

## 3.0.18 (2016-11-18)

* Updated Intercom for iOS to [3.0.19](https://github.com/intercom/intercom-android/releases/tag/3.0.19).
* Updated Intercom for Android to [3.0.13](https://github.com/intercom/intercom-android/releases/tag/3.0.13).

## 3.0.17 (2016-11-10)

* Updated Intercom for Android to [3.0.12](https://github.com/intercom/intercom-android/releases/tag/3.0.12).
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ cordova plugin add cordova-plugin-intercom

To add the plugin to your PhoneGap app, add the following to your `config.xml`:
```xml
<plugin name="cordova-plugin-intercom" version="~3.0.17" />
<plugin name="cordova-plugin-intercom" version="~3.0.18" />
```
## Example App

Expand Down
2 changes: 1 addition & 1 deletion circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies:
override:
- npm install -g cordova
- if [ ! -e $ANDROID_HOME/platforms/android-24 ]; then echo y | android update sdk --no-ui --all --filter android-24; fi
- if [ ! -e $ANDROID_HOME/extras/android/m2repository/com/android/support/design/25.0.0 ]; then echo y | android update sdk --no-ui --all --filter extra-android-m2repository; fi
- if [ ! -e $ANDROID_HOME/extras/android/m2repository/com/android/support/design/25.0.1 ]; then echo y | android update sdk --no-ui --all --filter extra-android-m2repository; fi
- if [ ! -e $ANDROID_HOME/extras/google/m2repository/com/google/firebase/firebase-messaging/9.8.0 ]; then echo y | android update sdk --no-ui --all --filter extra-google-m2repository; fi

cache_directories:
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cordova-plugin-intercom",
"version": "3.0.17",
"version": "3.0.18",
"description": "Official Cordova/PhoneGap plugin for Intercom",
"cordova": {
"id": "cordova-plugin-intercom",
Expand Down
2 changes: 1 addition & 1 deletion plugin.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<plugin id="cordova-plugin-intercom" version="3.0.17" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
<plugin id="cordova-plugin-intercom" version="3.0.18" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
<name>Intercom</name>
<author>Intercom</author>
<license>MIT License</license>
Expand Down
2 changes: 1 addition & 1 deletion src/android/IntercomBridge.java
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ private void setUpIntercom() {
try {
Context context = IntercomBridge.this.cordova.getActivity().getApplicationContext();

CordovaHeaderInterceptor.setCordovaVersion(context, "3.0.17");
CordovaHeaderInterceptor.setCordovaVersion(context, "3.0.18");

switch (IntercomPushManager.getInstalledModuleType()) {
case GCM: {
Expand Down
2 changes: 1 addition & 1 deletion src/android/intercom.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ repositories {
}

dependencies {
compile 'io.intercom.android:intercom-sdk:3.0.12'
compile 'io.intercom.android:intercom-sdk:3.0.13'
}
16 changes: 8 additions & 8 deletions src/ios/Intercom.framework/Versions/A/Headers/Intercom.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// Intercom.h
// Intercom for iOS - Version 3.0.18
// Intercom for iOS - Version 3.0.19
//
// Created by Intercom on 8/01/2015.
// Copyright (c) 2014 Intercom. All rights reserved.
Expand All @@ -10,7 +10,7 @@
#import <UIKit/UIKit.h>

#if __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_8_0
#error This version (3.0.18) of Intercom for iOS supports iOS 8.0 upwards.
#error This version (3.0.19) of Intercom for iOS supports iOS 8.0 upwards.
#endif

NS_ASSUME_NONNULL_BEGIN
Expand Down Expand Up @@ -73,7 +73,7 @@ typedef NS_ENUM(NSUInteger, ICMPreviewPosition){
## More information
Full documentation is available [here](https://docs.intercom.io/install-on-your-product-or-site/quick-install/install-intercom-on-your-ios-app) and please contact
Full documentation is available [here](https://developers.intercom.com/docs/ios-installation ) and please contact
us directly via Intercom for any support or questions you may have.
*/
Expand All @@ -98,7 +98,7 @@ typedef NS_ENUM(NSUInteger, ICMPreviewPosition){
Secure Mode helps to make sure that conversations between you and your users are kept private, and that one
user can't impersonate another. In Secure Mode Intercom for iOS will sign all requests going to the Intercom servers
with tokens. It requires your mobile application to have its own server which authenticates the app's users,
and which can store a secret. More information on secure mode can be found [here](http://docs.intercom.io/Install-on-your-mobile-product/enabling-secure-mode-in-intercom-for-ios)
and which can store a secret. More information on secure mode can be found [here](http://docs.intercom.io/Install-on-your-mobile-product/enabling-secure-mode-in-intercom-for-ios )
@note This should be called before any user registration takes place.
@param hmac A HMAC digest of data.
Expand Down Expand Up @@ -174,7 +174,7 @@ typedef NS_ENUM(NSUInteger, ICMPreviewPosition){
relates to customer development, such as price plan, value of purchases, etc. Once these have been sent to
Intercom you can then apply filters based on these attributes.
A detailed list of the fields you can use to [update a user is available here](https://developers.intercom.io/reference/#user-model )
A detailed list of the fields you can use to [update a user is available here](https://developers.intercom.com/reference/#user-model )
Attributes such as the user email or name can be updated by calling
Expand Down Expand Up @@ -205,7 +205,7 @@ typedef NS_ENUM(NSUInteger, ICMPreviewPosition){
]}];
id is a required field for adding or modifying a company. A detailed description of the
[company model is available here](https://developers.intercom.io/reference/#companies-and--users)
[company model is available here](https://developers.intercom.com/reference/#companies )
@param attributes This is a dictionary containing key/value pairs for multiple attributes.
@note Attributes may be either a `string`, `integer`, `double`, `unix timestamp` or `bool`.
Expand All @@ -218,15 +218,15 @@ typedef NS_ENUM(NSUInteger, ICMPreviewPosition){
You can log events in Intercom based on user actions in your app. Events are different
to custom user attributes in that events are information on what Users did and when they
did it, whereas custom user attributes represent the User's current state as seen in their
profile. See details about Events [here](https://developers.intercom.io/reference/#events)
profile. See details about Events [here](https://developers.intercom.com/reference/#events )
@param name The name of the event that it is going to be logged.
*/
+ (void)logEventWithName:(NSString *)name;

/*!
Metadata Objects support a few simple types that Intercom can present on your behalf, see the
[Intercom API docs](https://developers.intercom.io/reference/#event-metadata-types)
[Intercom API docs](https://developers.intercom.com/reference/#event-metadata-types )
[Intercom logEventWithName:@"ordered_item" metaData:@{
@"order_date": @1392036272,
Expand Down
Binary file modified src/ios/Intercom.framework/Versions/A/Intercom
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"error.no_conversations.message.no_app_name" = "لم يتم إجراء أي محادثات بعد";
"facebook.like.us" = "تابعنا على Facebook";
"from.app" = "من {name}";
"error.loading.conversations.fallback" = "تعذر تحميل محادثاتك مع فريق {name}";
"message.placeholder.start.conversation" = "بدء محادثة";
"navigation.back" = "رجوع";
"admin.from.app" = "{name} من {company}";
Expand All @@ -20,7 +19,6 @@
"time.difference.delivered" = "تم تسليمها";
"actionsheet.try.again" = "حاول مرة أخرى";
"alert.new.sdk.user.title" = "تهانينا";
"app_team" = "فريق {name}";
"navbar.title.conversations" = "المحادثات\nمع {name}";
"actionsheet.cancel" = "إلغاء";
"navigation.close" = "إغلاق";
Expand All @@ -37,7 +35,6 @@
"message.seen" = "تمت رؤيتها";
"last_active.format.days.ago" = "نشط منذ {days} ي";
"error.starting.conversation.fallback" = "تعذر بدء محادثة جديدة";
"error.no_conversations.message" = "لم يتم إجراء محادثات مع فريق {name} بعد";
"time.difference.format.days.ago" = "منذ {delta} ي";
"error.loading.conversations.fallback.no_app_name" = "تعذر تحميل محادثاتك";
"we.run.on.intercom" = "يتم إجراء المحادثة من Intercom";
Expand All @@ -46,3 +43,9 @@
"error.tap.to.retry" = "إعادة المحاولة";
"reply_from_admin" = "رد من {name}";
"inbox.you" = "أنت";
"article_question" = "هل هذا يجيب على سؤالك؟";
"article_reaction" = "لقد تفاعلت مع";
"asked_about" = "سأل عن";
"article_load_error" = "تعذر تحميل المقالة";
"error.loading.conversations.fallback" = "تعذر تحميل محادثاتك باستخدام {name}";
"error.no_conversations.message" = "لم يتم إجراء محادثات مع {name} بعد";
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"error.no_conversations.message.no_app_name" = "Все още няма разговори";
"facebook.like.us" = "Харесайте ни във Facebook";
"from.app" = "от {name}";
"error.loading.conversations.fallback" = "Неуспешно зареждане на разговорите с екип {name}";
"message.placeholder.start.conversation" = "Започнете разговор";
"navigation.back" = "Назад";
"admin.from.app" = "{name} от {company}";
Expand All @@ -20,7 +19,6 @@
"time.difference.delivered" = "Доставено";
"actionsheet.try.again" = "Опитайте отново";
"alert.new.sdk.user.title" = "Поздравления";
"app_team" = "{name} Екип";
"navbar.title.conversations" = "Разговори\nс {name}";
"actionsheet.cancel" = "Отказ";
"navigation.close" = "Затваряне";
Expand All @@ -37,7 +35,6 @@
"message.seen" = "Видяно";
"last_active.format.days.ago" = "Активност преди {days}дни";
"error.starting.conversation.fallback" = "Неуспешно започване на нов разговор";
"error.no_conversations.message" = "Все още няма разговори с екип {name}";
"time.difference.format.days.ago" = "преди {delta}дни";
"error.loading.conversations.fallback.no_app_name" = "Неуспешно зареждане на вашите разговори";
"we.run.on.intercom" = "Ние използваме Intercom";
Expand All @@ -46,3 +43,9 @@
"error.tap.to.retry" = "Повторен опит";
"reply_from_admin" = "Отговор от {name}";
"inbox.you" = "Вие";
"article_question" = "Това отговори ли на вашия въпрос?";
"article_reaction" = "Вие реагирахте с";
"asked_about" = "Попитахте за";
"article_load_error" = "Неуспешно зареждане на статията";
"error.loading.conversations.fallback" = "Неуспешно зареждане на разговорите ви с {name}";
"error.no_conversations.message" = "Все още няма разговори с {name}";
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"error.no_conversations.message.no_app_name" = "Još nema razgovora";
"facebook.like.us" = "Lajkujte nas na Facebooku";
"from.app" = "od {name}";
"error.loading.conversations.fallback" = "Ne mogu se učitati vaši razgovori s {name} timom";
"message.placeholder.start.conversation" = "Započni razgovor";
"navigation.back" = "Nazad";
"admin.from.app" = "{name} od {company}";
Expand All @@ -20,7 +19,6 @@
"time.difference.delivered" = "Isporučeno";
"actionsheet.try.again" = "Pokušajte ponovno";
"alert.new.sdk.user.title" = "Čestitamo";
"app_team" = "{name} tim";
"navbar.title.conversations" = "Razgovori\ns {name}";
"actionsheet.cancel" = "Otkaži";
"navigation.close" = "Zatvori";
Expand All @@ -37,7 +35,6 @@
"message.seen" = "Viđeno";
"last_active.format.days.ago" = "Aktivan prije {days} d";
"error.starting.conversation.fallback" = "Ne može se početi novi razgovor";
"error.no_conversations.message" = "Nema još razgovora s {name} timom";
"time.difference.format.days.ago" = "Prije {delta} d";
"error.loading.conversations.fallback.no_app_name" = "Ne mogu se učitati vaši razgovori";
"we.run.on.intercom" = "Radimo na Intercomu";
Expand All @@ -46,3 +43,9 @@
"error.tap.to.retry" = "Pokušaj ponovno";
"reply_from_admin" = "Odgovori sa {name}";
"inbox.you" = "Vi";
"article_question" = "Да ли је ово одговор на Ваше питање?";
"article_reaction" = "Реаговали сте са";
"asked_about" = "Питао о";
"article_load_error" = "Није могао учитати чланак";
"error.loading.conversations.fallback" = "Није могао учитати ваше разговоре са {name}";
"error.no_conversations.message" = "Нема разговора са {name} још увијек.";
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"error.no_conversations.message.no_app_name" = "Cap conversa encara";
"facebook.like.us" = "Fes clic a M’agrada al Facebook";
"from.app" = "de {name}";
"error.loading.conversations.fallback" = "No s’han pogut carregar les converses amb l’equip {name}";
"message.placeholder.start.conversation" = "Inicia una conversa";
"navigation.back" = "Enrere";
"admin.from.app" = "{name} de {company}";
Expand All @@ -20,7 +19,6 @@
"time.difference.delivered" = "Lliurat";
"actionsheet.try.again" = "Torna-ho a provar";
"alert.new.sdk.user.title" = "Felicitats";
"app_team" = "Equip {name}";
"navbar.title.conversations" = "Converses\namb {name}";
"actionsheet.cancel" = "Cancel·la";
"navigation.close" = "Tanca";
Expand All @@ -37,7 +35,6 @@
"message.seen" = "Vist";
"last_active.format.days.ago" = "Actiu fa {days} dia(es)";
"error.starting.conversation.fallback" = "No s’ha pogut iniciar una conversa nova";
"error.no_conversations.message" = "Encara no hi ha cap conversa amb l’equip {name}";
"time.difference.format.days.ago" = "Fa {delta} dia(es)";
"error.loading.conversations.fallback.no_app_name" = "No s’han pogut carregar les converses";
"we.run.on.intercom" = "Utilitzem Intercom";
Expand All @@ -46,3 +43,9 @@
"error.tap.to.retry" = "Torna-ho a provar";
"reply_from_admin" = "Resposta de {name}";
"inbox.you" = "Tu";
"article_question" = "¿Va respondre això a la seva pregunta?";
"article_reaction" = "Ha reaccionat amb";
"asked_about" = "Va preguntar sobre";
"article_load_error" = "No ha estat possible carregar l'article";
"error.loading.conversations.fallback" = "No ha estat possible carregar les seves conversacions amb {name}";
"error.no_conversations.message" = "Encara no hi ha cap conversa amb {name}.";
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"error.no_conversations.message.no_app_name" = "Prozatím žádné konverzace";
"facebook.like.us" = "Lajkněte nás na Facebooku";
"from.app" = "od {name}";
"error.loading.conversations.fallback" = "Nelze načíst vaše konverzace s týmem {name}";
"message.placeholder.start.conversation" = "Zahájit konverzaci";
"navigation.back" = "Zpět";
"admin.from.app" = "{name} od {company}";
Expand All @@ -20,7 +19,6 @@
"time.difference.delivered" = "Doručeno";
"actionsheet.try.again" = "Zkuste to znovu";
"alert.new.sdk.user.title" = "Blahopřejeme";
"app_team" = "Tým {name}";
"navbar.title.conversations" = "Konverzace\ns {name}";
"actionsheet.cancel" = "Zrušit";
"navigation.close" = "Zavřít";
Expand All @@ -37,7 +35,6 @@
"message.seen" = "Je viditelné";
"last_active.format.days.ago" = "Aktivní před {days} dny";
"error.starting.conversation.fallback" = "Nelze začít novou konverzaci";
"error.no_conversations.message" = "Prozatím žádné konverzace s týmem {name}";
"time.difference.format.days.ago" = "Před {delta} dny";
"error.loading.conversations.fallback.no_app_name" = "Nelze načíst vaše konverzace";
"we.run.on.intercom" = "Pracujeme s platformou Intercom";
Expand All @@ -46,3 +43,9 @@
"error.tap.to.retry" = "Zkusit znovu";
"reply_from_admin" = "Odpověď od {name}";
"inbox.you" = "Vy";
"article_question" = "Dostali jste odpověď na svou otázku?";
"article_reaction" = "Reagovali jste pomocí";
"asked_about" = "Ptal/a se na";
"article_load_error" = "Článek nelze načíst";
"error.loading.conversations.fallback" = "Nelze načíst vaši konverzaci s uživatelem {name}";
"error.no_conversations.message" = "S uživatelem {name} ještě nemáte žádnou konverzaci";
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"error.no_conversations.message.no_app_name" = "Endnu ingen samtaler";
"facebook.like.us" = "Synes godt om os på Facebook";
"from.app" = "fra {name}";
"error.loading.conversations.fallback" = "Kunne ikke indlæse dine samtaler med teamet {name}";
"message.placeholder.start.conversation" = "Start en samtale";
"navigation.back" = "Tilbage";
"admin.from.app" = "{name} fra {company}";
Expand All @@ -20,7 +19,6 @@
"time.difference.delivered" = "Leveret";
"actionsheet.try.again" = "Prøv igen";
"alert.new.sdk.user.title" = "Tillykke";
"app_team" = "Team {name}";
"navbar.title.conversations" = "Samtaler\nmed {name}";
"actionsheet.cancel" = "Annuller";
"navigation.close" = "Luk";
Expand All @@ -37,7 +35,6 @@
"message.seen" = "Set";
"last_active.format.days.ago" = "Aktiv for {days}d siden";
"error.starting.conversation.fallback" = "Kunne ikke starte en ny samtale";
"error.no_conversations.message" = "Endnu ingen samtaler med teamet {name}";
"time.difference.format.days.ago" = "{delta}d siden";
"error.loading.conversations.fallback.no_app_name" = "Kunne ikke indlæse dine samtaler";
"we.run.on.intercom" = "Vi kører på Intercom";
Expand All @@ -46,3 +43,9 @@
"error.tap.to.retry" = "Prøv igen";
"reply_from_admin" = "Svar fra {name}";
"inbox.you" = "Du";
"article_question" = "Besvarede dette dit spørgsmål?";
"article_reaction" = "Du reagerede med";
"asked_about" = "Spurgte om";
"article_load_error" = "Artiklen kunne ikke indlæses";
"error.loading.conversations.fallback" = "Dine samtaler med {name} kunne indlæses";
"error.no_conversations.message" = "Endnu ingen samtaler med {name}";
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@
"message.delivered" = "Zugestellt";
"alert.new.sdk.user.button" = "Danke";
"profile.time.location.format" = "{time} in {location}";
"message.state.sending" = "Wird gesendet ...";
"message.state.sending" = "Wird gesendet";
"message.placeholder.write.reply" = "Schreiben Sie eine Antwort";
"twitter.follow.us" = "Folgen Sie uns auf Twitter.";
"alert.new.sdk.user.message" = "Ihre iOS-App ist nun in die Intercom-Plattform integriert.";
"error.title" = "Etwas ist schiefgelaufen";
"error.no_conversations.message.no_app_name" = "Noch keine Unterhaltungen";
"facebook.like.us" = "Liken Sie uns auf Facebook.";
"from.app" = "von {name}";
"error.loading.conversations.fallback" = "Ihre Unterhaltungen mit dem {name} Team konnten nicht geladen werden.";
"message.placeholder.start.conversation" = "Starten Sie eine Unterhaltung";
"navigation.back" = "Zurück";
"admin.from.app" = "{name} von {company}";
Expand All @@ -20,7 +19,6 @@
"time.difference.delivered" = "Zugestellt";
"actionsheet.try.again" = "Versuchen Sie es noch mal.";
"alert.new.sdk.user.title" = "Herzlichen Glückwunsch";
"app_team" = "{name} Team";
"navbar.title.conversations" = "Unterhaltungen\nmit {name}";
"actionsheet.cancel" = "Abbrechen";
"navigation.close" = "Schließen";
Expand All @@ -37,7 +35,6 @@
"message.seen" = "Gesehen";
"last_active.format.days.ago" = "Vor {days} Tag(en) aktiv";
"error.starting.conversation.fallback" = "Neue Unterhaltung konnte nicht gestartet werden.";
"error.no_conversations.message" = "Noch keine Unterhaltungen mit dem {name} Team";
"time.difference.format.days.ago" = "Vor {delta} Tag(en)";
"error.loading.conversations.fallback.no_app_name" = "Ihre Unterhaltungen konnten nicht geladen werden.";
"we.run.on.intercom" = "Wir nutzen Intercom.";
Expand All @@ -46,3 +43,9 @@
"error.tap.to.retry" = "Noch mal versuchen";
"reply_from_admin" = "Antwort von {name}";
"inbox.you" = "Sie";
"article_question" = "Hat dies Ihre Frage beantwortet?";
"article_reaction" = "Sie haben wie folgt reagiert:";
"asked_about" = "Gefragt nach";
"article_load_error" = "Der Artikel konnte nicht geladen werden.";
"error.loading.conversations.fallback" = "Ihre Unterhaltungen mit {name} konnten nicht geladen werden.";
"error.no_conversations.message" = "Noch keine Unterhaltungen mit {name}";
Loading

0 comments on commit 691f3b8

Please sign in to comment.