Merge branch 'release.24.10' into next

# Conflicts:
#	CHANGELOG.md

Author: ar2rsawseen

CHANGELOG.md

@@ -1,3 +1,12 @@
+## Version 24.12.x
+Fixes:
+- [push] Fixed bug where IOS credentials get mixed up while sending messages from different apps at the same time
+- [push] Fixed bug where it crashes in connection pool growth because of a type mismatch in an if condition
+
+Dependencies:
+- Bump express from 4.21.1 to 4.21.2
+- Bump mocha from 10.2.0 to 10.8.2
+
 ## Version 24.12
 Features:
 - [audit-logs] Exported audit logs from UI now would have "BEFORE" and "AFTER" fields
@@ -33,6 +42,57 @@ Dependencies:
 - Bump puppeteer from 23.8.0 to 23.9.0
 - Bump tslib from 2.7.0 to 2.8.1
 
+## Version 24.10.3
+Fixes:
+- [dashboards] Fixing issue where dashboard widgets go into single column
+
+Security:
+- Bump puppeteer from 17.1.3 to 23.8.0
+- Bump express from 4.21.0 to 4.21.1 
+- Bump sass from 1.79.4 to 1.81.0
+- Bump express-session from 1.18.0 to 1.18.1
+- Bump cross-spawn from 7.0.3 to 7.0.6 in /ui-tests
+- Bump cross-spawn from 7.0.3 to 7.0.6 in /plugins/hooks
+
+## Version 24.10.2
+Fixes:
+- [core] Correct aggregated collection cleanup on event omitting
+- [core] Fixed bug where changing passwords results in the loss of the "Global Admin" role
+- [core] Fixed bug where exporting incoming data logs could result in "Incorrect parameter \"data\" error
+- [core] Removed use of commands which needs admin rights from report manager.
+- [crash] Fixed bug in crash ingestion for scenarios where the "app version" is not a string.
+- [script] Fixing bug with "delete_old_members" script that led to malformed requests
+
+Enterprise fixes:
+- [nps] Fixed bug that showed the wrong nps preview title
+
+## Version 24.10.1
+Fixes:
+- [core] Replaced "Users" with "Sessions" label on technology home widgets
+- [push] Improved ability to observe push related errors
+- [push] Replaced push plugin with an earlier version of the plugin
+
+Enterprise fixes:
+- [cohorts] Fixed issues with nightly cleanup
+- [data-manager] Fixed UI bug where rules were not visible when editing "Merge by regex" transformations
+- [drill] Fixed wrong pie chart label  tooltip in dashboard widget
+- [flows] Fixed bug in case of null data in schema
+- [license] Fixed bug with MAU type of licenses that would prevent the server from starting
+- [nps] Fixed bug in the editor where the "internal name" field was not mandatory
+- [nps] Fixed bug where it was possible to submit empty nps surveys
+- [ratings] Fixed bug with user consent
+- [ratings] Fixed UI bug where "Internal name" was not a mandatory field
+
+Security:
+- Bumped cookie-parser from 1.4.6 to 1.4.7
+- Bumped express-rate-limit from 7.4.0 to 7.4.1
+- Bumped moment-timezone from 0.5.45 to 0.5.46
+- Bumped sass from 1.79.3 to 1.79.4
+- Fixing minor vulnerability that would allow for unauthorized file upload
+
+Enterprise Features:
+- [block] Added a way to filter crashes by their error (stacktrace)
+
 ## Version 24.10
 Fixes:
 - [core] Correct aggregated collection cleanup on event omitting

bin/scripts/member-managament/delete_old_members.js

@@ -17,7 +17,8 @@ var days = 30;
 //query states not logged in in last N days , but logged in at least once
 
 var ts = Math.round(Date.now() / 1000) - days * 24 * 60 * 60;
-var query = {"$and": [{"last_login": {"$lt": ts}}, {"last_login": {"$exists": true}}]};
+var query = {"$and": [{"last_login": {"$lt": ts}}, {"last_login": {"$exists": true}}, {"global_admin": {"$ne": true}}]};
+// {"global_admin": {"$ne": true}} ensures that global admins are excluded from deletion.
 
 //although mogodb does not return null on $lt, keep like above for safety
 
@@ -120,4 +121,4 @@ function sendRequest(params, callback) {
         console.log(e);
         callback({"err": 'Failed to send'});
     }
-}
+}

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

@@ -89,29 +89,34 @@
                 }))
                 .then(
                     function() {
-                        return $.when($.ajax({
-                            type: "GET",
-                            url: countlyCommon.API_PARTS.data.r,
-                            data: {
-                                "app_id": countlyCommon.ACTIVE_APP_ID,
-                                "method": "events",
-                                "event": _activeEvent,
-                                "segmentation": currentActiveSegmentation,
-                                "period": _period,
-                                "preventRequestAbort": true
-                            },
-                            dataType: "json",
-                            success: function(json) {
-                                if (currentActiveEvent === _activeEvent && currentActiveSegmentation === _activeSegmentation) {
-                                    _activeLoadedEvent = _activeEvent;
-                                    _activeLoadedSegmentation = _activeSegmentation;
-                                    _activeEventDb = json;
-                                    setMeta();
+                        if (_activeEvent) {
+                            return $.when($.ajax({
+                                type: "GET",
+                                url: countlyCommon.API_PARTS.data.r,
+                                data: {
+                                    "app_id": countlyCommon.ACTIVE_APP_ID,
+                                    "method": "events",
+                                    "event": _activeEvent,
+                                    "segmentation": currentActiveSegmentation,
+                                    "period": _period,
+                                    "preventRequestAbort": true
+                                },
+                                dataType: "json",
+                                success: function(json) {
+                                    if (currentActiveEvent === _activeEvent && currentActiveSegmentation === _activeSegmentation) {
+                                        _activeLoadedEvent = _activeEvent;
+                                        _activeLoadedSegmentation = _activeSegmentation;
+                                        _activeEventDb = json;
+                                        setMeta();
+                                    }
                                 }
-                            }
-                        })).then(function() {
+                            })).then(function() {
+                                return true;
+                            });
+                        }
+                        else {
                             return true;
-                        });
+                        }
                     }
                 );
         }