Skip to content

Commit 3badc0a

Browse files
Merge remote-tracking branch 'origin/release.24.12' into journey+content-main
2 parents 543378c + e5fd701 commit 3badc0a

File tree

16 files changed

+247
-176
lines changed

16 files changed

+247
-176
lines changed

.github/workflows/deploy.yml

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

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

.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, release.24.10 ]
9+
branches: [ master, next, release.24.10, release.24.12 ]
1010

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

CHANGELOG.md

+31-27
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,25 @@
1-
## Version 24.12.x
2-
3-
Fixes:
4-
- [push] Fixed bug where IOS credentials get mixed up while sending messages from different apps at the same time
5-
- [push] Fixed bug where it crashes in connection pool growth because of a type mismatch in an if condition
6-
7-
Features:
8-
- [user-management] Global admins can now disable 2FA for individual users
9-
10-
Fixes:
11-
- [core] Fixed a bug causing events to not being loaded when there's an escaped character in the event name
12-
- [gridfs] fixes for moving to Promises
13-
- [surveys] "Select one" text in the widget can be edited now
14-
15-
Dependencies:
16-
- Bump express from 4.21.1 to 4.21.2
17-
- Bump mocha from 10.2.0 to 10.8.2
18-
- Bump sass from 1.81.0 to 1.83.1
19-
- Bump countly-sdk-nodejs from 24.10.0 to 24.10.1
20-
- Bump countly-sdk-web from 24.11.2 to 24.11.3
21-
- Bump express-rate-limit from 7.4.1 to 7.5.0
22-
- Bump puppeteer from 23.10.4 to 23.11.1
23-
241
## Version 24.12
252
Features:
263
- [audit-logs] Exported audit logs from UI now would have "BEFORE" and "AFTER" fields
274
- [core] Ability to mark reports as 'dirty' to make sure they are regenerated in full
285
- [core] Adding a cancel button to "create new app" form
296
- [core] Adding a nightly job to delete old data
7+
- [core] Fixed a bug causing events to not being loaded when there's an escaped character in the event name
308
- [core] Redirecting user to a newly created app
319
- [core] Removing HTML from localization files
3210
- [core] Showing a flex banner on sidebar if the version is Countly Lite
3311
- [crashes] Adding confirmation for deleting crash groups
3412
- [dashoards] Fixed the "Add/manage notes" button that did not work for the technology widget
3513
- [dbviewer] Preventing aggregation of using any stages which might open user to harmful actions (like $merge, $out, $lookup, $uninonWith) for all users except global admin
14+
- [gridfs] fixes for moving to Promises
3615
- [nps] Fixing issues with default logo selection
3716
- [populator] Adding ability to select features to populate and other small improvements
17+
- [push] Fixed bug where IOS credentials get mixed up while sending messages from different apps at the same time
18+
- [push] Fixed bug where it crashes in connection pool growth because of a type mismatch in an if condition
19+
- [reports] Fixes report generation failure due to SSL error
3820
- [star-rating] Removed unnecessary limitation with using cohorts for targeting
39-
- [surveys] Removed unnecessary limitation with using cohorts for targeting
21+
- [system-utility] Fixed: Mongo error (code: 26) in some Countly instances when the profiler gets run for the first time
22+
- [user-management] Global admins can now disable 2FA for individual users
4023

4124
Enterprise Features:
4225
- [cohorts] Adding ability to edit cohorts. This deletes historical calculations
@@ -45,15 +28,21 @@ Enterprise Features:
4528
- [flows] Adding UX improvements to the editor
4629
- [journey_engine] Adding "Journey Engine" feature
4730
- [remote-config] Moving enable/disable functionality to the dropdown
31+
- [surveys] "Select one" text in the widget can be edited now
32+
- [surveys] Removed unnecessary limitation with using cohorts for targeting
4833

4934
Dependencies:
50-
- Bump countly-sdk-nodejs from 22.6.0 to 24.10.0
51-
- Bump countly-sdk-web from 24.4.1 to 24.11.0
35+
- Bump countly-sdk-nodejs from 24.10.0 to 24.10.1
36+
- Bump countly-sdk-web from 24.11.2 to 24.11.3
37+
- Bump express from 4.21.1 to 4.21.2
38+
- Bump express-rate-limit from 7.4.1 to 7.5.0
5239
- Bump form-data from 4.0.0 to 4.0.1
5340
- Bump jimp from 0.22.12 to 1.6.0
5441
- Bump jsdoc from 4.0.3 to 4.0.4
42+
- Bump mocha from 10.2.0 to 10.8.2
5543
- Bump nodemailer from 6.9.15 to 6.9.16
56-
- Bump puppeteer from 23.8.0 to 23.9.0
44+
- Bump puppeteer from 23.10.4 to 23.11.1
45+
- Bump sass from 1.81.0 to 1.83.3
5746
- Bump tslib from 2.7.0 to 2.8.1
5847

5948
## Version 24.10.3
@@ -143,6 +132,21 @@ Enterprise Features:
143132
- [users] UI improvements
144133
- [views] Added a quick transition to drill
145134

135+
## Version 24.05.21
136+
Fixes:
137+
- [core] Fixed a bug causing events to not being loaded when there's an escaped character in the event name
138+
- [gridfs] fixes for moving to Promises
139+
- [reports] Fixes report generation failure due to SSL error
140+
- [surveys] "Select one" text in the widget can be edited now
141+
- [system-utility] Fixed: Mongo error (code: 26) in some Countly instances when the profiler gets run for the first time
142+
143+
Dependencies:
144+
- Bump countly-sdk-nodejs from 24.10.0 to 24.10.1
145+
- Bump countly-sdk-web from 24.11.2 to 24.11.4
146+
- Bump express-rate-limit from 7.4.1 to 7.5.0
147+
- Bump puppeteer from 23.10.4 to 23.11.1
148+
- Bump sass from 1.81.0 to 1.83.4
149+
146150
## Version 24.05.20
147151
Fixes:
148152
- [push] Fixed bug where IOS credentials get mixed up while sending messages from different apps at the same time

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

bin/upgrade/24.12/upgrade.mongo.80.sh

+1
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ mongosh --nodb --eval 'var conn; print("Waiting for MongoDB connection on port 2
126126

127127
if [ "$isAuth" -eq "1" ]; then
128128
echo "run this command with authentication to upgrade to 8.0"
129+
# shellcheck disable=SC2028
129130
echo "mongosh admin --eval \"db.adminCommand( { setFeatureCompatibilityVersion: \\\8.0\\\", confirm: true } )\""
130131
elif ! mongosh admin --eval "printjson(db.adminCommand( { getParameter: 1, featureCompatibilityVersion: 1 } ))" ; then
131132
echo "Could not connect to MongodB, run this command when Mongo is up and running"

frontend/express/app.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ plugins.setConfigs("frontend", {
136136
session_timeout: 30,
137137
use_google: true,
138138
code: true,
139-
google_maps_api_key: "",
140139
offline_mode: false,
140+
self_tracking: "",
141141
});
142142

143143
if (!plugins.isPluginEnabled('tracker')) {
@@ -157,7 +157,6 @@ plugins.setUserConfigs("frontend", {
157157
session_timeout: false,
158158
use_google: false,
159159
code: false,
160-
google_maps_api_key: ""
161160
});
162161

163162
plugins.setConfigs("security", {

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)