Merge pull request #6916 from Countly/master-v25.03.26-into-next

Master v25.03.26 into next

Author: gabrieloliveirapinto

CHANGELOG.md

@@ -2,17 +2,17 @@
 Dependencies:
 - Remove SQLite
 
-## Version 25.03.xx
+## Version 25.03.26
 Fixes:
 - [push] Fixed timeout setting
 - [security] Fixed injection possibility on res.expose
 
 Enterprise Fixes:
+- [data-manager] Fixed bug when merging events with ampersand symbol in the name
 - [groups] Add logs for user updates
+- [nps] Sort widgets by internal name and search by name or internal name
 - [surveys] Change question map log to debug log
-
-Enterprise Fixes:
-- [data-manager] Fixed bug when merging events with ampersand symbol in the name
+- [surveys] Sort widgets by internal name and search by name or internal name
 
 Dependencies:
 - Bump axios from 1.12.2 to 1.13.1 in /plugins/cognito
@@ -42,6 +42,7 @@ Enterprise Fixes:
 - [compliance-hub] Fixed query patterns
 - [data-manager] Fixed bug preventing transformation of events ending in a dot
 - [data-manager] Fixed segment data deletion
+- [funnels] Fixed delete confirmation using correct button copy
 - [license] Stop sending metric after license expired
 - [users] Fix add/remove user to profile group
 - [users] Remove link to profile group page after removing user from group