Skip to content

Commit e2207c5

Browse files
authored
Merge branch 'master' into ar2rsawseen/master
2 parents 412e7c0 + e75e82e commit e2207c5

File tree

14 files changed

+234
-171
lines changed

14 files changed

+234
-171
lines changed

.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ name: CI
66
on:
77
# Triggers the workflow on push or pull request events but only for the master branch
88
pull_request:
9-
branches: [ master, next ]
9+
branches: [ master, next, release.*, flex ]
1010

1111
# Allows you to run this workflow manually from the Actions tab
1212
workflow_dispatch:

CHANGELOG.md

+15-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,26 @@
1-
## Version xx.xx.xx
1+
## Version 24.05.xx
2+
3+
Dependencies:
4+
- Bump fs-extra from 11.2.0 to 11.3.0
5+
- Bump nodemailer from 6.9.16 to 6.10.0
6+
7+
## Version 24.05.21
28

39
Fixes:
10+
- [core] Fixed a bug causing events to not being loaded when there's an escaped character in the event name
11+
- [core] Fixed a bug that was causing drill to crash when there's a percentage symbol in the event name
412
- [gridfs] fixes for moving to Promises
13+
- [reports] Fixes report generation failure due to SSL error
14+
- [surveys] "Select one" text in the widget can be edited now
15+
- [system-utility] Fixed: Mongo error (code: 26) in some Countly instances when the profiler gets run for the first time
16+
517

618
Dependencies:
7-
- Bump sass from 1.81.0 to 1.83.1
819
- Bump countly-sdk-nodejs from 24.10.0 to 24.10.1
9-
- Bump countly-sdk-web from 24.11.2 to 24.11.3
20+
- Bump countly-sdk-web from 24.11.2 to 24.11.4
1021
- Bump express-rate-limit from 7.4.1 to 7.5.0
1122
- Bump puppeteer from 23.10.4 to 23.11.1
23+
- Bump sass from 1.81.0 to 1.83.4
1224

1325
## Version 24.05.20
1426
Fixes:

README.md

+9-9
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
## 🔗 Quick links
99

1010
* [Countly Website](https://countly.com)
11-
* [Countly Server installation guide](https://support.count.ly/hc/en-us/articles/360036862332-Installing-the-Countly-Server)
12-
* [Countly SDKs, download and documentation links](https://support.count.ly/hc/en-us/articles/360037236571-Downloading-and-Installing-SDKs)
11+
* [Countly Server installation guide](https://support.countly.com/hc/en-us/articles/360036862332-Installing-the-Countly-Server)
12+
* [Countly SDKs, download and documentation links](https://support.countly.com/hc/en-us/articles/360037236571-Downloading-and-Installing-SDKs)
1313
* [Countly Community on Discord](https://discord.gg/countly)
14-
* [User Guides for Countly features](https://support.count.ly/hc/en-us/sections/7039354168729-User-Guides-Countly-22-x)
14+
* [User Guides for Countly features](https://support.countly.com/hc/en-us/sections/360007405211-User-Guides)
1515

1616
## 🌟 What is Countly?
1717

@@ -53,8 +53,8 @@ This repository includes server-side part of Countly, with the following feature
5353

5454
Countly can collect and visualize data from mobile, web and desktop applications. Using the write-API you can send data into Countly from any source. For more information please check the below resources:
5555

56-
* [List of Countly SDKs, documentation and download information](https://support.count.ly/hc/en-us/articles/360037236571-Downloading-and-Installing-SDKs)
57-
* [SDK development guide to build your own SDK](https://support.count.ly/hc/en-us/articles/360037753291-SDK-development-guide)
56+
* [List of Countly SDKs, documentation and download information](https://support.countly.com/hc/en-us/articles/360037236571-Downloading-and-Installing-SDKs)
57+
* [SDK development guide to build your own SDK](https://support.countly.com/hc/en-us/articles/360037753291-SDK-development-guide)
5858
* [Countly Server Write API to send data into Countly from any source](https://api.count.ly/reference/i)
5959

6060
## 🛠️ Installing and upgrading Countly server
@@ -69,15 +69,15 @@ There are several ways to install Countly:
6969

7070
2. For bash lovers, we provide a beautiful installation script (`bin/countly.install.sh`) in countly-server package which installs everything required to run Countly Server. For this, you need a stable release of this repository [available here](https://github.com/Countly/countly-server/releases).
7171

72-
3. Countly Lite also has Docker support - [see our official Docker repository](https://registry.hub.docker.com/r/countly/countly-server/) and [installation instructions for Docker](https://support.count.ly/hc/en-us/articles/360036862332-Installing-the-Countly-Server).
72+
3. Countly Lite also has Docker support - [see our official Docker repository](https://registry.hub.docker.com/r/countly/countly-server/) and [installation instructions for Docker](https://support.countly.com/hc/en-us/articles/360036862332-Installing-the-Countly-Server).
7373

74-
If you want to upgrade Countly from a previous version, please take a look at [upgrading documentation](https://support.count.ly/hc/en-us/articles/360037443652-Upgrading-the-Countly-Server).
74+
If you want to upgrade Countly from a previous version, please take a look at [upgrading documentation](https://support.countly.com/hc/en-us/articles/360037443652-Upgrading-the-Countly-Server).
7575

7676
## 🧩 API, extensibility and plugins
7777

7878
Countly has a [well-defined API](https://api.count.ly), that reads and writes data from/to the Countly backend. Countly dashboard is built using the read API, so it's possible to fetch any information you see on the dashboard using the API.
7979

80-
Countly is extensible using the plugin architecture. If you would like to modify any exiting feature by extending it or changing it, or if you would like to add completely new capabilities to Countly you can modify existing plugins or create new ones. We suggest [you read this document](https://support.count.ly/hc/en-us/articles/360036862392-Introduction) if you would like to start with plugin development.
80+
Countly is extensible using the plugin architecture. If you would like to modify any exiting feature by extending it or changing it, or if you would like to add completely new capabilities to Countly you can modify existing plugins or create new ones. We suggest [you read this document](https://support.countly.com/hc/en-us/articles/360036862392-Introduction) if you would like to start with plugin development.
8181

8282
## 💚 Community
8383

@@ -93,7 +93,7 @@ Security is very important to us. If you discover any issue regarding security,
9393
* **NodeJS** — An open-source, cross-platform JavaScript runtime environment
9494
* **Linux** — What we all love using ;-)
9595

96-
Plus lots of [open source libraries](https://support.count.ly/hc/en-us/articles/360037092232-Open-source-components)!
96+
Plus lots of [open source libraries](https://support.countly.com/hc/en-us/articles/360037092232-Open-source-components)!
9797

9898
## 🤝 How can I help you with your efforts?
9999

api/utils/render.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ exports.renderView = function(options, cb) {
6767
XDG_CONFIG_HOME: pathModule.resolve(__dirname, "../../.cache/chrome/tmp/.chromium"),
6868
XDG_CACHE_HOME: pathModule.resolve(__dirname, "../../.cache/chrome/tmp/.chromium")
6969
},
70-
args: ['--no-sandbox', '--disable-setuid-sandbox'],
70+
args: ['--no-sandbox', '--disable-setuid-sandbox', '--ignore-certificate-errors'],
7171
ignoreHTTPSErrors: true,
7272
userDataDir: pathModule.resolve(__dirname, "../../dump/chrome")
7373
};

bin/countly.install_rhel.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ cp "$DIR/config/supervisord.example.conf" "$DIR/config/supervisord.conf"
4848

4949
#Install raven-release for ipa-gothic-fonts required by puppeteer
5050
if [[ "$CENTOS_MAJOR" = "9" ]]; then
51-
sudo rpm -ivh https://pkgs.dyn.su/el8/base/x86_64/ipa-gothic-fonts-003.03-15.el8.noarch.rpm
51+
sudo rpm -ivh https://pkgs.sysadmins.ws/el8/base/x86_64/ipa-gothic-fonts-003.03-15.el8.noarch.rpm
5252
else
53-
sudo yum install -y https://pkgs.dyn.su/el8/base/x86_64/raven-release-1.0-3.el8.noarch.rpm
53+
sudo yum install https://pkgs.sysadmins.ws/el8/base/x86_64/raven-release-1.0-3.el8.noarch.rpm
5454
sudo yum install -y ipa-gothic-fonts
5555
fi
5656

frontend/express/app.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ plugins.setConfigs("frontend", {
116116
session_timeout: 30,
117117
use_google: true,
118118
code: true,
119-
google_maps_api_key: "",
120119
offline_mode: false,
120+
self_tracking: "",
121121
});
122122

123123
if (!plugins.isPluginEnabled('tracker')) {
@@ -137,7 +137,6 @@ plugins.setUserConfigs("frontend", {
137137
session_timeout: false,
138138
use_google: false,
139139
code: false,
140-
google_maps_api_key: ""
141140
});
142141

143142
plugins.setConfigs("security", {

frontend/express/public/core/events/javascripts/countly.details.models.js

+3
Original file line numberDiff line numberDiff line change
@@ -886,6 +886,9 @@
886886
return countlyAllEvents.service.fetchAllEventsData(context, period)
887887
.then(function(res) {
888888
if (res) {
889+
if (Array.isArray(res.list)) {
890+
res.list = res.list.map(eventName => countlyCommon.unescapeHtml(eventName));
891+
}
889892
context.commit("setAllEventsData", res);
890893
if ((!context.state.selectedEventName) || (res.map && res.map[context.state.selectedEventName] && !res.map[context.state.selectedEventName].is_visible) || (res.list && res.list.indexOf(context.state.selectedEventName) === -1)) {
891894
var appId = countlyCommon.ACTIVE_APP_ID;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3901,7 +3901,7 @@ Backbone.history.checkUrl = function() {
39013901

39023902
Backbone.history.noHistory = function(hash) {
39033903
if (history && history.replaceState) {
3904-
history.replaceState(undefined, undefined, hash);
3904+
history.replaceState(undefined, undefined, encodeURI(hash));
39053905
}
39063906
else {
39073907
location.replace(hash);

0 commit comments

Comments
 (0)