Merge branch 'master' into next

Author: ar2rsawseen

api/lib/countly.common.js

@@ -105,7 +105,7 @@ function getPeriodObject() {
         }
         catch (SyntaxError) {
             console.log("period JSON parse failed");
-            _period = "month";
+            _period = "30days";
         }
     }
 
@@ -1858,7 +1858,7 @@ countlyCommon.decode = function(str) {
 * @param {(string|string[]|number[])} defaultPeriod - default period value in case it's not supplied in the params
 * @returns {module:api/lib/countly.common.periodObj} period object
 */
-countlyCommon.getPeriodObj = function(params, defaultPeriod = "month") {
+countlyCommon.getPeriodObj = function(params, defaultPeriod = "30days") {
     let appTimezone = params.appTimezone || (params.app && params.app.timezone);
 
     params.qstring.period = params.qstring.period || defaultPeriod;

bin/docker/postinstall.sh

@@ -28,6 +28,6 @@ else
 	  fi
 	done <<< "$a"
 
-	(cd /opt/countly && npx grunt dist-all && npm prune --production && npm cache clean --force)
+	(cd /opt/countly && npx grunt dist-all)
 
 fi

frontend/express/public/javascripts/countly/countly.views.js

@@ -4211,6 +4211,7 @@ window.EventsBlueprintView = countlyView.extend({
             countlyEvent.setActiveEvent(previousEvent);
         }
         this.template = Handlebars.compile($("#template-events-blueprint").html());
+        this.textLimit = 100;
     },
     pageScript: function() {
         var self = this;
@@ -4400,6 +4401,10 @@ window.EventsBlueprintView = countlyView.extend({
                     if (eventName === "") {
                         eventName = event;
                     }
+
+                    if (eventName.length > self.textLimit) {
+                        eventName = eventName.substr(0, self.textLimit) + "...";
+                    }
                     CountlyHelpers.confirm(jQuery.i18n.prop("events.general.want-delete-this", "<b>" + eventName + "</b>"), "popStyleGreen", function(result) {
                         if (!result) {
                             return true;
@@ -4623,8 +4628,15 @@ window.EventsBlueprintView = countlyView.extend({
                         else if (selected === "delete") {
                             var title = jQuery.i18n.map["events.general.want-delete-title"];
                             var msg = jQuery.i18n.prop("events.general.want-delete", "<b>" + nameList.join(", ") + "</b>");
+                            if (nameList.join(", ").length > self.textLimit) {
+                                var mz = jQuery.i18n.prop("events.delete.multiple-events", nameList.length);
+                                msg = jQuery.i18n.prop("events.general.want-delete", "<b>" + mz + "</b>");
+                            }
                             var yes_but = jQuery.i18n.map["events.general.yes-delete-events"];
                             if (changeList.length === 1) {
+                                if (nameList[0].length > self.textLimit) {
+                                    nameList[0] = nameList[0].substr(0, self.textLimit) + "...";
+                                }
                                 msg = jQuery.i18n.prop("events.general.want-delete-this", "<b>" + nameList.join(", ") + "</b>");
                                 title = jQuery.i18n.map["events.general.want-delete-this-title"];
                                 yes_but = jQuery.i18n.map["events.general.yes-delete-event"];

frontend/express/public/localization/dashboard/dashboard.properties

@@ -442,6 +442,7 @@ events.edit.display-duration-description = A display name for the optional durat
 events.no-event = There are no events tracked for this application\!
 events.delete-confirm = You are about to delete all data associated with event "{0}". Do you want to continue?
 events.delete-confirm-many = You are about to delete all data associated with these events. Do you want to continue?
+events.delete.multiple-events = {0} events
 events.edit.omit-event-segments = Omit event segments
 events.edit.omit-event-segments-description = Choose which segments of this custom event to omit. Omitted segments will not be saved in the future and past data for these segments will be purged immediately after you save these settings.
 events.edit.omit-event-segments-description-drill = Data for these segments will still be stored in Drill.
@@ -585,8 +586,8 @@ management-users.create-user = Create User
 management-users.delete-user = Delete User
 management-users.edit = Click to edit
 management-users.close = Click to close
-management-users.password-change-confirm = You have changed {0}\\''s password. Do you want a notification email to be sent?
-management-users.delete-confirm = You are about to delete {0}\\''s account. Do you want to continue?
+management-users.password-change-confirm = You have changed {0}\''s password. Do you want a notification email to be sent?
+management-users.delete-confirm = You are about to delete {0}\''s account. Do you want to continue?
 management-users.delete-confirm-title = Delete user?
 management-users.yes-delete-user  = Yes, delete user
 management-users.email.invalid = invalid email

plugins/populator/frontend/public/javascripts/countly.models.js

@@ -527,8 +527,8 @@
 
             this.ts += 1000;
 
-            if (eventTemplate && eventTemplate.dur) {
-                event.dur = getRandomInt(eventTemplate.dur[0], eventTemplate.dur[1] || 10);
+            if (eventTemplate && eventTemplate.duration) {
+                event.dur = getRandomInt(eventTemplate.duration[0], eventTemplate.duration[1] || 10);
             }
             else if (id === "[CLY]_view") {
                 event.dur = getRandomInt(0, 100);

plugins/populator/frontend/public/stylesheets/banking.css renamed to plugins/populator/frontend/public/stylesheets/demo/banking.css

@@ -2,7 +2,7 @@
     <head>
         <title>Countly Banking - Heatmap Demo</title>
         <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
-        <link rel="stylesheet" href="/populator/stylesheets/banking.css">
+        <link rel="stylesheet" href="/populator/stylesheets/demo/banking.css">
     </head>
     <body>
       <div class="container demo-banking">

plugins/populator/frontend/public/stylesheets/ecommerce.css renamed to plugins/populator/frontend/public/stylesheets/demo/ecommerce.css

@@ -2,7 +2,7 @@
     <head>
         <title>Countly E-Commerce - Heatmap Demo</title>
         <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
-        <link rel="stylesheet" href="/populator/stylesheets/ecommerce.css">
+        <link rel="stylesheet" href="/populator/stylesheets/demo/ecommerce.css">
     </head>
     <body>
       <div class="container">

plugins/populator/frontend/public/stylesheets/gaming.css renamed to plugins/populator/frontend/public/stylesheets/demo/gaming.css

@@ -2,7 +2,7 @@
     <head>
         <title>Countly Gaming - Heatmap Demo</title>
         <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
-        <link rel="stylesheet" href="/populator/stylesheets/gaming.css">
+        <link rel="stylesheet" href="/populator/stylesheets/demo/gaming.css">
     </head>
     <body>
       <div class="container demo-gaming">

plugins/populator/frontend/public/stylesheets/healthcare.css renamed to plugins/populator/frontend/public/stylesheets/demo/healthcare.css

@@ -2,7 +2,7 @@
     <head>
         <title>Countly Healthcare - Heatmap Demo</title>
         <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
-        <link rel="stylesheet" href="/populator/stylesheets/healthcare.css">
+        <link rel="stylesheet" href="/populator/stylesheets/demo/healthcare.css">
     </head>
     <body>
       <div class="container demo-healthcare">

plugins/populator/frontend/public/stylesheets/navigation.css renamed to plugins/populator/frontend/public/stylesheets/demo/navigation.css

@@ -2,7 +2,7 @@
     <head>
         <title>Countly Navigation - Heatmap Demo</title>
         <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
-        <link rel="stylesheet" href="/populator/stylesheets/navigation.css">
+        <link rel="stylesheet" href="/populator/stylesheets/demo/navigation.css">
     </head>
     <body>
       <div class="container demo-navigation">

plugins/populator/frontend/public/templates/demo-banking.html

@@ -1014,6 +1014,8 @@ input:disabled + label {
     color: #636363;
     font-size: 12px;
     position: relative;
+}
+.comp-push-view-row > .col-right .col-right {
     overflow: scroll;
 }
 
@@ -2030,17 +2032,21 @@ span.emoji-inner {
 .comp-checkbox input[type="checkbox"] { margin: 0; }
 .comp-checkbox input[type="checkbox"] + label { margin: 0 0 0 10px; vertical-align: bottom; }
 .comp-checkbox > .comp-view { position: relative; }
-// .comp-checkbox > .comp-view > i { position: absolute; top: 9px; left: 8px; font-size: 14px; z-index: 2; }
-// .comp-checkbox > .comp-view > i.ion-chevron-down { top: 7px; right: 8px; left: auto; }
-// .comp-checkbox > .comp-view > i.ion-chevron-down:before { font-size: 9px; }
+/* 
+.comp-checkbox > .comp-view > i { position: absolute; top: 9px; left: 8px; font-size: 14px; z-index: 2; }
+.comp-checkbox > .comp-view > i.ion-chevron-down { top: 7px; right: 8px; left: auto; }
+.comp-checkbox > .comp-view > i.ion-chevron-down:before { font-size: 9px; }
+*/
 .comp-checkbox .time-select .cly-select .select-items-component .item { text-align: right; padding-right: 25px; }
 .comp-checkbox .time-select .cly-select .default-text { text-align: right; }
 .comp-grid.comp-unpadded .comp-grid-cell:last-child{ padding: 0; height: 33px; }
 .comp-grid.comp-unpadded .comp-grid-cell:last-child .comp-datepicker { padding: 8px; }
 
 .comp-push .cly-multi-select .text { padding: 4px 6px; }
 .comp-push .cly-multi-select .text .default-text { padding: 5px 3px; }
-// .comp-push .cly-multi-select  .selection { margin-top: 0; margin-bottom: 0; }
+/* 
+.comp-push .cly-multi-select  .selection { margin-top: 0; margin-bottom: 0; }
+*/
 .comp-push .desc .warn { margin-left: 5px; }
 
 .comp-push .big-numbers-v2 { padding-top: 0; }

plugins/populator/frontend/public/templates/demo-ecommerce.html

@@ -1,4 +1,4 @@
-/* global app, T, countlyGlobal, countlyCommon, CountlyHelpers, $ */
+/* global app, T, countlyGlobal, CountlyHelpers, $ */
 
 $(document).ready(function() {
     // if configuration view exists
@@ -96,7 +96,7 @@ app.addPageScript("/manage/user-settings", function() {
     var member = countlyGlobal.member,
         templateData = {
             "secret_token": countlyGlobal["2fa_secret_token"],
-            "qrcode_html": countlyCommon.decodeHtml(countlyGlobal["2fa_qrcode_html"])
+            "qrcode_html": $('<div>').html(countlyGlobal["2fa_qrcode_html"]).text()
         };
 
     $('.account-settings').find('.d-table').first().append(