Skip to content

Commit

Permalink
Merge branch 'ioBroker:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
oweitman authored Jan 16, 2025
2 parents c76ee48 + 17feb0c commit f05238a
Show file tree
Hide file tree
Showing 218 changed files with 45,989 additions and 38,796 deletions.
8 changes: 2 additions & 6 deletions .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,16 @@ jobs:
publish-config:
runs-on: ubuntu-20.04

strategy:
matrix:
node: [20.x] # This should be LTS

steps:
- name: Checkout code
uses: actions/checkout@v4
with:
fetch-depth: 0 # Fetch the history, or this action won't work

- name: Use Node.js ${{ matrix.node }}
- name: Use Node.js 20.x
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
node-version: 20.x

- name: Install dependencies
run: npm ci -f
Expand Down
31 changes: 4 additions & 27 deletions .github/workflows/test-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,44 +30,21 @@ jobs:
with:
node-version: 20.x

- name: 'Install'
run: |
npm i -f
- name: 'Install Adapter'
run: npm i -w packages/admin -f

- name: 'Install FE'
run: |
cd packages/admin/src-admin
npm i -f
- name: 'Lint Backend'
run: npm run lint-backend -w packages/admin
- name: Install Dependencies
run: npm run install-monorepo

- name: 'Build backend'
run: npm run build:backend -w packages/admin

- name: 'Build adapter-react-v5'
run: npm run build -w packages/adapter-react-v5

- name: 'Build JsonConfig'
run: npm run build -w packages/jsonConfig

- name: 'Build dm-gui-components'
run: npm run build -w packages/dm-gui-components

- name: Check TypeScript files
run: |
cd packages/admin/src-admin
npm run check-ts
# Wait till js-controller 7 types are available
continue-on-error: true

- name: 'Build'
run: |
npm run clean
NODE_OPTIONS=--max_old_space_size=4096 npm run build
- name: Build
run: NODE_OPTIONS=--max_old_space_size=8192 npm run build

# Runs adapter tests on all supported node versions and OSes
adapter-tests:
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,7 @@ lerna-debug.log
packages/admin/build-backend
/packages/admin/admin/custom/
packages/admin/README.md
/packages/jsonConfig/test/testSchema.js
/packages/jsonConfig/test/testSchema.js.map
/packages/adapter-react-v5/i18n/
/packages/adapter-react-v5/index.css
64 changes: 64 additions & 0 deletions CHANGELOG_OLD.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,68 @@
# Older changes
## 7.4.4 (2024-12-08)

- (@GermanBluefox) Showed value in object edit dialog

## 7.4.3 (2024-12-01)

- (@GermanBluefox) Changed information box on the hosts tab
- (@GermanBluefox) Corrected some errors in JsonConfig library
- (@GermanBluefox) Added flag expertMode to hide JSON config controls for non-experts
- (@GermanBluefox) Corrected cloud icon for admin
- (@GermanBluefox) Added old dialog names to adapter-react-v5 again

## 7.4.2 (2024-11-25)

- (@GermanBluefox) Made improvement for JSONConfig components
- (@GermanBluefox) Added clear button to text area JSON config component

## 7.4.1 (2024-11-19)

- (@GermanBluefox) Made improvement for JSONConfig components

## 7.4.0 (2024-11-17)

- (@GermanBluefox) Added new JsonConfig control: staticInfo

## 7.3.2 (2024-11-15)

- (@GermanBluefox) Some GUI packages were updated.
- (@GermanBluefox) Improved file viewer. Added icons viewer

## 7.3.1 (2024-11-14)

- (@GermanBluefox) Corrected cloud icon for admin
- (@GermanBluefox) Added old dialog names to adapter-react-v5 again
- (@GermanBluefox) Corrected the password field in JSON-Config

## 7.2.6 (2024-10-11)

- (@GermanBluefox) Trying to fix a GUI build process
- (@GermanBluefox) Changed license icon

## 7.2.4 (2024-10-08)

- (@GermanBluefox) Corrected some GUI errors
- (@GermanBluefox) Ignore error by opening `0_userdata.0`

## 7.2.0 (2024-10-01)

- (@GermanBluefox) Added the check of well-known passwords for the linux systems
- (@GermanBluefox) Added the history for the installation from URL
- (@foxriver76) fixed wrongly displayed repository warning

## 7.1.5 (2024-09-26)

- (bluefox) Added the read-only flag to the `state` JSON Config component

## 7.1.3 (2024-09-20)

- (@foxriver76) improve appearance and standardization of some warning messages
- (@foxriver76) indicate `alert` warnings by the badge color on the notification button
- (@foxriver76) allow distinguishing between alert notifications and others for host notifications
- (@foxriver76) do not automatically open the notification dialog without user interaction
- (@foxriver76) fixed logging as a socket client is now throwing real errors

## 7.1.2 (2024-09-20)

- (@foxriver76) fixed host base settings dialog
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2014-2024 bluefox <[email protected]>
Copyright (c) 2014-2025 bluefox <[email protected]>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
42 changes: 19 additions & 23 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ And with rest-api instance: `https://iobroker.mydomain.com/ioBrokerAPI/ => http:
You can add the following lines into Reverse Proxy tab to let Intro tab run behind reverse proxy properly:

| Global path | Instance | Instance path behind proxy |
| ----------------- | ------------- | -------------------------- |
|-------------------|---------------|----------------------------|
| `/ioBrokerAdmin/` | `web.0` | `/ioBrokerWeb/` |
| | `rest-api.0` | `/ioBrokerAPI/` |
| | `admin.0` | `/ioBrokerAdmin/` |
Expand All @@ -87,39 +87,35 @@ The icons may not be reused in other projects without the proper flaticon licens
<!--
### **WORK IN PROGRESS**
-->
### **WORK IN PROGRESS**
- (@GermanBluefox) Corrected cloud icon for admin
### 7.4.14 (2025-01-15)

### 7.2.6 (2024-10-11)
- (@GermanBluefox) Extended DM with device type
- (@GermanBluefox) Corrected Save&Close button for the instance configs
- (@GermanBluefox) Changed layout on intro page

- (@GermanBluefox) Trying to fix a GUI build process
- (@GermanBluefox) Changed license icon
### 7.4.12 (2025-01-11)

### 7.2.4 (2024-10-08)
- (@GermanBluefox) Analyze the new role and set read/write flags according to the role
- (@GermanBluefox) Added min/max/role by alias creation
- (@GermanBluefox) Improved files browser in the tile mode

- (@GermanBluefox) Corrected some GUI errors
- (@GermanBluefox) Ignore error by opening `0_userdata.0`
### 7.4.10 (2024-12-29)

### 7.2.0 (2024-10-01)
- (@GermanBluefox) Corrected JSON-Config tables
- (@GermanBluefox) Corrected translation on the update adapter dialog

- (@GermanBluefox) Added the check of well-known passwords for the linux systems
- (@GermanBluefox) Added the history for the installation from URL
- (@foxriver76) fixed wrongly displayed repository warning
### 7.4.8 (2024-12-21)

### 7.1.5 (2024-09-26)
- (@GermanBluefox) Show latest/stable labels by updating/downgrading of adapters
- (@GermanBluefox) Corrected selection of chinese language

- (bluefox) Added the read-only flag to the `state` JSON Config component
### 7.4.7 (2024-12-12)

### 7.1.3 (2024-09-20)

- (@foxriver76) improve appearance and standardization of some warning messages
- (@foxriver76) indicate `alert` warnings by the badge color on the notification button
- (@foxriver76) allow distinguishing between alert notifications and others for host notifications
- (@foxriver76) do not automatically open the notification dialog without user interaction
- (@foxriver76) fixed logging as a socket client is now throwing real errors
- (@GermanBluefox) Corrected the rendering of custom JSON config components
- (@GermanBluefox) Corrected the news dialog for multi-line messages

## License

The MIT License (MIT)

Copyright (c) 2014-2024 bluefox <[email protected]>
Copyright (c) 2014-2025 bluefox <[email protected]>
3 changes: 3 additions & 0 deletions admin/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
This directory is only to provide icon for https://www.npmjs.com/package/iobroker.admin

Real content is located in the [admin package](./packages/admin/admin)!
6 changes: 6 additions & 0 deletions admin/admin.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "7.2.6",
"version": "7.4.14",
"packages": [
"packages/*"
],
Expand Down
Loading

0 comments on commit f05238a

Please sign in to comment.