Skip to content

Commit c897ade

Browse files
committed
Merge branch 'master' into release.24.10
# Conflicts: # CHANGELOG.md # package-lock.json # package.json
2 parents bfc8a8e + e650969 commit c897ade

File tree

7 files changed

+352
-395
lines changed

7 files changed

+352
-395
lines changed

CHANGELOG.md

+9-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
## Version 24.10.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
25

36
Dependencies:
4-
- Bump puppeteer from 23.8.0 to 23.9.0
5-
- Bump nodemailer from 6.9.15 to 6.9.16
7+
- Bump countly-sdk-nodejs from 22.6.0 to 24.10.0
68
- Bump countly-sdk-web from 24.4.1 to 24.11.0
7-
- Bump tslib from 2.7.0 to 2.8.1
89
- Bump form-data from 4.0.0 to 4.0.1
910
- Bump jimp from 0.22.12 to 1.6.0
1011
- Bump jsdoc from 4.0.3 to 4.0.4
11-
- Bump countly-sdk-nodejs from 22.6.0 to 24.10.0
12+
- Bump nodemailer from 6.9.15 to 6.9.16
13+
- Bump puppeteer from 23.8.0 to 23.9.0
14+
- Bump tslib from 2.7.0 to 2.8.1
15+
- Bump express from 4.21.1 to 4.21.2
16+
- Bump mocha from 10.2.0 to 10.8.2
1217

1318
## Version 24.10.3
1419
Fixes:

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)