Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/comment-and-close.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
comment-and-close:
uses: dhis2/workflows-platform/.github/workflows/comment-and-close.yml@v1
uses: dhis2/workflows-platform/.github/workflows/comment-and-close.yml@pnpm
if: '!contains(fromJson(''["dhis2-bot", "kodiakhq", "dependabot"]''), github.event.issue.sender.login)'
with:
issue_number: ${{ github.event.issue.number }}
2 changes: 1 addition & 1 deletion .github/workflows/deploy-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ concurrency:

jobs:
deploy:
uses: dhis2/workflows-platform/.github/workflows/deploy-branch.yml@v1
uses: dhis2/workflows-platform/.github/workflows/deploy-branch.yml@pnpm
secrets: inherit
with:
branch: development
2 changes: 1 addition & 1 deletion .github/workflows/deploy-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ concurrency:

jobs:
deploy:
uses: dhis2/workflows-platform/.github/workflows/deploy-pr.yml@v1
uses: dhis2/workflows-platform/.github/workflows/deploy-pr.yml@pnpm
if: '!github.event.pull_request.head.repo.fork'
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/deploy-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ concurrency:

jobs:
deploy:
uses: dhis2/workflows-platform/.github/workflows/deploy-production.yml@v1
uses: dhis2/workflows-platform/.github/workflows/deploy-production.yml@pnpm
secrets: inherit
with:
branch: master
2 changes: 1 addition & 1 deletion .github/workflows/generate-and-upload-bom.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ concurrency:

jobs:
create-bom:
uses: dhis2/workflows-platform/.github/workflows/generate-and-upload-bom.yml@v1
uses: dhis2/workflows-platform/.github/workflows/generate-and-upload-bom.yml@pnpm
with:
node_version: 20
project_id: '2437140f-8722-4dd4-a994-dcc48793b4ae'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint-pr-title.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ concurrency:

jobs:
lint-pr-title:
uses: dhis2/workflows-platform/.github/workflows/lint-pr-title.yml@v1
uses: dhis2/workflows-platform/.github/workflows/lint-pr-title.yml@pnpm
10 changes: 5 additions & 5 deletions .github/workflows/test-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@ concurrency:

jobs:
lint-commits:
uses: dhis2/workflows-platform/.github/workflows/lint-commits.yml@v1
uses: dhis2/workflows-platform/.github/workflows/lint-commits.yml@pnpm
lint:
uses: dhis2/workflows-platform/.github/workflows/lint.yml@v1
uses: dhis2/workflows-platform/.github/workflows/lint.yml@pnpm
test:
uses: dhis2/workflows-platform/.github/workflows/test.yml@v1
uses: dhis2/workflows-platform/.github/workflows/test.yml@pnpm
e2e:
uses: dhis2/workflows-platform/.github/workflows/legacy-e2e.yml@v1
uses: dhis2/workflows-platform/.github/workflows/legacy-e2e.yml@pnpm
# Skips forks and dependabot PRs
if: '!github.event.push.repository.fork'
secrets: inherit
with:
api_version: 41
release:
needs: [lint-commits, lint, test, e2e]
uses: dhis2/workflows-platform/.github/workflows/release.yml@v1
uses: dhis2/workflows-platform/.github/workflows/release.yml@pnpm
# Skips forks and dependabot PRs
if: '!github.event.push.repository.fork'
secrets: inherit
2 changes: 1 addition & 1 deletion .hooks/commit-msg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

yarn d2-style check commit "$1"
pnpm d2-style check commit "$1"
2 changes: 1 addition & 1 deletion .hooks/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

yarn d2-style check --staged
pnpm d2-style check --staged
12 changes: 2 additions & 10 deletions i18n/en.pot
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"POT-Creation-Date: 2025-07-04T13:29:52.415Z\n"
"PO-Revision-Date: 2025-07-04T13:29:52.415Z\n"
"POT-Creation-Date: 2025-07-28T06:28:16.198Z\n"
"PO-Revision-Date: 2025-07-28T06:28:16.198Z\n"

msgid "Not authorized"
msgstr "Not authorized"
Expand Down Expand Up @@ -628,11 +628,3 @@ msgstr "Close details sidebar"

msgid "Integer numbers have to be in the range from -2147483648 to 2147483647"
msgstr "Integer numbers have to be in the range from -2147483648 to 2147483647"

msgctxt "Application title"
msgid "__MANIFEST_APP_TITLE"
msgstr "Data Entry"

msgctxt "Application description"
msgid "__MANIFEST_APP_DESCRIPTION"
msgstr ""
13 changes: 10 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@badeball/cypress-cucumber-preprocessor": "^16.0.0",
"@cypress/webpack-preprocessor": "^5.17.0",
"@dhis2/cli-app-scripts": "^12.3.0",
"@dhis2/cli-app-scripts": "^12.7.0-alpha.14",
"@dhis2/cli-style": "^10.7.6",
"@dhis2/cypress-commands": "^10.0.1",
"@dhis2/cypress-plugins": "^10.0.1",
Expand All @@ -50,8 +50,11 @@
"start-server-and-test": "1.15.4"
},
"dependencies": {
"@dhis2/app-runtime": "^3.13.1",
"@dhis2/app-adapter": "^12.6.5",
"@dhis2/app-runtime": "^3.14.5",
"@dhis2/multi-calendar-dates": "^1.3.2",
"@dhis2/prop-types": "^3.1.2",
"@dhis2/pwa": "^12.6.5",
"@dhis2/ui": "^10.1.11",
"@dhis2/ui-forms": "7.16.3",
"@tanstack/react-query": "4.24.10",
Expand All @@ -68,10 +71,13 @@
"html-react-parser": "1.4.14",
"idb-keyval": "6.2.0",
"lodash.throttle": "4.1.1",
"moment": "^2.30.1",
"prop-types": "15.8.1",
"query-string": "7.1.3",
"re-reselect": "4.0.1",
"react": "^18.3.1",
"react-chartjs-2": "4.3.1",
"react-dom": "^18.3.1",
"react-final-form": "6.5.9",
"react-router-dom": "5.3.4",
"reselect": "4.1.7",
Expand All @@ -81,5 +87,6 @@
},
"engines": {
"node": ">=14.0.0"
}
},
"packageManager": "pnpm@10.14.0-0+sha512.2cd47a0cbf5f1d1de7693a88307a0ede5be94e0d3b34853d800ee775efbea0650cb562b77605ec80bc8d925f5cd27c4dfe8bb04d3a0b76090784c664450d32d6"
}
Loading
Loading