From 30726c41cea20fb6a8d6dce8bfb64a6966025871 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sat, 25 Nov 2017 11:33:21 -0500 Subject: #562 next version of zmNinja will need new Event Server too --- www/js/EventServer.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'www/js/EventServer.js') diff --git a/www/js/EventServer.js b/www/js/EventServer.js index b0d0c83f..ce5ef044 100644 --- a/www/js/EventServer.js +++ b/www/js/EventServer.js @@ -392,10 +392,12 @@ angular.module('zmApp.controllers') { "ios": { - "alert": true, - "badge": true, + "alert": "true", + "badge": "true", "sound": ld.soundOnPush, - "clearBadge": true + //"sound": "true", + "clearBadge": "true", + // "fcmSandbox": true } } @@ -412,9 +414,9 @@ angular.module('zmApp.controllers') { "android": { - "senderID": zm.gcmSenderId, + // "senderID": zm.gcmSenderId, "icon": "ic_stat_notification", - sound: ld.soundOnPush, + sound: "true", vibrate: ld.vibrateOnPush //"sound": android_media_file } -- cgit v1.2.3 From 9e0a713cd48e9724613d1c25d3824bed64207aa9 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sun, 26 Nov 2017 10:50:30 -0500 Subject: spacing to upgrade message --- www/js/EventServer.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'www/js/EventServer.js') diff --git a/www/js/EventServer.js b/www/js/EventServer.js index ce5ef044..c07a3e06 100644 --- a/www/js/EventServer.js +++ b/www/js/EventServer.js @@ -166,7 +166,7 @@ angular.module('zmApp.controllers') $rootScope.zmPopup = $ionicPopup.alert( { title: $translate.instant('kEventServerVersionTitle'), - template: $translate.instant('kEventServerVersionBody1') + " " + str.version + ". " + $translate.instant('kEventServerVersionBody2') + + template: $translate.instant('kEventServerVersionBody1') + " " + str.version + ". " + $translate.instant('kEventServerVersionBody2') + " "+ zm.minEventServerVersion, okText: $translate.instant('kButtonOk'), cancelText: $translate.instant('kButtonCancel'), @@ -397,7 +397,7 @@ angular.module('zmApp.controllers') "sound": ld.soundOnPush, //"sound": "true", "clearBadge": "true", - // "fcmSandbox": true + //"fcmSandbox": "true" } } -- cgit v1.2.3