Skip to content

Commit

Permalink
Merge branch 'main' into upd191224
Browse files Browse the repository at this point in the history
  • Loading branch information
Apollon77 authored Dec 19, 2024
2 parents 08e8adf + 06a13a1 commit 065050f
Show file tree
Hide file tree
Showing 24 changed files with 396 additions and 196 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ build
/src-admin/src/components/DeviceManagerDev/*
/src-admin/src/components/DeviceManagerDev/i18n/
/src-admin/src/components/DeviceManagerDev/i18n/*
/admin/tab_m.html
7 changes: 6 additions & 1 deletion io-package.json
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,13 @@
"icon": "matter.png",
"connectionType": "local",
"dataSource": "push",
"adminTab": {
"singleton": false,
"name": "Matter"
},
"adminUI": {
"config": "materialize"
"config": "materialize",
"tab": "materialize"
},
"tier": 3,
"keywords": [
Expand Down
80 changes: 36 additions & 44 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,17 @@
"@alcalzone/release-script": "^3.8.0",
"@alcalzone/release-script-plugin-iobroker": "^3.7.2",
"@alcalzone/release-script-plugin-license": "^3.7.0",
"@iobroker/build-tools": "^2.0.11",
"@iobroker/build-tools": "^2.0.12",
"@iobroker/dev-server": "^0.7.3",
"@iobroker/eslint-config": "^1.0.0",
"@iobroker/legacy-testing": "^2.0.1",
"@iobroker/types": "^7.0.6",
"@types/jsonwebtoken": "^9.0.7",
"@types/node": "^22.10.1",
"@types/node": "^22.10.2",
"chai": "^4.5.0",
"colorette": "^2.0.20",
"mocha": "^11.0.1",
"puppeteer": "^23.10.2",
"puppeteer": "^23.11.0",
"typescript": "~5.7.2"
},
"bugs": {
Expand Down
Loading

0 comments on commit 065050f

Please sign in to comment.