Skip to content

Commit

Permalink
Merge branch 'master' into DHIS2-15462-use-dhis2-ui-calendarinput-com…
Browse files Browse the repository at this point in the history
…ponent-in-forms
  • Loading branch information
alaa-yahia authored Nov 25, 2024
2 parents fb6f0cf + bb3fd38 commit c5c9de7
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# [101.17.0](https://github.com/dhis2/capture-app/compare/v101.16.7...v101.17.0) (2024-11-25)


### Features

* [DHIS2-15463] Use dhis2 ui calendarInput component in working list ([#3712](https://github.com/dhis2/capture-app/issues/3712)) ([5f27455](https://github.com/dhis2/capture-app/commit/5f27455b136d6d994adea0788bf2d0683dfe5d06))

## [101.16.7](https://github.com/dhis2/capture-app/compare/v101.16.6...v101.16.7) (2024-11-25)


Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "capture-app",
"homepage": ".",
"version": "101.16.7",
"version": "101.17.0",
"cacheVersion": "7",
"serverVersion": "38",
"license": "BSD-3-Clause",
Expand All @@ -19,7 +19,7 @@
"@dhis2/d2-ui-sharing-dialog": "^7.3.3",
"@dhis2/rules-engine-javascript": "101.16.7",
"@dhis2/ui": "^9.10.1",
"@dhis2-ui/calendar": "10.0.3",
"@dhis2-ui/calendar": "^10.0.3",
"@joakim_sm/react-infinite-calendar": "^2.4.2",
"@material-ui/core": "3.9.4",
"@material-ui/icons": "3",
Expand Down Expand Up @@ -137,7 +137,7 @@
"@dhis2/app-runtime": "^3.10.2",
"@babel/preset-react": "7.16.7",
"@dhis2/ui": "^9.10.1",
"@dhis2-ui/calendar": "10.0.3",
"@dhis2-ui/calendar": "^10.0.3",
"@js-temporal/polyfill": "0.4.3",
"core-js": "2.5.7",
"i18next": "^20.5.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/rules-engine/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dhis2/rules-engine-javascript",
"version": "101.16.7",
"version": "101.17.0",
"license": "BSD-3-Clause",
"main": "./build/cjs/index.js",
"scripts": {
Expand Down

0 comments on commit c5c9de7

Please sign in to comment.