Merge branch 'next' into rc-command

Author: widatama

frontend/express/public/javascripts/countly/vue/components/input.js

@@ -28,10 +28,13 @@
             },
             localValue: {
                 get: function() {
-                    return this.value.replace("#", "");
+                    var rawValue = this.value || this.resetValue;
+
+                    return rawValue.replace("#", "");
                 },
                 set: function(value) {
                     var colorValue = "#" + value.replace("#", "");
+
                     if (colorValue.match(HEX_COLOR_REGEX)) {
                         this.setColor({hex: colorValue});
                     }
@@ -43,10 +46,13 @@
         },
         methods: {
             setColor: function(color) {
-                this.$emit("input", color.hex8);
+                var finalColor = color.hex8 || color.hex;
+
+                this.$emit("input", finalColor);
             },
             reset: function() {
                 this.setColor({hex: this.resetValue});
+                this.close();
             },
             open: function() {
                 this.isOpened = true;

plugins/push/frontend/public/localization/push.properties

@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
 push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
 push-notification.actions-performed-serie-name = Actions Performed
 push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
-push-notification.table-notification-name = Notificaton name
+push-notification.table-notification-name = Notification name
 push-notification.table-status = Status
 push-notification.table-created = Created
 push-notification.table-date-sent = Date Sent/Scheduled

plugins/push/frontend/public/localization/push_ar.properties

@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
 push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
 push-notification.actions-performed-serie-name = Actions Performed
 push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
-push-notification.table-notification-name = Notificaton name
+push-notification.table-notification-name = Notification name
 push-notification.table-status = Status
 push-notification.table-created = Created
 push-notification.table-date-sent = Date Sent/Scheduled

plugins/push/frontend/public/localization/push_bg.properties

@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
 push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
 push-notification.actions-performed-serie-name = Actions Performed
 push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
-push-notification.table-notification-name = Notificaton name
+push-notification.table-notification-name = Notification name
 push-notification.table-status = Status
 push-notification.table-created = Created
 push-notification.table-date-sent = Date Sent/Scheduled

plugins/push/frontend/public/localization/push_ca.properties

@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
 push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
 push-notification.actions-performed-serie-name = Actions Performed
 push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
-push-notification.table-notification-name = Notificaton name
+push-notification.table-notification-name = Notification name
 push-notification.table-status = Status
 push-notification.table-created = Created
 push-notification.table-date-sent = Date Sent/Scheduled

plugins/push/frontend/public/localization/push_de.properties

@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
 push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
 push-notification.actions-performed-serie-name = Actions Performed
 push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
-push-notification.table-notification-name = Notificaton name
+push-notification.table-notification-name = Notification name
 push-notification.table-status = Status
 push-notification.table-created = Created
 push-notification.table-date-sent = Date Sent/Scheduled

plugins/push/frontend/public/localization/push_de_DE.properties

@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
 push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
 push-notification.actions-performed-serie-name = Actions Performed
 push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
-push-notification.table-notification-name = Notificaton name
+push-notification.table-notification-name = Notification name
 push-notification.table-status = Status
 push-notification.table-created = Created
 push-notification.table-date-sent = Date Sent/Scheduled

plugins/push/frontend/public/localization/push_el.properties

@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
 push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
 push-notification.actions-performed-serie-name = Actions Performed
 push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
-push-notification.table-notification-name = Notificaton name
+push-notification.table-notification-name = Notification name
 push-notification.table-status = Status
 push-notification.table-created = Created
 push-notification.table-date-sent = Date Sent/Scheduled

plugins/push/frontend/public/localization/push_es.properties

@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
 push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
 push-notification.actions-performed-serie-name = Actions Performed
 push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
-push-notification.table-notification-name = Notificaton name
+push-notification.table-notification-name = Notification name
 push-notification.table-status = Status
 push-notification.table-created = Created
 push-notification.table-date-sent = Date Sent/Scheduled

plugins/push/frontend/public/localization/push_et.properties

@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
 push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
 push-notification.actions-performed-serie-name = Actions Performed
 push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
-push-notification.table-notification-name = Notificaton name
+push-notification.table-notification-name = Notification name
 push-notification.table-status = Status
 push-notification.table-created = Created
 push-notification.table-date-sent = Date Sent/Scheduled

plugins/push/frontend/public/localization/push_fa_IR.properties

@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
 push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
 push-notification.actions-performed-serie-name = Actions Performed
 push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
-push-notification.table-notification-name = Notificaton name
+push-notification.table-notification-name = Notification name
 push-notification.table-status = Status
 push-notification.table-created = Created
 push-notification.table-date-sent = Date Sent/Scheduled

plugins/push/frontend/public/localization/push_fr.properties

@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
 push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
 push-notification.actions-performed-serie-name = Actions Performed
 push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
-push-notification.table-notification-name = Notificaton name
+push-notification.table-notification-name = Notification name
 push-notification.table-status = Status
 push-notification.table-created = Created
 push-notification.table-date-sent = Date Sent/Scheduled

plugins/push/frontend/public/localization/push_hu.properties

@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
 push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
 push-notification.actions-performed-serie-name = Actions Performed
 push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
-push-notification.table-notification-name = Notificaton name
+push-notification.table-notification-name = Notification name
 push-notification.table-status = Status
 push-notification.table-created = Created
 push-notification.table-date-sent = Date Sent/Scheduled

plugins/push/frontend/public/localization/push_it.properties

@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
 push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
 push-notification.actions-performed-serie-name = Actions Performed
 push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
-push-notification.table-notification-name = Notificaton name
+push-notification.table-notification-name = Notification name
 push-notification.table-status = Status
 push-notification.table-created = Created
 push-notification.table-date-sent = Date Sent/Scheduled

plugins/push/frontend/public/localization/push_ja.properties

@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
 push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
 push-notification.actions-performed-serie-name = Actions Performed
 push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
-push-notification.table-notification-name = Notificaton name
+push-notification.table-notification-name = Notification name
 push-notification.table-status = Status
 push-notification.table-created = Created
 push-notification.table-date-sent = Date Sent/Scheduled

plugins/push/frontend/public/localization/push_ko.properties

@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
 push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
 push-notification.actions-performed-serie-name = Actions Performed
 push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
-push-notification.table-notification-name = Notificaton name
+push-notification.table-notification-name = Notification name
 push-notification.table-status = Status
 push-notification.table-created = Created
 push-notification.table-date-sent = Date Sent/Scheduled

plugins/push/frontend/public/localization/push_ko_KR.properties

@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
 push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
 push-notification.actions-performed-serie-name = Actions Performed
 push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
-push-notification.table-notification-name = Notificaton name
+push-notification.table-notification-name = Notification name
 push-notification.table-status = Status
 push-notification.table-created = Created
 push-notification.table-date-sent = Date Sent/Scheduled

plugins/push/frontend/public/localization/push_lv_LV.properties

@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
 push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
 push-notification.actions-performed-serie-name = Actions Performed
 push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
-push-notification.table-notification-name = Notificaton name
+push-notification.table-notification-name = Notification name
 push-notification.table-status = Status
 push-notification.table-created = Created
 push-notification.table-date-sent = Date Sent/Scheduled

plugins/push/frontend/public/localization/push_nb_NO.properties

@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
 push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
 push-notification.actions-performed-serie-name = Actions Performed
 push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
-push-notification.table-notification-name = Notificaton name
+push-notification.table-notification-name = Notification name
 push-notification.table-status = Status
 push-notification.table-created = Created
 push-notification.table-date-sent = Date Sent/Scheduled

plugins/push/frontend/public/localization/push_nl_NL.properties

@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
 push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
 push-notification.actions-performed-serie-name = Actions Performed
 push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
-push-notification.table-notification-name = Notificaton name
+push-notification.table-notification-name = Notification name
 push-notification.table-status = Status
 push-notification.table-created = Created
 push-notification.table-date-sent = Date Sent/Scheduled

plugins/push/frontend/public/localization/push_pl_PL.properties

@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
 push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
 push-notification.actions-performed-serie-name = Actions Performed
 push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
-push-notification.table-notification-name = Notificaton name
+push-notification.table-notification-name = Notification name
 push-notification.table-status = Status
 push-notification.table-created = Created
 push-notification.table-date-sent = Date Sent/Scheduled

plugins/push/frontend/public/localization/push_pt_BR.properties

@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
 push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
 push-notification.actions-performed-serie-name = Actions Performed
 push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
-push-notification.table-notification-name = Notificaton name
+push-notification.table-notification-name = Notification name
 push-notification.table-status = Status
 push-notification.table-created = Created
 push-notification.table-date-sent = Date Sent/Scheduled

plugins/push/frontend/public/localization/push_ro.properties

@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
 push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
 push-notification.actions-performed-serie-name = Actions Performed
 push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
-push-notification.table-notification-name = Notificaton name
+push-notification.table-notification-name = Notification name
 push-notification.table-status = Status
 push-notification.table-created = Created
 push-notification.table-date-sent = Date Sent/Scheduled

plugins/push/frontend/public/localization/push_ru.properties

@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
 push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
 push-notification.actions-performed-serie-name = Actions Performed
 push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
-push-notification.table-notification-name = Notificaton name
+push-notification.table-notification-name = Notification name
 push-notification.table-status = Status
 push-notification.table-created = Created
 push-notification.table-date-sent = Date Sent/Scheduled

plugins/push/frontend/public/localization/push_sv.properties

@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
 push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
 push-notification.actions-performed-serie-name = Actions Performed
 push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
-push-notification.table-notification-name = Notificaton name
+push-notification.table-notification-name = Notification name
 push-notification.table-status = Status
 push-notification.table-created = Created
 push-notification.table-date-sent = Date Sent/Scheduled

plugins/push/frontend/public/localization/push_tr.properties

@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
 push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
 push-notification.actions-performed-serie-name = Actions Performed
 push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
-push-notification.table-notification-name = Notificaton name
+push-notification.table-notification-name = Notification name
 push-notification.table-status = Status
 push-notification.table-created = Created
 push-notification.table-date-sent = Date Sent/Scheduled

plugins/push/frontend/public/localization/push_uk.properties

@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
 push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
 push-notification.actions-performed-serie-name = Actions Performed
 push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
-push-notification.table-notification-name = Notificaton name
+push-notification.table-notification-name = Notification name
 push-notification.table-status = Status
 push-notification.table-created = Created
 push-notification.table-date-sent = Date Sent/Scheduled

plugins/push/frontend/public/localization/push_vi.properties

@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
 push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
 push-notification.actions-performed-serie-name = Actions Performed
 push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
-push-notification.table-notification-name = Notificaton name
+push-notification.table-notification-name = Notification name
 push-notification.table-status = Status
 push-notification.table-created = Created
 push-notification.table-date-sent = Date Sent/Scheduled

plugins/push/frontend/public/localization/push_zh_CN.properties

@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
 push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
 push-notification.actions-performed-serie-name = Actions Performed
 push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
-push-notification.table-notification-name = Notificaton name
+push-notification.table-notification-name = Notification name
 push-notification.table-status = Status
 push-notification.table-created = Created
 push-notification.table-date-sent = Date Sent/Scheduled