Merge branch 'next' into newarchitecture#7428
Merged
ar2rsawseen merged 375 commits intonewarchitecturefrom Apr 17, 2026
Merged
Conversation
[QT-406] Improve Cypress CI error logging for better debugging
…ment-args fix: crashes add-edit-delete comment args
…uawei-push-messages [push] changed the property name from link to url for message buttons
Update CHANGELOG for version 25.03.38
Update changelog
Unescape event segment values in meta
…-settings-to-huawei-as-well [SER-2840] Use Android specific content for Huawei messages
Bumps [cypress](https://github.com/cypress-io/cypress) from 15.11.0 to 15.12.0. - [Release notes](https://github.com/cypress-io/cypress/releases) - [Changelog](https://github.com/cypress-io/cypress/blob/develop/CHANGELOG.md) - [Commits](cypress-io/cypress@v15.11.0...v15.12.0) --- updated-dependencies: - dependency-name: cypress dependency-version: 15.12.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
…s/cypress-15.12.0 Bump cypress from 15.11.0 to 15.12.0 in /ui-tests
…nternal mongodb-connection-string-url package
…nction-inside-plugin-manager
…ore-1.13.8 Bump underscore from 1.13.7 to 1.13.8
…nction-inside-plugin-manager
…e-string-function-inside-plugin-manager [SER-2841] Reworked replaceDatabaseString function
…raversal Fix data migration path traversal
Rearranged useradd command and ensured HTTPS for APT sources.
Modify Dockerfile to use HTTPS for ubuntu repo
Bumps [cypress](https://github.com/cypress-io/cypress) from 15.13.1 to 15.14.0. - [Release notes](https://github.com/cypress-io/cypress/releases) - [Changelog](https://github.com/cypress-io/cypress/blob/develop/CHANGELOG.md) - [Commits](cypress-io/cypress@v15.13.1...v15.14.0) --- updated-dependencies: - dependency-name: cypress dependency-version: 15.14.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
…s/cypress-15.14.0 Bump cypress from 15.13.1 to 15.14.0 in /ui-tests
Bumps [protocol-buffers-schema](https://github.com/mafintosh/protocol-buffers-schema) from 3.6.0 to 3.6.1. - [Commits](mafintosh/protocol-buffers-schema@v3.6.0...v3.6.1) --- updated-dependencies: - dependency-name: protocol-buffers-schema dependency-version: 3.6.1 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
…l-buffers-schema-3.6.1 Bump protocol-buffers-schema from 3.6.0 to 3.6.1
Bumps [typescript](https://github.com/microsoft/TypeScript) from 6.0.2 to 6.0.3. - [Release notes](https://github.com/microsoft/TypeScript/releases) - [Commits](microsoft/TypeScript@v6.0.2...v6.0.3) --- updated-dependencies: - dependency-name: typescript dependency-version: 6.0.3 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
…ipt-6.0.3 Bump typescript from 6.0.2 to 6.0.3
Bump package-lock
…into-next-20260416 # Conflicts: # package-lock.json
…260416 Codex/merge master into next 20260416
…chitecture # Conflicts: # .github/workflows/deploy.yml # .github/workflows/docker-image.yml # CHANGELOG.md # api/parts/data/exports.js # api/parts/mgmt/apps.js # bin/countly.install_rhel.sh # package-lock.json # package.json # plugins/alerts/api/alertModules/cohorts.js # plugins/alerts/api/alertModules/crashes.js # plugins/alerts/api/alertModules/dataPoints.js # plugins/alerts/api/alertModules/events.js # plugins/alerts/api/alertModules/nps.js # plugins/alerts/api/alertModules/rating.js # plugins/alerts/api/alertModules/revenue.js # plugins/alerts/api/alertModules/sessions.js # plugins/alerts/api/alertModules/survey.js # plugins/alerts/api/alertModules/users.js # plugins/alerts/api/alertModules/views.js # plugins/alerts/api/api.js # plugins/alerts/api/jobs/monitor.js # plugins/alerts/tests.js # plugins/crashes/api/api.js # plugins/hooks/package-lock.json # plugins/hooks/package.json # plugins/hooks/tests/crud.js # plugins/pluginManager.js # plugins/push/api/api-auto.js # plugins/push/api/api-message.js # plugins/push/api/send/data/message.js # plugins/push/package-lock.json # plugins/push/package.json # plugins/web/api/api.js # ui-tests/cypress/support/commands.js # ui-tests/cypress/support/e2e.js # ui-tests/package-lock.json
… into merge/next-into-newarchitecture # Conflicts: # .github/workflows/deploy.yml # .github/workflows/docker-image.yml # CHANGELOG.md # package-lock.json # package.json # ui-tests/package-lock.json
…-into-newarchitecture # Conflicts: # plugins/push/package-lock.json
Cookiezaurs
approved these changes
Apr 17, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Conflicts: