Skip to content

Commit 4f0d559

Browse files
authored
Merge branch 'next' into rc-command
2 parents 525355c + 6e8ff1d commit 4f0d559

33 files changed

+183
-89
lines changed

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

+8-2
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,13 @@
2828
},
2929
localValue: {
3030
get: function() {
31-
return this.value.replace("#", "");
31+
var rawValue = this.value || this.resetValue;
32+
33+
return rawValue.replace("#", "");
3234
},
3335
set: function(value) {
3436
var colorValue = "#" + value.replace("#", "");
37+
3538
if (colorValue.match(HEX_COLOR_REGEX)) {
3639
this.setColor({hex: colorValue});
3740
}
@@ -43,10 +46,13 @@
4346
},
4447
methods: {
4548
setColor: function(color) {
46-
this.$emit("input", color.hex8);
49+
var finalColor = color.hex8 || color.hex;
50+
51+
this.$emit("input", finalColor);
4752
},
4853
reset: function() {
4954
this.setColor({hex: this.resetValue});
55+
this.close();
5056
},
5157
open: function() {
5258
this.isOpened = true;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
2222
push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
2323
push-notification.actions-performed-serie-name = Actions Performed
2424
push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
25-
push-notification.table-notification-name = Notificaton name
25+
push-notification.table-notification-name = Notification name
2626
push-notification.table-status = Status
2727
push-notification.table-created = Created
2828
push-notification.table-date-sent = Date Sent/Scheduled

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
2222
push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
2323
push-notification.actions-performed-serie-name = Actions Performed
2424
push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
25-
push-notification.table-notification-name = Notificaton name
25+
push-notification.table-notification-name = Notification name
2626
push-notification.table-status = Status
2727
push-notification.table-created = Created
2828
push-notification.table-date-sent = Date Sent/Scheduled

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
2222
push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
2323
push-notification.actions-performed-serie-name = Actions Performed
2424
push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
25-
push-notification.table-notification-name = Notificaton name
25+
push-notification.table-notification-name = Notification name
2626
push-notification.table-status = Status
2727
push-notification.table-created = Created
2828
push-notification.table-date-sent = Date Sent/Scheduled

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
2222
push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
2323
push-notification.actions-performed-serie-name = Actions Performed
2424
push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
25-
push-notification.table-notification-name = Notificaton name
25+
push-notification.table-notification-name = Notification name
2626
push-notification.table-status = Status
2727
push-notification.table-created = Created
2828
push-notification.table-date-sent = Date Sent/Scheduled

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
2222
push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
2323
push-notification.actions-performed-serie-name = Actions Performed
2424
push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
25-
push-notification.table-notification-name = Notificaton name
25+
push-notification.table-notification-name = Notification name
2626
push-notification.table-status = Status
2727
push-notification.table-created = Created
2828
push-notification.table-date-sent = Date Sent/Scheduled

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
2222
push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
2323
push-notification.actions-performed-serie-name = Actions Performed
2424
push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
25-
push-notification.table-notification-name = Notificaton name
25+
push-notification.table-notification-name = Notification name
2626
push-notification.table-status = Status
2727
push-notification.table-created = Created
2828
push-notification.table-date-sent = Date Sent/Scheduled

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
2222
push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
2323
push-notification.actions-performed-serie-name = Actions Performed
2424
push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
25-
push-notification.table-notification-name = Notificaton name
25+
push-notification.table-notification-name = Notification name
2626
push-notification.table-status = Status
2727
push-notification.table-created = Created
2828
push-notification.table-date-sent = Date Sent/Scheduled

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
2222
push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
2323
push-notification.actions-performed-serie-name = Actions Performed
2424
push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
25-
push-notification.table-notification-name = Notificaton name
25+
push-notification.table-notification-name = Notification name
2626
push-notification.table-status = Status
2727
push-notification.table-created = Created
2828
push-notification.table-date-sent = Date Sent/Scheduled

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
2222
push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
2323
push-notification.actions-performed-serie-name = Actions Performed
2424
push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
25-
push-notification.table-notification-name = Notificaton name
25+
push-notification.table-notification-name = Notification name
2626
push-notification.table-status = Status
2727
push-notification.table-created = Created
2828
push-notification.table-date-sent = Date Sent/Scheduled

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
2222
push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
2323
push-notification.actions-performed-serie-name = Actions Performed
2424
push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
25-
push-notification.table-notification-name = Notificaton name
25+
push-notification.table-notification-name = Notification name
2626
push-notification.table-status = Status
2727
push-notification.table-created = Created
2828
push-notification.table-date-sent = Date Sent/Scheduled

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
2222
push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
2323
push-notification.actions-performed-serie-name = Actions Performed
2424
push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
25-
push-notification.table-notification-name = Notificaton name
25+
push-notification.table-notification-name = Notification name
2626
push-notification.table-status = Status
2727
push-notification.table-created = Created
2828
push-notification.table-date-sent = Date Sent/Scheduled

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
2222
push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
2323
push-notification.actions-performed-serie-name = Actions Performed
2424
push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
25-
push-notification.table-notification-name = Notificaton name
25+
push-notification.table-notification-name = Notification name
2626
push-notification.table-status = Status
2727
push-notification.table-created = Created
2828
push-notification.table-date-sent = Date Sent/Scheduled

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
2222
push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
2323
push-notification.actions-performed-serie-name = Actions Performed
2424
push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
25-
push-notification.table-notification-name = Notificaton name
25+
push-notification.table-notification-name = Notification name
2626
push-notification.table-status = Status
2727
push-notification.table-created = Created
2828
push-notification.table-date-sent = Date Sent/Scheduled

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
2222
push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
2323
push-notification.actions-performed-serie-name = Actions Performed
2424
push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
25-
push-notification.table-notification-name = Notificaton name
25+
push-notification.table-notification-name = Notification name
2626
push-notification.table-status = Status
2727
push-notification.table-created = Created
2828
push-notification.table-date-sent = Date Sent/Scheduled

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
2222
push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
2323
push-notification.actions-performed-serie-name = Actions Performed
2424
push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
25-
push-notification.table-notification-name = Notificaton name
25+
push-notification.table-notification-name = Notification name
2626
push-notification.table-status = Status
2727
push-notification.table-created = Created
2828
push-notification.table-date-sent = Date Sent/Scheduled

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
2222
push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
2323
push-notification.actions-performed-serie-name = Actions Performed
2424
push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
25-
push-notification.table-notification-name = Notificaton name
25+
push-notification.table-notification-name = Notification name
2626
push-notification.table-status = Status
2727
push-notification.table-created = Created
2828
push-notification.table-date-sent = Date Sent/Scheduled

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
2222
push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
2323
push-notification.actions-performed-serie-name = Actions Performed
2424
push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
25-
push-notification.table-notification-name = Notificaton name
25+
push-notification.table-notification-name = Notification name
2626
push-notification.table-status = Status
2727
push-notification.table-created = Created
2828
push-notification.table-date-sent = Date Sent/Scheduled

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
2222
push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
2323
push-notification.actions-performed-serie-name = Actions Performed
2424
push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
25-
push-notification.table-notification-name = Notificaton name
25+
push-notification.table-notification-name = Notification name
2626
push-notification.table-status = Status
2727
push-notification.table-created = Created
2828
push-notification.table-date-sent = Date Sent/Scheduled

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
2222
push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
2323
push-notification.actions-performed-serie-name = Actions Performed
2424
push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
25-
push-notification.table-notification-name = Notificaton name
25+
push-notification.table-notification-name = Notification name
2626
push-notification.table-status = Status
2727
push-notification.table-created = Created
2828
push-notification.table-date-sent = Date Sent/Scheduled

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
2222
push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
2323
push-notification.actions-performed-serie-name = Actions Performed
2424
push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
25-
push-notification.table-notification-name = Notificaton name
25+
push-notification.table-notification-name = Notification name
2626
push-notification.table-status = Status
2727
push-notification.table-created = Created
2828
push-notification.table-date-sent = Date Sent/Scheduled

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
2222
push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
2323
push-notification.actions-performed-serie-name = Actions Performed
2424
push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
25-
push-notification.table-notification-name = Notificaton name
25+
push-notification.table-notification-name = Notification name
2626
push-notification.table-status = Status
2727
push-notification.table-created = Created
2828
push-notification.table-date-sent = Date Sent/Scheduled

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
2222
push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
2323
push-notification.actions-performed-serie-name = Actions Performed
2424
push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
25-
push-notification.table-notification-name = Notificaton name
25+
push-notification.table-notification-name = Notification name
2626
push-notification.table-status = Status
2727
push-notification.table-created = Created
2828
push-notification.table-date-sent = Date Sent/Scheduled

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
2222
push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
2323
push-notification.actions-performed-serie-name = Actions Performed
2424
push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
25-
push-notification.table-notification-name = Notificaton name
25+
push-notification.table-notification-name = Notification name
2626
push-notification.table-status = Status
2727
push-notification.table-created = Created
2828
push-notification.table-date-sent = Date Sent/Scheduled

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
2222
push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
2323
push-notification.actions-performed-serie-name = Actions Performed
2424
push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
25-
push-notification.table-notification-name = Notificaton name
25+
push-notification.table-notification-name = Notification name
2626
push-notification.table-status = Status
2727
push-notification.table-created = Created
2828
push-notification.table-date-sent = Date Sent/Scheduled

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
2222
push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
2323
push-notification.actions-performed-serie-name = Actions Performed
2424
push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
25-
push-notification.table-notification-name = Notificaton name
25+
push-notification.table-notification-name = Notification name
2626
push-notification.table-status = Status
2727
push-notification.table-created = Created
2828
push-notification.table-date-sent = Date Sent/Scheduled

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
2222
push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
2323
push-notification.actions-performed-serie-name = Actions Performed
2424
push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
25-
push-notification.table-notification-name = Notificaton name
25+
push-notification.table-notification-name = Notification name
2626
push-notification.table-status = Status
2727
push-notification.table-created = Created
2828
push-notification.table-date-sent = Date Sent/Scheduled

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
2222
push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
2323
push-notification.actions-performed-serie-name = Actions Performed
2424
push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
25-
push-notification.table-notification-name = Notificaton name
25+
push-notification.table-notification-name = Notification name
2626
push-notification.table-status = Status
2727
push-notification.table-created = Created
2828
push-notification.table-date-sent = Date Sent/Scheduled

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ push-notification.sent-serie-name = Notifications Sent
2222
push-notification.sent-serie-description = Total number of notifications sent in the selected time period.
2323
push-notification.actions-performed-serie-name = Actions Performed
2424
push-notification.actions-performed-serie-description = Total number of actions performed by users in response to notifications sent, in the selected time period.
25-
push-notification.table-notification-name = Notificaton name
25+
push-notification.table-notification-name = Notification name
2626
push-notification.table-status = Status
2727
push-notification.table-created = Created
2828
push-notification.table-date-sent = Date Sent/Scheduled

0 commit comments

Comments
 (0)