Skip to content

Commit e756bf3

Browse files
ar2rsawseenar2rsawseen
committed
Merge branch 'release.24.10' into next
# Conflicts: # CHANGELOG.md
2 parents 9e74afa + c897ade commit e756bf3

File tree

7 files changed

+403
-391
lines changed

7 files changed

+403
-391
lines changed

‎CHANGELOG.md

+60
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
## Version 24.12.x
2+
Fixes:
3+
- [push] Fixed bug where IOS credentials get mixed up while sending messages from different apps at the same time
4+
- [push] Fixed bug where it crashes in connection pool growth because of a type mismatch in an if condition
5+
6+
Dependencies:
7+
- Bump express from 4.21.1 to 4.21.2
8+
- Bump mocha from 10.2.0 to 10.8.2
9+
110
## Version 24.12
211
Features:
312
- [audit-logs] Exported audit logs from UI now would have "BEFORE" and "AFTER" fields
@@ -33,6 +42,57 @@ Dependencies:
3342
- Bump puppeteer from 23.8.0 to 23.9.0
3443
- Bump tslib from 2.7.0 to 2.8.1
3544

45+
## Version 24.10.3
46+
Fixes:
47+
- [dashboards] Fixing issue where dashboard widgets go into single column
48+
49+
Security:
50+
- Bump puppeteer from 17.1.3 to 23.8.0
51+
- Bump express from 4.21.0 to 4.21.1
52+
- Bump sass from 1.79.4 to 1.81.0
53+
- Bump express-session from 1.18.0 to 1.18.1
54+
- Bump cross-spawn from 7.0.3 to 7.0.6 in /ui-tests
55+
- Bump cross-spawn from 7.0.3 to 7.0.6 in /plugins/hooks
56+
57+
## Version 24.10.2
58+
Fixes:
59+
- [core] Correct aggregated collection cleanup on event omitting
60+
- [core] Fixed bug where changing passwords results in the loss of the "Global Admin" role
61+
- [core] Fixed bug where exporting incoming data logs could result in "Incorrect parameter \"data\" error
62+
- [core] Removed use of commands which needs admin rights from report manager.
63+
- [crash] Fixed bug in crash ingestion for scenarios where the "app version" is not a string.
64+
- [script] Fixing bug with "delete_old_members" script that led to malformed requests
65+
66+
Enterprise fixes:
67+
- [nps] Fixed bug that showed the wrong nps preview title
68+
69+
## Version 24.10.1
70+
Fixes:
71+
- [core] Replaced "Users" with "Sessions" label on technology home widgets
72+
- [push] Improved ability to observe push related errors
73+
- [push] Replaced push plugin with an earlier version of the plugin
74+
75+
Enterprise fixes:
76+
- [cohorts] Fixed issues with nightly cleanup
77+
- [data-manager] Fixed UI bug where rules were not visible when editing "Merge by regex" transformations
78+
- [drill] Fixed wrong pie chart label tooltip in dashboard widget
79+
- [flows] Fixed bug in case of null data in schema
80+
- [license] Fixed bug with MAU type of licenses that would prevent the server from starting
81+
- [nps] Fixed bug in the editor where the "internal name" field was not mandatory
82+
- [nps] Fixed bug where it was possible to submit empty nps surveys
83+
- [ratings] Fixed bug with user consent
84+
- [ratings] Fixed UI bug where "Internal name" was not a mandatory field
85+
86+
Security:
87+
- Bumped cookie-parser from 1.4.6 to 1.4.7
88+
- Bumped express-rate-limit from 7.4.0 to 7.4.1
89+
- Bumped moment-timezone from 0.5.45 to 0.5.46
90+
- Bumped sass from 1.79.3 to 1.79.4
91+
- Fixing minor vulnerability that would allow for unauthorized file upload
92+
93+
Enterprise Features:
94+
- [block] Added a way to filter crashes by their error (stacktrace)
95+
3696
## Version 24.10
3797
Fixes:
3898
- [core] Correct aggregated collection cleanup on event omitting

‎bin/scripts/member-managament/delete_old_members.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ var days = 30;
1717
//query states not logged in in last N days , but logged in at least once
1818

1919
var ts = Math.round(Date.now() / 1000) - days * 24 * 60 * 60;
20-
var query = {"$and": [{"last_login": {"$lt": ts}}, {"last_login": {"$exists": true}}]};
20+
var query = {"$and": [{"last_login": {"$lt": ts}}, {"last_login": {"$exists": true}}, {"global_admin": {"$ne": true}}]};
21+
// {"global_admin": {"$ne": true}} ensures that global admins are excluded from deletion.
2122

2223
//although mogodb does not return null on $lt, keep like above for safety
2324

@@ -120,4 +121,4 @@ function sendRequest(params, callback) {
120121
console.log(e);
121122
callback({"err": 'Failed to send'});
122123
}
123-
}
124+
}

‎frontend/express/public/javascripts/countly/countly.event.js

+26-21
Original file line numberDiff line numberDiff line change
@@ -89,29 +89,34 @@
8989
}))
9090
.then(
9191
function() {
92-
return $.when($.ajax({
93-
type: "GET",
94-
url: countlyCommon.API_PARTS.data.r,
95-
data: {
96-
"app_id": countlyCommon.ACTIVE_APP_ID,
97-
"method": "events",
98-
"event": _activeEvent,
99-
"segmentation": currentActiveSegmentation,
100-
"period": _period,
101-
"preventRequestAbort": true
102-
},
103-
dataType: "json",
104-
success: function(json) {
105-
if (currentActiveEvent === _activeEvent && currentActiveSegmentation === _activeSegmentation) {
106-
_activeLoadedEvent = _activeEvent;
107-
_activeLoadedSegmentation = _activeSegmentation;
108-
_activeEventDb = json;
109-
setMeta();
92+
if (_activeEvent) {
93+
return $.when($.ajax({
94+
type: "GET",
95+
url: countlyCommon.API_PARTS.data.r,
96+
data: {
97+
"app_id": countlyCommon.ACTIVE_APP_ID,
98+
"method": "events",
99+
"event": _activeEvent,
100+
"segmentation": currentActiveSegmentation,
101+
"period": _period,
102+
"preventRequestAbort": true
103+
},
104+
dataType: "json",
105+
success: function(json) {
106+
if (currentActiveEvent === _activeEvent && currentActiveSegmentation === _activeSegmentation) {
107+
_activeLoadedEvent = _activeEvent;
108+
_activeLoadedSegmentation = _activeSegmentation;
109+
_activeEventDb = json;
110+
setMeta();
111+
}
110112
}
111-
}
112-
})).then(function() {
113+
})).then(function() {
114+
return true;
115+
});
116+
}
117+
else {
113118
return true;
114-
});
119+
}
115120
}
116121
);
117122
}

0 commit comments

Comments
 (0)