Skip to content

Codex/merge master into next 20260416#7489

Merged
ar2rsawseen merged 125 commits intonextfrom
codex/merge-master-into-next-20260416
Apr 17, 2026
Merged

Codex/merge master into next 20260416#7489
ar2rsawseen merged 125 commits intonextfrom
codex/merge-master-into-next-20260416

Conversation

@ar2rsawseen
Copy link
Copy Markdown
Member

No description provided.

dependabot Bot and others added 30 commits March 25, 2026 01:23
Bumps [cypress](https://github.com/cypress-io/cypress) from 15.12.0 to 15.13.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.12.0...v15.13.0)

---
updated-dependencies:
- dependency-name: cypress
  dependency-version: 15.13.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Removed installation of ipa-gothic-fonts package for RHEL.
Removed installation of ipa-gothic-fonts from Dockerfile.
…s/cypress-15.13.0

Bump cypress from 15.12.0 to 15.13.0 in /ui-tests
Add new message for user property update [SER-2847]
A script to fix the missing custom user properties in drill meta
…ontent-builder-image-handling

[Feat] Content Blocks image fill types
Bumps [brace-expansion](https://github.com/juliangruber/brace-expansion) from 2.0.2 to 2.0.3.
- [Release notes](https://github.com/juliangruber/brace-expansion/releases)
- [Commits](juliangruber/brace-expansion@v2.0.2...v2.0.3)

---
updated-dependencies:
- dependency-name: brace-expansion
  dependency-version: 2.0.3
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
…/hooks/brace-expansion-2.0.3

Bump brace-expansion from 2.0.2 to 2.0.3 in /plugins/hooks
Bumps [brace-expansion](https://github.com/juliangruber/brace-expansion) from 1.1.12 to 1.1.13.
- [Release notes](https://github.com/juliangruber/brace-expansion/releases)
- [Commits](juliangruber/brace-expansion@v1.1.12...v1.1.13)

---
updated-dependencies:
- dependency-name: brace-expansion
  dependency-version: 1.1.13
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
…xpansion-1.1.13

Bump brace-expansion from 1.1.12 to 1.1.13
Bumps [path-to-regexp](https://github.com/pillarjs/path-to-regexp) from 0.1.12 to 0.1.13.
- [Release notes](https://github.com/pillarjs/path-to-regexp/releases)
- [Changelog](https://github.com/pillarjs/path-to-regexp/blob/v.0.1.13/History.md)
- [Commits](pillarjs/path-to-regexp@v0.1.12...v.0.1.13)

---
updated-dependencies:
- dependency-name: path-to-regexp
  dependency-version: 0.1.13
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
…-regexp-0.1.13

Bump path-to-regexp from 0.1.12 to 0.1.13
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.23 to 4.18.1.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](lodash/lodash@4.17.23...4.18.1)

---
updated-dependencies:
- dependency-name: lodash
  dependency-version: 4.18.1
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
…ipts/device_list/lodash-4.18.1

Bump lodash from 4.17.23 to 4.18.1 in /bin/scripts/device_list
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.23 to 4.18.1.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](lodash/lodash@4.17.23...4.18.1)

---
updated-dependencies:
- dependency-name: lodash
  dependency-version: 4.18.1
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
…4.18.1

Bump lodash from 4.17.23 to 4.18.1
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.23 to 4.18.1.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](lodash/lodash@4.17.23...4.18.1)

---
updated-dependencies:
- dependency-name: lodash
  dependency-version: 4.18.1
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
…/hooks/lodash-4.18.1

Bump lodash from 4.17.23 to 4.18.1 in /plugins/hooks
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.23 to 4.18.1.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](lodash/lodash@4.17.23...4.18.1)

---
updated-dependencies:
- dependency-name: lodash
  dependency-version: 4.18.1
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
…s/lodash-4.18.1

Bump lodash from 4.17.23 to 4.18.1 in /ui-tests
…into-next-20260416

# Conflicts:
#	Dockerfile-centos-api
#	package-lock.json
Copilot AI review requested due to automatic review settings April 16, 2026 17:05
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Merge-forward changes from master into next, primarily updating dependencies and adjusting alerts scheduling to respect application timezones, plus a new maintenance script and small documentation/workflow updates.

Changes:

  • Update alerts job scheduling/execution to pass app context and compute schedules using timezone offsets.
  • Bump multiple dependencies across root, plugins, and UI test tooling lockfiles.
  • Add a new data-fix script and minor docs/localization/workflow adjustments.

Reviewed changes

Copilot reviewed 20 out of 28 changed files in this pull request and generated 12 comments.

Show a summary per file
File Description
ui-tests/package-lock.json Updates UI test dependencies (faker, cypress, lodash, pdfjs-dist, canvas bindings).
ui-tests/README.md Fixes markdown code fence formatting.
plugins/push/package.json Bumps node-forge version.
plugins/push/package-lock.json Locks updated node-forge version.
plugins/hooks/package-lock.json Updates axios and related transitive deps.
plugins/data-manager/frontend/public/localization/data-manager.properties Adds new success/failure localization strings for user-property edits.
plugins/alerts/api/parts/common-lib.js Adds timezone offset to app shape and introduces helper to load apps with offsets.
plugins/alerts/api/jobs/monitor.js Refactors monitor job to async/await and passes {alert, app} into modules.
plugins/alerts/api/api.js Reworks alert scheduling logic to create jobs per app (including “all” apps) using timezone offsets.
plugins/alerts/api/alertModules/views.js Updates module API to accept app argument and adds debug logging.
plugins/alerts/api/alertModules/users.js Updates module API to accept app argument and adds debug logging.
plugins/alerts/api/alertModules/survey.js Updates module API to accept app argument and adds debug logging.
plugins/alerts/api/alertModules/sessions.js Updates module API to accept app argument and adds debug logging.
plugins/alerts/api/alertModules/revenue.js Updates module API to accept app argument and adds debug logging.
plugins/alerts/api/alertModules/rating.js Updates module API to accept app argument and adds debug logging.
plugins/alerts/api/alertModules/nps.js Updates module API to accept app argument and adds debug logging.
plugins/alerts/api/alertModules/events.js Updates module API to accept app argument and adds debug logging.
plugins/alerts/api/alertModules/dataPoints.js Shifts “all apps” handling to scheduler by accepting single app per job run.
plugins/alerts/api/alertModules/crashes.js Updates module API to accept app argument and adds debug logging.
plugins/alerts/api/alertModules/cohorts.js Updates module API to accept app argument and adds debug logging.
package.json Bumps multiple root dependencies/devDependencies.
package-lock.json Locks updated root dependency graph.
bin/scripts/fix-data/fix_missing_custom_user_props.js Adds a Node.js script to backfill/extend drill_meta custom user property metadata.
bin/scripts/device_list/package-lock.json Updates lodash version for the device_list script package.
bin/countly.install_rhel.sh Removes installation of ipa-gothic-fonts on non-CentOS9 path.
CHANGELOG.md Adds changelog entries for fixes and dependency bumps.
.github/workflows/docker-image.yml Updates pinned SHAs for Docker login/build actions.
.github/workflows/deploy.yml Updates pinned SHAs for Docker login/build action.
Files not reviewed (3)
  • plugins/hooks/package-lock.json: Language not supported
  • plugins/push/package-lock.json: Language not supported
  • ui-tests/package-lock.json: Language not supported

Comment thread plugins/alerts/api/jobs/monitor.js
Comment thread plugins/alerts/api/api.js
Comment thread plugins/alerts/api/api.js
Comment thread plugins/alerts/api/api.js
Comment thread plugins/alerts/api/parts/common-lib.js
Comment thread plugins/alerts/api/jobs/monitor.js
Comment thread plugins/alerts/api/api.js
Comment thread CHANGELOG.md
Comment thread CHANGELOG.md
@ar2rsawseen ar2rsawseen force-pushed the codex/merge-master-into-next-20260416 branch from 6a7b205 to 680b426 Compare April 16, 2026 17:41
ar2rsawseen and others added 22 commits April 16, 2026 20:56
…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
…into-next-20260416

# Conflicts:
#	package-lock.json
@ar2rsawseen ar2rsawseen merged commit 5edf549 into next Apr 17, 2026
13 of 17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants