Merge branch 'master' into ab-testing-result

Author: ar2rsawseen

CHANGELOG.md

@@ -7,6 +7,7 @@ Enterprise Fixes:
     - Do not calculate result for completed experiments
 
 Dependencies:
+- Bump nodemailer from 6.10.1 to 7.0.3
 - Bump puppeteer from 24.8.0 to 24.8.2
 - Bump sass from 1.87.0 to 1.88.0
 - Bump semver from 7.7.1 to 7.7.2

frontend/express/public/javascripts/countly/vue/templates/sidebar/sidebar.html

@@ -45,7 +45,6 @@
             <div v-if="isCommunityEdition" class="cly-vue-sidebar__version" data-test-id="sidebar-menu-version">
                 <div class="cly-vue-sidebar__version__banner">
                     <div class="text">{{i18n('sidebar.banner.text')}}</div>
-                    <div class="text bu-has-text-weight-medium">{{i18n('sidebar.banner.upgrade')}}</div>
                     <el-button class="button" type="success" @click="handleButtonClick">{{i18n('sidebar.banner.upgrade-button')}}</el-button>
                 </div>
             </div>

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

@@ -440,9 +440,8 @@ sidebar.dashboard-tooltip = Dashboards
 sidebar.main-menu = Main Menu
 sidebar.my-profile = My Profile
 sidebar.copy-api-key-success-message = Api Key has been copied to clipboard!
-sidebar.banner.text = You are using a free plan.
-sidebar.banner.upgrade = Upgrade and get more.
-sidebar.banner.upgrade-button = Manage your plan
+sidebar.banner.text = Countly’s self-service product analytics offering.
+sidebar.banner.upgrade-button = Create a free server
 
 #dashboard
 dashboard.apply = Apply
@@ -1242,4 +1241,4 @@ initial-setup.newsletter-blurb = We offer a newsletter brimming with recent upda
 initial-setup.newsletter-question = Would you be interested in subscribing to our newsletter?
 initial-setup.newsletter-no = No, thank you.
 initial-setup.newsletter-yes = Yes, subscribe me to the newsletter
-initial-setup.quickstart-title = Quick Start Guide
+initial-setup.quickstart-title = Quick Start Guide

package-lock.json

@@ -87,7 +87,7 @@
     "moment-timezone": "0.5.48",
     "mongodb": "6.16.0",
     "nginx-conf": "2.1.0",
-    "nodemailer": "6.10.1",
+    "nodemailer": "7.0.3",
     "object-hash": "3.0.0",
     "offline-geocoder": "git+https://github.com/Countly/offline-geocoder.git",
     "properties-parser": "0.6.0",