From d119d010e1ce4831c8361e726849033567bdd2a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ture=20Gj=C3=B8rup?= Date: Wed, 11 May 2022 17:04:04 +0200 Subject: [PATCH 01/34] AR-607: Added hosting section --- README.md | 4 ++ hosting.md | 133 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 137 insertions(+) create mode 100644 hosting.md diff --git a/README.md b/README.md index de91cfe..c88fe60 100644 --- a/README.md +++ b/README.md @@ -96,3 +96,7 @@ See [layouts.md](layouts.md) for a description of how layouts work and how to ma ## Feeds See [feeds.md](feeds.md) for a description of how feeds are set up. + +## Hosting + +See [hosting.md](hosting.md) for hosting instructions. diff --git a/hosting.md b/hosting.md new file mode 100644 index 0000000..0c06fe6 --- /dev/null +++ b/hosting.md @@ -0,0 +1,133 @@ +# Hosting + +## Basics +To host the API you will need to be able to host a Symfony application with a MariaDB database and a caching layer. You should be famliar with the basics of deploying Symfony: [How to Deploy a Symfony Application](https://symfony.com/doc/current/deployment.html) + +To host the Display Client and the Admin Client you need to be able to host standard react applications. You should be familiar with [Create React App - Deployment](https://create-react-app.dev/docs/deployment/) + +## Docker based hosting +Docker images are build autmatically for all three apps by Github Actions. They are tagged as follows: +- `latest` most recent tag on main branch +- `x.y.z` version tag on main branch +- `develop` most recent tag on develop + +The images are published to as: +- [itkdev/os2display-client](https://hub.docker.com/repository/docker/itkdev/os2display-client) the display (screen) client +- [itkdev/os2display-admin-client](https://hub.docker.com/repository/docker/itkdev/os2display-admin-client) the admin (editor) client +- [itkdev/os2display-api-service](https://hub.docker.com/repository/docker/itkdev/os2display-api-service) the PHP container with the Symfony application +- [itkdev/os2display-api-service-nginx](https://hub.docker.com/repository/docker/itkdev/os2display-api-service-nginx) a nginx container to host as the web sever + +An example of how to host to images can be seen at https://github.com/os2display/display-docker-server + + +## General Hosting +If you don't want to use the pre-buildt images, or have other hosting requirements these are the general instructions. + +### Api +The Symfony application expects to be hosted at the root of your application domain. E.g. http://demo.os2display.dk/ + +The api will be availiable at `/api/v1`. OpenApi documnetation at `/docs` and uploaded `/media` at `/media` + +To host the api you need a webserver that can host PHP applications such as nginx. A MariaDB database and a Redis server for caching. + +#### Installation +Check out the repository in your folder of choice. + +Make a `.env.local` file by copying the include `.env` file. Edit the `env.local` and set the relevant values for your environment. Specifically you need to set the `DATABASE_URL` to point to your MariaDB and `REDIS_CACHE_DSN` to point to a Redis instance for application caching. + +In that folder run the following commands: +```sh +# Install PHP dependencies +composer install --no-dev --optimize-autoloader + +# Clear the cache +APP_ENV=prod APP_DEBUG=0 php bin/console cache:clear + +# Run database migrations +APP_ENV=prod APP_DEBUG=0 php bin/console doctrine:migrations:migrate --no-interaction + +# Generate JWT public/private keypair +APP_ENV=prod APP_DEBUG=0 php bin/console lexik:jwt:generate-keypair +``` + +Refer Symfonys documentation for general best practises for deployment. + +#### Things to note + +##### Tenants +The application is build to support hosting multiple "tenants" in one installation. All content will scoped by tenant and cannot be seen by users from other tenants unless it is actively shared. To start using your installation you should first make a tenant using the `php bin/console app:tenant:add` command. Then create users with `php bin/console app:user:add`. Currently users created with this command are given access to all existing tenants. + +For users who log in via OpenId Connect tenants are created automatically by the roles given as claims. + +No further "manual" user management is currently supported. + +##### Authentication +Api Authentication is done using JWT. For the api to be able to issue JWT tokens you need to configure [LexikJWTAuthenticationBundle](https://github.com/lexik/LexikJWTAuthenticationBundle) correctly in the `.env.local` file. At minimum you set a custom value for `JWT_PASSPHRASE`. You can also customise the token lifetime if needed through `JWT_TOKEN_TTL` + +```env +###> lexik/jwt-authentication-bundle ### +JWT_PASSPHRASE=APP_JWT_PASSPHRASE +JWT_TOKEN_TTL=3600 +###< lexik/jwt-authentication-bundle ### +``` + +Refer to the bundles documentation for further options. + +[JWTRefreshTokenBundle](https://github.com/markitosgv/JWTRefreshTokenBundle) is used for refresh tokens for the display clients. + +OpenId Connect is supported through [AzureB2C](https://docs.microsoft.com/en-us/azure/active-directory-b2c/openid-connect). Other OPenID providers should work but are not tested. When using OpenId Connect the api expects roles to come in the format `Redaktør` and `` e.g dokk1Admin for an user with role admin for the dokk1 tenant. This is currently not configurable. + +### Display Client +This is the client to run on your displays (screens). Simply check out the repository and run `RUN yarn install && yarn build`. This will create a production build. The Display Client expects to be hosted at `/client`. + +After building you should create a `config.json` file and a `release.json` file. When booting the client will lock for these at `/client/config.json` and `/client/release.json` respectivly. You can create them by copying the examples files in `/public`. + +Please adapt the values in `config.json` for your specific hosting setup: +```json +{ + "authenticationEndpoint": "https://displayapiservice.local.itkdev.dk/v1/authentication/screen", + "authenticationRefreshTokenEndpoint": "https://displayapiservice.local.itkdev.dk/v1/authentication/token/refresh", + "dataStrategy": { + "type": "pull", + "config": { + "interval": 30000, + "endpoint": "https://displayapiservice.local.itkdev.dk" + } + }, + "colorScheme": { + "type": "library", + "lat": 56.0, + "lng": 10.0 + }, + "schedulingInterval": 60000, + "debug": true +} +``` + +And adapt the values in `release.json` to match your build (this is build automatically in the docker images: +```json +{ + "releaseTimestamp": 1652273741, + "releaseTime": "Wed May 11 12:55:41 UTC 2022", + "releaseVersion": "develop" +} +``` + +All screen clients will check `releaseTimestamp` value at an interval and reload themselves if they see a new version. + +### Admin Client +This is the client the users acces to create and schedule content. Simply check out the repository and run `RUN yarn install && yarn build`. This will create a production build. The Admin Client expects to be hosted at `/admin`. + +After building you should create a `config.json` file and a `access-config.json` file. When booting the client will lock for these at `/client/config.json` and `/client/access-config.json` respectivly. You can create them by copying the examples files in `/public`. + +Please adapt the values in `config.json` for your specific hosting setup: +```json +{ + "api": "/", + "touchButtonRegions": false +} +``` + +You should not change the `access-config.json` file unless you plan to make similar changes in Symfonys access model. + + From 6238a510026e1ee0c30028128eb9f55a49ac0db9 Mon Sep 17 00:00:00 2001 From: Pernille Thorsen Date: Wed, 11 May 2022 23:08:21 +0200 Subject: [PATCH 02/34] AR-734-Video documentation added --- templates.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/templates.md b/templates.md index 0ad2fc5..eade967 100644 --- a/templates.md +++ b/templates.md @@ -72,6 +72,10 @@ A screen can be configured to change color scheme (light/dark) at sunset and sun To support this a class ("color-scheme-dark") is set on the html root when dark mode is active. See https://github.com/os2display/display-templates/blob/develop/src/GlobalStyles.js#L170. +### Video + +When using the video template the video will not start in the client unless there is set, in chrome settings, that it is okay to play videoes. The default setting is blocking the video to be played. + ### The admin description. To populate the slide with data an admin form is needed. From ca9856e02b8371eca225cec20997fec397ce0ed4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ture=20Gj=C3=B8rup?= Date: Thu, 12 May 2022 12:05:08 +0200 Subject: [PATCH 03/34] AR-607: Review feedback --- hosting.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hosting.md b/hosting.md index 0c06fe6..f57351f 100644 --- a/hosting.md +++ b/hosting.md @@ -6,7 +6,7 @@ To host the API you will need to be able to host a Symfony application with a Ma To host the Display Client and the Admin Client you need to be able to host standard react applications. You should be familiar with [Create React App - Deployment](https://create-react-app.dev/docs/deployment/) ## Docker based hosting -Docker images are build autmatically for all three apps by Github Actions. They are tagged as follows: +Docker images are built automatically for all three apps by Github Actions. They are tagged as follows: - `latest` most recent tag on main branch - `x.y.z` version tag on main branch - `develop` most recent tag on develop @@ -17,11 +17,11 @@ The images are published to as: - [itkdev/os2display-api-service](https://hub.docker.com/repository/docker/itkdev/os2display-api-service) the PHP container with the Symfony application - [itkdev/os2display-api-service-nginx](https://hub.docker.com/repository/docker/itkdev/os2display-api-service-nginx) a nginx container to host as the web sever -An example of how to host to images can be seen at https://github.com/os2display/display-docker-server +An example of how to host the images can be seen at https://github.com/os2display/display-docker-server ## General Hosting -If you don't want to use the pre-buildt images, or have other hosting requirements these are the general instructions. +If you don't want to use the pre-built images, or have other hosting requirements these are the general instructions. ### Api The Symfony application expects to be hosted at the root of your application domain. E.g. http://demo.os2display.dk/ @@ -116,7 +116,7 @@ And adapt the values in `release.json` to match your build (this is build automa All screen clients will check `releaseTimestamp` value at an interval and reload themselves if they see a new version. ### Admin Client -This is the client the users acces to create and schedule content. Simply check out the repository and run `RUN yarn install && yarn build`. This will create a production build. The Admin Client expects to be hosted at `/admin`. +This is the client the users accesses to create and schedule content. Simply check out the repository and run `RUN yarn install && yarn build`. This will create a production build. The Admin Client expects to be hosted at `/admin`. After building you should create a `config.json` file and a `access-config.json` file. When booting the client will lock for these at `/client/config.json` and `/client/access-config.json` respectivly. You can create them by copying the examples files in `/public`. From 439c3c4461d0f16708294a20e4f2a7ce7559811d Mon Sep 17 00:00:00 2001 From: Pernille Thorsen Date: Mon, 16 May 2022 10:50:02 +0200 Subject: [PATCH 04/34] Update templates.md --- templates.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates.md b/templates.md index eade967..072007c 100644 --- a/templates.md +++ b/templates.md @@ -74,7 +74,7 @@ is active. See https://github.com/os2display/display-templates/blob/develop/src/ ### Video -When using the video template the video will not start in the client unless there is set, in chrome settings, that it is okay to play videoes. The default setting is blocking the video to be played. +When using the video template the video will not play in the client unless the autoplay flag is enabled in the chrome configuration. ### The admin description. From babad6358d12fb0793f71ebce75c03d2bb1fdf4c Mon Sep 17 00:00:00 2001 From: Jesper Pedersen Date: Thu, 7 Jul 2022 11:25:30 +0200 Subject: [PATCH 05/34] Add documentation for orientation --- templates.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/templates.md b/templates.md index 072007c..c68e7af 100644 --- a/templates.md +++ b/templates.md @@ -72,13 +72,24 @@ A screen can be configured to change color scheme (light/dark) at sunset and sun To support this a class ("color-scheme-dark") is set on the html root when dark mode is active. See https://github.com/os2display/display-templates/blob/develop/src/GlobalStyles.js#L170. +### Screen orientation + +To handle screens in both Landscape and Portrait mode it is preffered to use the orientation media-query. + +Styling for Portrait can be placed inside a query like this: + +```css +@media (orientation: portrait) { ... } +``` + + ### Video When using the video template the video will not play in the client unless the autoplay flag is enabled in the chrome configuration. ### The admin description. -To populate the slide with data an admin form is needed. +To populate the slide with data an admin form is needed. This is configured in a json file: From dde9a2c72987650bc5014c627c012b167e3e60b8 Mon Sep 17 00:00:00 2001 From: Sine Jespersen Date: Thu, 7 Jul 2022 13:51:28 +0200 Subject: [PATCH 06/34] Update templates.md --- templates.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates.md b/templates.md index c68e7af..6dceb22 100644 --- a/templates.md +++ b/templates.md @@ -74,7 +74,7 @@ is active. See https://github.com/os2display/display-templates/blob/develop/src/ ### Screen orientation -To handle screens in both Landscape and Portrait mode it is preffered to use the orientation media-query. +To handle screens in both Landscape and Portrait mode it is preferred to use the orientation media-query. Styling for Portrait can be placed inside a query like this: From 9d44861bb09d0f5bfa76d19e31d536134e797b9c Mon Sep 17 00:00:00 2001 From: Pernille Thorsen Date: Fri, 9 Sep 2022 08:45:59 +0200 Subject: [PATCH 07/34] Update changelog.md --- changelog.md | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/changelog.md b/changelog.md index 01fc900..b992108 100644 --- a/changelog.md +++ b/changelog.md @@ -1,7 +1,16 @@ # Changelog -## 1.0 +## 9.9.2022 +* Anmeldelse vertikal (fixet med vurdering af skærm orientering) +* video mute +* Plakat ændringer (dato er ændret . gratis + kr. tilføjes i kilde i stedet, samt link kan allerede ændres i tekst) +* Default længde ændres til 15 sekunder +* Kalendertemplate rækkefølge +* Kalender skærm (det er nu flyttet på den enkelte skærm, hvor det kan aktiveres eller deaktiveres) +* 4K visning (NB: der er kommet nye felter på skærmen, som skal sættes, hvis det skal virke: Skærmens opløsning og Skærmens orientering) + + +## 2.5.2022 * all features from [roadmap](https://github.com/os2display/display-docs/blob/main/roadmap.md) prior to 3.5.2022 * changes to url structure -* From b3cd11be5c6e7b240c272703fc4ddf11c084b122 Mon Sep 17 00:00:00 2001 From: Pernille Thorsen Date: Mon, 31 Oct 2022 15:13:21 +0100 Subject: [PATCH 08/34] Update changelog.md --- changelog.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index b992108..0250342 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,10 @@ # Changelog -## 9.9.2022 +## 27.10.2022 +* Grid update +* Link correction in Gant + +## 28.9.2022 * Anmeldelse vertikal (fixet med vurdering af skærm orientering) * video mute * Plakat ændringer (dato er ændret . gratis + kr. tilføjes i kilde i stedet, samt link kan allerede ændres i tekst) From e1d1f6729f732c06108072c8f9b768abaab565dd Mon Sep 17 00:00:00 2001 From: Pernille Thorsen Date: Thu, 22 Dec 2022 09:21:30 +0100 Subject: [PATCH 09/34] Update changelog.md --- changelog.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/changelog.md b/changelog.md index 0250342..4b23e6f 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,20 @@ # Changelog +## Unreleased + +### added +* Docker update. https://github.com/os2display/display-api-service/pull/122 and https://github.com/os2display/display-admin-client/pull/169 +* Fixtures update. https://github.com/os2display/display-api-service/pull/123 +* Create better errorhandling for KOBA. https://github.com/os2display/display-api-service/pull/125 +* Changed command for updating screen layouts. https://github.com/os2display/display-api-service/pull/121 + + +### fixed +* Make get theme available for editors. https://github.com/os2display/display-api-service/pull/124 +* Search in screens. https://github.com/os2display/display-admin-client/pull/172 +* Page 1 on delete. https://github.com/os2display/display-admin-client/pull/171 +* Correct link in gant. https://github.com/os2display/display-admin-client/pull/170 + ## 27.10.2022 * Grid update * Link correction in Gant From 85c40df1677ba24dd3d7dd89dbcffa9f83d525f0 Mon Sep 17 00:00:00 2001 From: Troels Ugilt Jensen <6103205+tuj@users.noreply.github.com> Date: Thu, 5 Jan 2023 10:50:44 +0100 Subject: [PATCH 10/34] AR-891: Updated changelog --- CHANGELOG.md | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ changelog.md | 35 ----------------------------------- 2 files changed, 50 insertions(+), 35 deletions(-) create mode 100644 CHANGELOG.md delete mode 100644 changelog.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..9f04d3c --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,50 @@ +# Changelog + +## 2023.01.05 + +* Released api `1.2.0`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#120---2023-01-05). +* Released admin `1.2.0`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#120---2023-01-05). +* Released client `1.2.0`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#120---2023-01-05). +* Released templates `1.2.0`. See [changelog](https://github.com/os2display/display-templates/blob/develop/CHANGELOG.md#120---2023-01-05). + +## 2022-10-06 + +* Released admin `1.1.0`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#110---2022-10-06). +* Released client `1.1.0`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#110---2022-10-06). + +## 2022-09-29 + +* Released api `1.1.0`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#110---2022-09-29). + +## 2022-09-08 + +* Released client `1.0.2`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#102---2022-09-08). + +## 2022-09-05 + +* Released api `1.0.4`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#104---2022-09-05). +* Released admin `1.0.3`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#103---2022-09-05). + +## 2022-09-01 + +* Released api `1.0.3`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#103---2022-09-01). +* Released api `1.0.2`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#102---2022-09-01). +* Released api `1.0.1`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#101---2022-09-01). + +## 2022-06-02 + +* Released admin `1.0.2`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#102---2022-06-02). +* Released templates `1.0.2`. See [changelog](https://github.com/os2display/display-templates/blob/develop/CHANGELOG.md#102---2022-06-02). +* Released templates `1.0.1`. See [changelog](https://github.com/os2display/display-templates/blob/develop/CHANGELOG.md#101---2022-06-02). + +## 2022-06-01 + +* Released admin `1.0.1`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#101---2022-06-01). +* Released client `1.0.1`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#101---2022-06-01). +* Released templates `1.0.0`. See [changelog](https://github.com/os2display/display-templates/blob/develop/CHANGELOG.md#100---2022-06-01). + +## 2022-05-18 + +* Released api `1.0.0`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#100---2022-05-18). +* Released admin `1.0.0`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#100---2022-05-18). +* Released client `1.0.0`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#100---2022-05-18). diff --git a/changelog.md b/changelog.md deleted file mode 100644 index 4b23e6f..0000000 --- a/changelog.md +++ /dev/null @@ -1,35 +0,0 @@ -# Changelog - -## Unreleased - -### added -* Docker update. https://github.com/os2display/display-api-service/pull/122 and https://github.com/os2display/display-admin-client/pull/169 -* Fixtures update. https://github.com/os2display/display-api-service/pull/123 -* Create better errorhandling for KOBA. https://github.com/os2display/display-api-service/pull/125 -* Changed command for updating screen layouts. https://github.com/os2display/display-api-service/pull/121 - - -### fixed -* Make get theme available for editors. https://github.com/os2display/display-api-service/pull/124 -* Search in screens. https://github.com/os2display/display-admin-client/pull/172 -* Page 1 on delete. https://github.com/os2display/display-admin-client/pull/171 -* Correct link in gant. https://github.com/os2display/display-admin-client/pull/170 - -## 27.10.2022 -* Grid update -* Link correction in Gant - -## 28.9.2022 -* Anmeldelse vertikal (fixet med vurdering af skærm orientering) -* video mute -* Plakat ændringer (dato er ændret . gratis + kr. tilføjes i kilde i stedet, samt link kan allerede ændres i tekst) -* Default længde ændres til 15 sekunder -* Kalendertemplate rækkefølge -* Kalender skærm (det er nu flyttet på den enkelte skærm, hvor det kan aktiveres eller deaktiveres) -* 4K visning (NB: der er kommet nye felter på skærmen, som skal sættes, hvis det skal virke: Skærmens opløsning og Skærmens orientering) - - -## 2.5.2022 - -* all features from [roadmap](https://github.com/os2display/display-docs/blob/main/roadmap.md) prior to 3.5.2022 -* changes to url structure From ba86607dfb22fe3b3229460a9563f10ca1de588b Mon Sep 17 00:00:00 2001 From: Troels Ugilt Jensen <6103205+tuj@users.noreply.github.com> Date: Thu, 5 Jan 2023 10:53:28 +0100 Subject: [PATCH 11/34] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f04d3c..43dab60 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## 2023.01.05 +## 2023-01-05 * Released api `1.2.0`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#120---2023-01-05). * Released admin `1.2.0`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#120---2023-01-05). From a9b1fffa9595c53dcf1f16391fcb0c7f992eb9cd Mon Sep 17 00:00:00 2001 From: Pernille Thorsen Date: Fri, 13 Jan 2023 11:04:19 +0100 Subject: [PATCH 12/34] Delete installation.md --- installation.md | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 installation.md diff --git a/installation.md b/installation.md deleted file mode 100644 index f2b2ed9..0000000 --- a/installation.md +++ /dev/null @@ -1,7 +0,0 @@ -# Installation - -## Technical demands - -TODO: Describe the stack - -## Production installation From 7b0840f13b017caceb8c3ce06cf484c9ebbc28e6 Mon Sep 17 00:00:00 2001 From: Troels Ugilt Jensen <6103205+tuj@users.noreply.github.com> Date: Wed, 8 Feb 2023 12:55:42 +0100 Subject: [PATCH 13/34] Update CHANGELOG.md --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 43dab60..a29cd4c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## 2023-02-08 + +* Released api `1.2.2`. See [changelog](https://github.com/os2display/display-api-service/blob/1.2.2/CHANGELOG.md#122---2023-02-08). +* Released admin `1.2.2`. See [changelog](https://github.com/os2display/display-admin-client/blob/1.2.2/CHANGELOG.md#122---2023-02-08). + +## 2023-02-02 + +* Released api `1.2.1`. See [changelog](https://github.com/os2display/display-api-service/blob/1.2.2/CHANGELOG.md#121---2023-02-02). + ## 2023-01-05 * Released api `1.2.0`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#120---2023-01-05). From 070f256797a1dc38ffb6356b4304cd210f362422 Mon Sep 17 00:00:00 2001 From: Troels Ugilt Jensen <6103205+tuj@users.noreply.github.com> Date: Wed, 8 Feb 2023 12:56:28 +0100 Subject: [PATCH 14/34] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a29cd4c..b6d356d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,10 @@ * Released api `1.2.1`. See [changelog](https://github.com/os2display/display-api-service/blob/1.2.2/CHANGELOG.md#121---2023-02-02). +## 2023-01-13 + +* Released admin `1.2.1`. See [changelog](https://github.com/os2display/display-admin-client/blob/1.2.2/CHANGELOG.md#121---2023-01-13). + ## 2023-01-05 * Released api `1.2.0`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#120---2023-01-05). From 15c4a25fb65460c67ae5b997a259a79f43aba805 Mon Sep 17 00:00:00 2001 From: Troels Ugilt Jensen <6103205+tuj@users.noreply.github.com> Date: Wed, 8 Feb 2023 13:11:08 +0100 Subject: [PATCH 15/34] Update CHANGELOG.md --- CHANGELOG.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b6d356d..9f2f3bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,16 +2,17 @@ ## 2023-02-08 -* Released api `1.2.2`. See [changelog](https://github.com/os2display/display-api-service/blob/1.2.2/CHANGELOG.md#122---2023-02-08). -* Released admin `1.2.2`. See [changelog](https://github.com/os2display/display-admin-client/blob/1.2.2/CHANGELOG.md#122---2023-02-08). +* Released api `1.2.2`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#122---2023-02-08). +* Released admin `1.2.2`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#122---2023-02-08). +* Released templates `1.2.2`. See [changelog](https://github.com/os2display/display-templates/blob/develop/CHANGELOG.md#122---2023-02-08). ## 2023-02-02 -* Released api `1.2.1`. See [changelog](https://github.com/os2display/display-api-service/blob/1.2.2/CHANGELOG.md#121---2023-02-02). +* Released api `1.2.1`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#121---2023-02-02). ## 2023-01-13 -* Released admin `1.2.1`. See [changelog](https://github.com/os2display/display-admin-client/blob/1.2.2/CHANGELOG.md#121---2023-01-13). +* Released admin `1.2.1`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#121---2023-01-13). ## 2023-01-05 From 91c534e5c98b38b7f19f9987d5a6eaf818cb839d Mon Sep 17 00:00:00 2001 From: Troels Ugilt Jensen <6103205+tuj@users.noreply.github.com> Date: Wed, 8 Feb 2023 13:14:23 +0100 Subject: [PATCH 16/34] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f2f3bb..a4b74ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ ## 2023-01-13 * Released admin `1.2.1`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#121---2023-01-13). +* Released cient `1.2.1`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#121---2023-01-13). ## 2023-01-05 From 380de339f26f7392080a15aa04cf92f1323de2a4 Mon Sep 17 00:00:00 2001 From: Troels Ugilt Jensen <6103205+tuj@users.noreply.github.com> Date: Sun, 5 Mar 2023 09:51:08 +0100 Subject: [PATCH 17/34] AR-925: Added license --- LICENSE | 373 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 373 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..a612ad9 --- /dev/null +++ b/LICENSE @@ -0,0 +1,373 @@ +Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice +--------------------------------------------------------- + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. From 0413925db8e393ef97b47c3a2413954d2bbb81bf Mon Sep 17 00:00:00 2001 From: Troels Ugilt Jensen <6103205+tuj@users.noreply.github.com> Date: Tue, 7 Mar 2023 13:42:08 +0100 Subject: [PATCH 18/34] Updated changelog --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a4b74ec..f966b1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog +## 2023-03-07 + +* Released api `1.2.4`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#124---2023-03-07). +* Released admin `1.2.3`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#123---2023-03-07). +* Released templates `1.2.3`. See [changelog](https://github.com/os2display/display-templates/blob/develop/CHANGELOG.md#123---2023-03-07). +* Released client `1.2.2`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#122---2023-03-07). + +## 2023-02-14 + +* Released api `1.2.3`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#123---2023-02-14). + ## 2023-02-08 * Released api `1.2.2`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#122---2023-02-08). From 4beab57510de0ddc2c844520354e9df63c65bd38 Mon Sep 17 00:00:00 2001 From: Pernille Thorsen Date: Fri, 17 Mar 2023 14:25:56 +0100 Subject: [PATCH 19/34] Create publiccode.yml --- publiccode.yml | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 publiccode.yml diff --git a/publiccode.yml b/publiccode.yml new file mode 100644 index 0000000..ce61a02 --- /dev/null +++ b/publiccode.yml @@ -0,0 +1,49 @@ +publiccodeYmlVersion: "0.2" + +name: OS2display +url: "https://os2display.aarhuskommune.dk" +softwareVersion: "main" # Optional +releaseDate: "2022-06-15" +platforms: + - web + +categories: + - Communication + +developmentStatus: stable + +softwareType: "standalone/other" + +description: + en: + localisedName: os2display # Optional + shortDescription: > + OS2display er et API, administration og skærm-klient, som gør det muligt at oprette indhold og vise det på skærme. + + longDescription: > + OS2display er blandt andet + + features: + - Skærm konfiguration + - Spilleliste konfiguration + - Slides + - Tekst og billede + - Video + - Slideshow + - Plakater fra eventdatabasen + - RSS skabelon + - Temaer til styling af indhold + +legal: + license: MPL-2.0 + +maintenance: + type: "community" + + contacts: + - name: ITK development, itkdev@aarhus.dk + +localisation: + localisationReady: false + availableLanguages: + - da From bb7c3b03104a08c996d29b595de3760908d83486 Mon Sep 17 00:00:00 2001 From: Troels Ugilt Jensen <6103205+tuj@users.noreply.github.com> Date: Fri, 24 Mar 2023 10:22:23 +0100 Subject: [PATCH 20/34] DISPLAY-953: Updated changelog --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f966b1f..073f372 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog +## 2023-03-24 + +* Released api `1.2.6`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#126---2023-03-24). +* Released admin `1.2.4`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#124---2023-03-24). +* Released client `1.2.3`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#123---2023-03-24). +* Released tempaltes `1.2.4`. See [changelog](https://github.com/os2display/display-templates/blob/develop/CHANGELOG.md#124---2023-03-24). + +## 2023-03-16 + +* Released api `1.2.5`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#125---2023-03-16). + ## 2023-03-07 * Released api `1.2.4`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#124---2023-03-07). From 604da6616ac1bccad4f2cd9ec21f8af02818add1 Mon Sep 17 00:00:00 2001 From: Troels Ugilt Jensen <6103205+tuj@users.noreply.github.com> Date: Fri, 24 Mar 2023 13:39:11 +0100 Subject: [PATCH 21/34] Updated changelog --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 073f372..2e9ba2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,9 @@ * Released api `1.2.6`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#126---2023-03-24). * Released admin `1.2.4`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#124---2023-03-24). * Released client `1.2.3`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#123---2023-03-24). -* Released tempaltes `1.2.4`. See [changelog](https://github.com/os2display/display-templates/blob/develop/CHANGELOG.md#124---2023-03-24). +* Released templates `1.2.4`. See [changelog](https://github.com/os2display/display-templates/blob/develop/CHANGELOG.md#124---2023-03-24). +* Released admin `1.2.5`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#125---2023-03-24). +* Released templates `1.2.5`. See [changelog](https://github.com/os2display/display-templates/blob/develop/CHANGELOG.md#125---2023-03-24). ## 2023-03-16 From 0e2f00a762d33e77e03c3a250c9c755542e18203 Mon Sep 17 00:00:00 2001 From: Troels Ugilt Jensen <6103205+tuj@users.noreply.github.com> Date: Thu, 1 Jun 2023 10:14:31 +0200 Subject: [PATCH 22/34] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e9ba2a..238961e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 2023-06-01 + +* Released templates `1.2.6`. See [changelog](https://github.com/os2display/display-templates/blob/develop/CHANGELOG.md#126---2023-06-01). + ## 2023-03-24 * Released api `1.2.6`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#126---2023-03-24). From a22a1d2409cc426edf6eda4faadd7fdd73fba438 Mon Sep 17 00:00:00 2001 From: Troels Ugilt Jensen <6103205+tuj@users.noreply.github.com> Date: Tue, 6 Jun 2023 11:53:14 +0200 Subject: [PATCH 23/34] Update CHANGELOG.md --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 238961e..85bddec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,18 @@ # Changelog +## 2023-06-06 + +* Released client `1.2.5`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#125---2023-06-06). + ## 2023-06-01 * Released templates `1.2.6`. See [changelog](https://github.com/os2display/display-templates/blob/develop/CHANGELOG.md#126---2023-06-01). +## 2023-05-25 + +- Released client `1.2.4`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#123---2023-03-24) + + ## 2023-03-24 * Released api `1.2.6`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#126---2023-03-24). From 1abd06d65b63b8a0d5c5bd01bb31e61dab950e23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ture=20Gj=C3=B8rup?= Date: Tue, 6 Jun 2023 21:48:21 +0200 Subject: [PATCH 24/34] DISPLAY-986: Added 'just the docs' theme for building static site, refactored content structure --- .github/workflows/pages.yml | 62 +++++++ .github/workflows/pr.yaml | 19 +++ .gitignore | 10 ++ CHANGELOG.md | 6 + GOVERNANCE_REPORT.md | 158 ++++++++---------- Gemfile | 7 + Gemfile.lock | 79 +++++++++ README.md | 109 ++---------- _config.yml | 19 +++ _sass/color_schemes/os2display.scss | 13 ++ admin.md | 13 -- assets/site/favicon.ico | Bin 0 -> 1150 bytes assets/site/logo.svg | 64 +++++++ components/admin.md | 21 +++ api-service.md => components/api-service.md | 7 + components/api-service/security.md | 11 ++ client.md => components/client.md | 9 +- components/components.md | 36 ++++ content_structure/content_structure.md | 61 +++++++ feeds.md => content_structure/feeds.md | 7 + layouts.md => content_structure/layouts.md | 7 + .../templates.md | 7 + content_structure/themes.md | 9 + development.md => development/development.md | 7 + hosting.md => hosting/hosting.md | 7 + index.md | 25 +++ roadmap.md | 99 +++++------ security.md | 3 - 28 files changed, 627 insertions(+), 248 deletions(-) create mode 100644 .github/workflows/pages.yml create mode 100644 .github/workflows/pr.yaml create mode 100644 .gitignore create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 _config.yml create mode 100644 _sass/color_schemes/os2display.scss delete mode 100644 admin.md create mode 100644 assets/site/favicon.ico create mode 100644 assets/site/logo.svg create mode 100644 components/admin.md rename api-service.md => components/api-service.md (87%) create mode 100644 components/api-service/security.md rename client.md => components/client.md (90%) create mode 100644 components/components.md create mode 100644 content_structure/content_structure.md rename feeds.md => content_structure/feeds.md (93%) rename layouts.md => content_structure/layouts.md (93%) rename templates.md => content_structure/templates.md (98%) create mode 100644 content_structure/themes.md rename development.md => development/development.md (84%) rename hosting.md => hosting/hosting.md (98%) create mode 100644 index.md delete mode 100644 security.md diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml new file mode 100644 index 0000000..bfb8de3 --- /dev/null +++ b/.github/workflows/pages.yml @@ -0,0 +1,62 @@ +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. + +# Sample workflow for building and deploying a Jekyll site to GitHub Pages +name: Deploy Jekyll site to Pages + +on: + push: + branches: ["main"] + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages +permissions: + contents: read + pages: write + id-token: write + +# Allow one concurrent deployment +concurrency: + group: "pages" + cancel-in-progress: true + +jobs: + # Build job + build: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Setup Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: '3.1' # Not needed with a .ruby-version file + bundler-cache: true # runs 'bundle install' and caches installed gems automatically + cache-version: 0 # Increment this number if you need to re-download cached gems + - name: Setup Pages + id: pages + uses: actions/configure-pages@v2 + - name: Build with Jekyll + # Outputs to the './_site' directory by default + run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}" + env: + JEKYLL_ENV: production + - name: Upload artifact + # Automatically uploads an artifact from the './_site' directory by default + uses: actions/upload-pages-artifact@v1 + + # Deployment job + deploy: + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} + runs-on: ubuntu-latest + needs: build + steps: + - name: Deploy to GitHub Pages + id: deployment + uses: actions/deploy-pages@v1 diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml new file mode 100644 index 0000000..026af60 --- /dev/null +++ b/.github/workflows/pr.yaml @@ -0,0 +1,19 @@ +on: pull_request +name: Review +jobs: + markdownlint: + name: Markdown Lint + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Yarn install + uses: actions/setup-node@v3 + with: + node-version: '18' + cache: 'yarn' + - run: yarn install + + - name: markdownlint + run: yarn check-coding-standards \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f55f639 --- /dev/null +++ b/.gitignore @@ -0,0 +1,10 @@ +# Copied from https://github.com/github/gitignore/blob/main/Jekyll.gitignore +# Ignore metadata generated by Jekyll +_site/ +.sass-cache/ +.jekyll-cache/ +.jekyll-metadata + +# Ignore folders generated by Bundler +.bundle/ +vendor/ diff --git a/CHANGELOG.md b/CHANGELOG.md index 238961e..9d1e2fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +--- +title: Changelog +layout: default +nav_order: 5 +--- + # Changelog ## 2023-06-01 diff --git a/GOVERNANCE_REPORT.md b/GOVERNANCE_REPORT.md index 2d05dc1..5ea67d4 100644 --- a/GOVERNANCE_REPORT.md +++ b/GOVERNANCE_REPORT.md @@ -1,92 +1,78 @@ -# OS2displays's Governance Report +--- +title: Governance Report +layout: default +nav_order: 5 +--- + +# OS2displays' Governance Report Dene checkliste er baseret på [OS2s standard governance rapport](https://github.com/OS2offdig/Governance_Reports). Det er en checklist som skal tydeliggøre i hvilken grad produktet efterlever OS2s governance model. OS2display er klassificeret som et niveau x produkt i OS2 jf. nedenstående. - -**RELEVANS** - -| | # | Krav | Henvisning | Niveau | -| --- | --- | --- | --- | --- | -|
  • [x]
  • | R1 | Løsningen skaber lokal værdi | Den bidrager til skærmløsninger i flere kommuner og bruges både i interne lokaler og på offentlige områder som biblioteker, lokalcentre og offentlige pladser | 0 | -|
    • [x]
    • | R2 | Løsningen skaber potentielt værdi for andre | Det er en løsning med stor fleksibiblitet og mulighed for at bruge uden licenser, hvorfor det er et billigt alternativ til andre løsninger med licenser | 1 | -|
      • [x]
      • | R3 |Løsningen er accepteret af lokal linjeledelse | Løsningen har lokal ledelses opbakning idet at der er kommuner der har underskrevet en tilslutningserklæring og bakker op med økonomi og viden i projektet | 2 | -|
        • [x]
        • | R4 | _Løsningen har tværkommunal potentiale (anbefaling)_ | Der vil på sigt kunne deles indhold på tværs af kommuner, hvis dette ønskes | 2 | -|
          • [x]
          • | R5 |Ophæng til nationale strategier er til stede | ?| 3 | - - -
            -
            - - -**FORMKRAV** - -| | # | Krav | Henvisning | Niveau | -| --- | --- | --- | --- | --- | -|
            • [x]
            • | F1 | Kildekoden deles | https://github.com/OS2display | 0 | -|
              • [x]
              • | F2 |Open Source licenskriterier overholdes | MPL 2.0 og CC-BY-SA-4.0 vedtaget | 0 | -|
                • [X]
                • | F3 |Udbudsregler og alm. lovformlighed er overholdt | ? | 0 | -|
                  • [x]
                  • | F4 |Der er tænkt på sikkerheden i løsningen | [Se dokumentationen](https://github.com/os2display/display-docs)| 0 | -|
                    • [x]
                    • | F5 | Løsningens formål og værdi er beskrevet | ?| 0 | -|
                      • [x]
                      • | F6 | Kildekoden er placeret på OS2's github | https://github.com/OS2display | 1 | -|
                        • [x]
                        • | F7 | Driftskrav til løsningen er dokumenteret | [Se dokumentationen](https://github.com/os2display/display-docs)| 1 | -|
                          • [x]
                          • | F8 | Løsningen er dokumenteret på teknisk niveau | [Se dokumentationen](https://github.com/os2display/display-docs) | 1 | -|
                            • [x]
                            • | F9 | Teknisk implementering af løsningen er dokumenteret | [Se installationsguide](https://github.com/os2display/display-docs/blob/main/installation.md)| 1 | -|
                              • [x]
                              • | F10 | OS2's kommunikationskanaler anvendes (OS2.eu) | https://os2.eu/produkt/os2display | 1 | -|
                                • [x]
                                • | F11 | OS2's værktøjer benyttes (Jira) | [OS2's Jira](https://os2web.atlassian.net/jira/software/c/projects/DISPLAY/boards/41) | 1 | -|
                                  • [x]
                                  • | F12 | Der er kun en version af core koden (Master) | Ja. https://github.com/OS2display| 2 | -|
                                    • [ ]
                                    • | F13 | Der er udarbejdet præsentationsmateriale af løsningen | Hvor? | 2 | -|
                                      • [ ]
                                      • | F14 | Der er udarbejdet kommunikationsmateriale til strategisk niveau | Hvor? | 2 | -|
                                        • [ ]
                                        • | F15 | Best practice for implementering i organisationen dokumenteres | Hvor? | 2 | -|
                                          • [ ]
                                          • | F16 | Teknisk dokumentation indeholder best practice for kodestandarder i forhold til de anvendte teknologier | [Se dokumentationen](https://github.com/os2display/display-docs) | 2 | -|
                                            • [ ]
                                            • | F17 | Drifts og vedligeholdelses setup er beskrevet | Hvem drifter løsningen? er der sat økonomi af til vedligholdelse? | 2 | -|
                                              • [ ]
                                              • | F18 | Rammearkitekturen og standarder er fulgt og afvigelser er forklaret | Der er ikke data fra rammearkitekturen efterspurgt i løsningen. Det er valgt at afvige fra Login via rammearkitekturen, fordi standarden OIDC ikke var tilgængelig på udviklingstidspunktet og det vurderes at dette er fremtidens loginform. | 2 | -|
                                                • [ ]
                                                • | F19 | _Løsningen er leveret i et containerformat fx docker (anbefaling)_ | Ja. | 2 | -|
                                                  • [ ]
                                                  • | F20 | _Uddanelses materiale er udarbejdet (anbefaling)_ | Hvor? | 2 | -|
                                                    • [ ]
                                                    • | F21 | Politisk kommunikation er udarbejdet (Lokal + Omverden) | Hvor? | 3 | -|
                                                      • [ ]
                                                      • | F22 | Procesplan + procesansvar for driftsimplementering er udarbejdet ([eksempel](https://os2mo.readthedocs.io/en/development/operation/cookbook.html)) | Hvor? | 3 | - - -
                                                        -
                                                        - - - -**STRATEGISK SAMMENHÆNG** - -| | # | Krav | Henvisning | Niveau | -| --- | --- | --- | --- | --- | -|
                                                        • [ ]
                                                        • | S1 | Produktet har en kobling til [OS2's strategi](https://os2.eu/side/os2-mission-vision) | OS2display er et nemt setup, hvor det er let for nye kommuner at komme på. Der er fra starten af diskuteret arkitektur med de involverede leverandører, for at sikre at det bleve bygget stabilt og bygget på standarder. | 1 | -|
                                                          • [ ]
                                                          • | S2 | Løsningen understøtter innovation og open source | Systemet er open source og der tænkes hele tiden i sammenhænge mellem hvad der skal ud på skærme og hvor let dette indhold skal genereres for at kunne bidrage til effektivisering. | 1 | -|
                                                            • [ ]
                                                            • | S3 | Produktets (forventlige) kobling til [OS2's mission, vision og strategi](https://os2.eu/side/os2-mission-vision) er beskrevet | [Se dokumentationen](https://github.com/os2display/display-docs) | 2 | -|
                                                              • [ ]
                                                              • | S4 | Der er udarbejdet en vision og strategi for produktet | [Se dokumentationen](https://github.com/os2display/display-docs) | 2 | -|
                                                                • [ ]
                                                                • | S5 | Produktets kobling til og overensstemmelse med OS2's vision og strategi er tilstede og beskrevet | [Se dokumentationen](https://github.com/os2display/display-docs) | 3 | - - - -
                                                                  -
                                                                  - - - - -**GOVERNANCE** - -| | # | Krav | Henvisning | Niveau | -| --- | --- | --- | --- | --- | -|
                                                                  • [ ]
                                                                  • | G1 | Produktet er oprettet i OS2's porteføljestyring (Hjemmeside) | https://os2.eu/produkt/os2display | 1 | -|
                                                                    • [ ]
                                                                    • | G2 | Der koordineres løbende med OS2-sekretariatet | Koordinationsgruppen bruger aktivt sekretariatet til indkaldelse af møder mv. | 1 | -|
                                                                      • [ ]
                                                                      • | G3 | Der er udpeget en projektleder/tovholder | Hvem? evt. link til beskrivelse af ansvar/opgaver | 1 | -|
                                                                        • [ ]
                                                                        • | G4 | Bestyrelsen er orienteret | fx link til referat | 1 | -|
                                                                          • [ ]
                                                                          • | G5 | Bestyrelsen har godkendt produktet | fx link til referat | 2 | -|
                                                                            • [ ]
                                                                            • | G6 | Der er nedsat en styregruppe | Link til kommissorium | 2 | -|
                                                                              • [ ]
                                                                              • | G7 | _Der er nedsat en koordinationsgruppe (anbefaling)_ | Link til kommissorium | 2 | -|
                                                                                • [ ]
                                                                                • | G8 | _En projektmodel anvendes og er dokumenteret (anbefaling)_ | Hvor? | 2 | -|
                                                                                  • [ ]
                                                                                  • | G9 | _Review af kode foretages af tredjepart (anbefaling)_ | | 2 | -|
                                                                                    • [ ]
                                                                                    • | G10 | _Der er udarbejdet en tilslutningserklæring til sikring af økonomi (anbefaling)_ | Hvor? | 2 | -|
                                                                                      • [ ]
                                                                                      • | G11 | Bestyrelsen har godkendt styregruppen | fx link til referat | 3 | -|
                                                                                        • [ ]
                                                                                        • | G12 | Bestyrelsen er repræsenteret i styregruppen | fx link til referat | 3 | -|
                                                                                          • [ ]
                                                                                          • | G13 | Der foreligger en aftale der sikre økonomi til koordinerg og videreudvikling | Link til aftale | 3 | -|
                                                                                            • [ ]
                                                                                            • | G14 | Der er etableret et fagligt fælleskab bag løsningen hvor erfaringer kan udveksles | Henvisning til en faggruppe eller et forum | 3 | +## RELEVANS + +| | # | Krav | Henvisning | Niveau | +|:--:|:--:|:-----------------------------------------------------|:--------------------------------------------------------------------------------------------------------------------------------------------------------------|:------:| +| ☑︎ | R1 | Løsningen skaber lokal værdi | Den bidrager til skærmløsninger i flere kommuner og bruges både i interne lokaler og på offentlige områder som biblioteker, lokalcentre og offentlige pladser | 0 | +| ☑︎ | R2 | Løsningen skaber potentielt værdi for andre | Det er en løsning med stor fleksibiblitet og mulighed for at bruge uden licenser, hvorfor det er et billigt alternativ til andre løsninger med licenser | 1 | +| ☑︎ | R3 | Løsningen er accepteret af lokal linjeledelse | Løsningen har lokal ledelses opbakning idet at der er kommuner der har underskrevet en tilslutningserklæring og bakker op med økonomi og viden i projektet | 2 | +| ☑︎ | R4 | _Løsningen har tværkommunal potentiale (anbefaling)_ | Der vil på sigt kunne deles indhold på tværs af kommuner, hvis dette ønskes | 2 | +| ☑︎ | R5 | Ophæng til nationale strategier er til stede | ? | 3 | + +## FORMKRAV + +| | # | Krav | Henvisning | Niveau | +|:--:|:---:|:---------------------------------------------------------------------------------------------------------------------------------------------------|:----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:------:| +| ☑︎ | F1 | Kildekoden deles | https://github.com/OS2display | 0 | +| ☑︎ | F2 | Open Source licenskriterier overholdes | MPL 2.0 og CC-BY-SA-4.0 vedtaget | 0 | +| ☑︎ | F3 | Udbudsregler og alm. lovformlighed er overholdt | ? | 0 | +| ☑︎ | F4 | Der er tænkt på sikkerheden i løsningen | [Se dokumentationen](https://github.com/os2display/display-docs) | 0 | +| ☑︎ | F5 | Løsningens formål og værdi er beskrevet | ? | 0 | +| ☑︎ | F6 | Kildekoden er placeret på OS2's github | https://github.com/OS2display | 1 | +| ☑︎ | F7 | Driftskrav til løsningen er dokumenteret | [Se dokumentationen](https://github.com/os2display/display-docs) | 1 | +| ☑︎ | F8 | Løsningen er dokumenteret på teknisk niveau | [Se dokumentationen](https://github.com/os2display/display-docs) | 1 | +| ☑︎ | F9 | Teknisk implementering af løsningen er dokumenteret | [Se installationsguide](https://github.com/os2display/display-docs/blob/main/installation.md) | 1 | +| ☑︎ | F10 | OS2's kommunikationskanaler anvendes (OS2.eu) | https://os2.eu/produkt/os2display | 1 | +| ☑︎ | F11 | OS2's værktøjer benyttes (Jira) | [OS2's Jira](https://os2web.atlassian.net/jira/software/c/projects/DISPLAY/boards/41) | 1 | +| ☑︎ | F12 | Der er kun en version af core koden (Master) | Ja. https://github.com/OS2display | 2 | +| ☐ | F13 | Der er udarbejdet præsentationsmateriale af løsningen | Hvor? | 2 | +| ☐ | F14 | Der er udarbejdet kommunikationsmateriale til strategisk niveau | Hvor? | 2 | +| ☐ | F15 | Best practice for implementering i organisationen dokumenteres | Hvor? | 2 | +| ☐ | F16 | Teknisk dokumentation indeholder best practice for kodestandarder i forhold til de anvendte teknologier | [Se dokumentationen](https://github.com/os2display/display-docs) | 2 | +| ☐ | F17 | Drifts og vedligeholdelses setup er beskrevet | Hvem drifter løsningen? er der sat økonomi af til vedligholdelse? | 2 | +| ☐ | F18 | Rammearkitekturen og standarder er fulgt og afvigelser er forklaret | Der er ikke data fra rammearkitekturen efterspurgt i løsningen. Det er valgt at afvige fra Login via rammearkitekturen, fordi standarden OIDC ikke var tilgængelig på udviklingstidspunktet og det vurderes at dette er fremtidens loginform. | 2 | +| ☐ | F19 | _Løsningen er leveret i et containerformat fx docker (anbefaling)_ | Ja. | 2 | +| ☐ | F20 | _Uddanelses materiale er udarbejdet (anbefaling)_ | Hvor? | 2 | +| ☐ | F21 | Politisk kommunikation er udarbejdet (Lokal + Omverden) | Hvor? | 3 | +| ☐ | F22 | Procesplan + procesansvar for driftsimplementering er udarbejdet ([eksempel](https://os2mo.readthedocs.io/en/development/operation/cookbook.html)) | Hvor? | 3 | + +## STRATEGISK SAMMENHÆNG + +| | # | Krav | Henvisning | Niveau | +|:-:|:--:|:------------------------------------------------------------------------------------------------------------------------------|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:------:| +| ☐ | S1 | Produktet har en kobling til [OS2's strategi](https://os2.eu/side/os2-mission-vision) | OS2display er et nemt setup, hvor det er let for nye kommuner at komme på. Der er fra starten af diskuteret arkitektur med de involverede leverandører, for at sikre at det bleve bygget stabilt og bygget på standarder. | 1 | +| ☐ | S2 | Løsningen understøtter innovation og open source | Systemet er open source og der tænkes hele tiden i sammenhænge mellem hvad der skal ud på skærme og hvor let dette indhold skal genereres for at kunne bidrage til effektivisering. | 1 | +| ☐ | S3 | Produktets (forventlige) kobling til [OS2's mission, vision og strategi](https://os2.eu/side/os2-mission-vision) er beskrevet | [Se dokumentationen](https://github.com/os2display/display-docs) | 2 | +| ☐ | S4 | Der er udarbejdet en vision og strategi for produktet | [Se dokumentationen](https://github.com/os2display/display-docs) | 2 | +| ☐ | S5 | Produktets kobling til og overensstemmelse med OS2's vision og strategi er tilstede og beskrevet | [Se dokumentationen](https://github.com/os2display/display-docs) | 3 | + +## GOVERNANCE + +| | # | Krav | Henvisning | Niveau | +|:-:|:---:|:----------------------------------------------------------------------------------|:------------------------------------------------------------------------------|:------:| +| ☐ | G1 | Produktet er oprettet i OS2's porteføljestyring (Hjemmeside) | https://os2.eu/produkt/os2display | 1 | +| ☐ | G2 | Der koordineres løbende med OS2-sekretariatet | Koordinationsgruppen bruger aktivt sekretariatet til indkaldelse af møder mv. | 1 | +| ☐ | G3 | Der er udpeget en projektleder/tovholder | Hvem? evt. link til beskrivelse af ansvar/opgaver | 1 | +| ☐ | G4 | Bestyrelsen er orienteret | fx link til referat | 1 | +| ☐ | G5 | Bestyrelsen har godkendt produktet | fx link til referat | 2 | +| ☐ | G6 | Der er nedsat en styregruppe | Link til kommissorium | 2 | +| ☐ | G7 | _Der er nedsat en koordinationsgruppe (anbefaling)_ | Link til kommissorium | 2 | +| ☐ | G8 | _En projektmodel anvendes og er dokumenteret (anbefaling)_ | Hvor? | 2 | +| ☐ | G9 | _Review af kode foretages af tredjepart (anbefaling)_ | | 2 | +| ☐ | G10 | _Der er udarbejdet en tilslutningserklæring til sikring af økonomi (anbefaling)_ | Hvor? | 2 | +| ☐ | G11 | Bestyrelsen har godkendt styregruppen | fx link til referat | 3 | +| ☐ | G12 | Bestyrelsen er repræsenteret i styregruppen | fx link til referat | 3 | +| ☐ | G13 | Der foreligger en aftale der sikre økonomi til koordinerg og videreudvikling | Link til aftale | 3 | +| ☐ | G14 | Der er etableret et fagligt fælleskab bag løsningen hvor erfaringer kan udveksles | Henvisning til en faggruppe eller et forum | 3 | diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..387154f --- /dev/null +++ b/Gemfile @@ -0,0 +1,7 @@ +source 'https://rubygems.org' + +gem "jekyll", "~> 4.3" # installed by `gem jekyll` +# gem "webrick" # required when using Ruby >= 3 and Jekyll <= 4.2.2 + +gem "just-the-docs", "0.5.0" # pinned to the current release +# gem "just-the-docs" # always download the latest release diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..81efc41 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,79 @@ +GEM + remote: https://rubygems.org/ + specs: + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) + colorator (1.1.0) + concurrent-ruby (1.1.10) + em-websocket (0.5.3) + eventmachine (>= 0.12.9) + http_parser.rb (~> 0) + eventmachine (1.2.7) + ffi (1.15.5) + forwardable-extended (2.6.0) + http_parser.rb (0.8.0) + i18n (1.12.0) + concurrent-ruby (~> 1.0) + jekyll (4.3.0) + addressable (~> 2.4) + colorator (~> 1.0) + em-websocket (~> 0.5) + i18n (~> 1.0) + jekyll-sass-converter (>= 2.0, < 4.0) + jekyll-watch (~> 2.0) + kramdown (~> 2.3, >= 2.3.1) + kramdown-parser-gfm (~> 1.0) + liquid (~> 4.0) + mercenary (>= 0.3.6, < 0.5) + pathutil (~> 0.9) + rouge (>= 3.0, < 5.0) + safe_yaml (~> 1.0) + terminal-table (>= 1.8, < 4.0) + webrick (~> 1.7) + jekyll-sass-converter (2.2.0) + sassc (> 2.0.1, < 3.0) + jekyll-seo-tag (2.8.0) + jekyll (>= 3.8, < 5.0) + jekyll-watch (2.2.1) + listen (~> 3.0) + just-the-docs (0.5.0) + jekyll (>= 3.8.5) + jekyll-seo-tag (>= 2.0) + rake (>= 12.3.1) + kramdown (2.4.0) + rexml + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) + liquid (4.0.3) + listen (3.7.1) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + mercenary (0.4.0) + pathutil (0.16.2) + forwardable-extended (~> 2.6) + public_suffix (5.0.0) + rake (13.0.6) + rb-fsevent (0.11.2) + rb-inotify (0.10.1) + ffi (~> 1.0) + rexml (3.2.5) + rouge (4.0.0) + safe_yaml (1.0.5) + sassc (2.4.0) + ffi (~> 1.9) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + unicode-display_width (2.3.0) + webrick (1.7.0) + +PLATFORMS + arm64-darwin-21 + x86_64-darwin-19 + x86_64-linux + +DEPENDENCIES + jekyll (~> 4.3) + just-the-docs (= 0.5.0) + +BUNDLED WITH + 2.3.9 diff --git a/README.md b/README.md index c88fe60..a4e1551 100644 --- a/README.md +++ b/README.md @@ -1,102 +1,15 @@ -# OS2Display documentation +--- +title: Readme +layout: default +nav_order: 6 +--- -This repository contains documentation for OS2Display. +# OS2Display documentation readme -## Changelog +This repository contains documentation for OS2Display. The documentation is build and published +using Github actions and the [Just the docs](https://just-the-docs.com/) theme. -See [changelog.md](changelog.md) for a list of changes. +To update the documentation please make a pull request to this repository. -## Roadmap - -See [roadmap.md](roadmap.md) for a plan upcoming changes. - -## Architecture - -```mermaid -flowchart LR - A[Admin] <-->B(API) - B <--> C(Client) -``` - -## System description - -| Component | Description | Accessible by | -| ----------- |:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| :----------- | -| Slide | A slide is the visible content on a screen. | Admin, editor | -| Media | Media is either images or videos used as content for slides. | Admin, editor | -| Theme | A theme has css, that can override the slide css. | Admin | -| Template | The template is how the slide looks, and which content is on the slide. Templates are imported from manually and developed outside the admin. Templates are accessible to choose on Slides. | Admin, editor | -| Playlist | A playlist arranges the order of the slides, and the playlist is scheduled. | Admin, editor | -| Campaign | A campaign is a playlist, that takes precedence over all other playlists on the screen. If there a multiple campaigns, they are queued. A campaign is either directly attached to a screen, or attached to a group affecting the screens that are members of that group. If a campaign applies to a screen it fills the whole screen, not just a region of the screen. | Admin | -| Group | A group is a collection of screens. | Admin | -| Layout | A layout consists of different regions, and each region can have a number of playlists connected. A layout is connected to a screen. | Admin | -| Screen | A screen is connected to an actual screen, and has a layout with different playlists in. | Admin | - -```mermaid -flowchart LR - Slide -->|1| D[Theme] - Slide -->|1| E[Template] - Slide -->|fa:fa-asterisk| F[Media] -``` - -```mermaid -flowchart LR - Screen-->|fa:fa-asterisk|Layout - Layout -->|fa:fa-asterisk|Playlist - Playlist -->|fa:fa-asterisk|Slide - - Screen-->|fa:fa-asterisk|G[Campaign] - G -->|fa:fa-asterisk|H[Slide] - - Screen-->|fa:fa-asterisk|Group - - Group-->|fa:fa-asterisk|L[Campaign] - L -->|fa:fa-asterisk| M[Slide] - -``` - -## API service - -This is the main component of the system. All content is created/retrieved through api calls to the API service. -The API service is a [Symfony](https://symfony.com/) project built with [API Platform](https://api-platform.com/). -See [api-service.md](api-service.md) for further descriptions. -See [security.md](security.md) for further description of the security setup. - -## Admin - -This is where content, connections and screens are created and connected. -[Go to description of admin elements](https://github.com/os2display/display-admin-client#system-description). -The admin is built with [React](https://reactjs.org/). -See [admin.md](admin.md) for further descriptions. - -## Client - -This is the output screen where the content will be displayed. -The screen client is built with [React](https://reactjs.org/). -See [client.md](client.md) for further descriptions. - -### Important nodes - -Scheduling and campaigns will be activated when - - * their start time has been reached - * (and) the current playlist has reached its end - -to ensure proper transitions. - -## Development setup - -See [development.md](development.md) for a description of how to make changes to the project. - -## Templates and Screen Layouts - -See [templates.md](templates.md) for a description of how templates work and how to make new. -See [layouts.md](layouts.md) for a description of how layouts work and how to make new. - -## Feeds - -See [feeds.md](feeds.md) for a description of how feeds are set up. - -## Hosting - -See [hosting.md](hosting.md) for hosting instructions. +Your PR should use standard markdown and follow the conventions for navigation etc. +documented [here](https://just-the-docs.com/docs/navigation-structure/) diff --git a/_config.yml b/_config.yml new file mode 100644 index 0000000..0f2f1b9 --- /dev/null +++ b/_config.yml @@ -0,0 +1,19 @@ +title: OS2display Documentation +description: Documentation for using, hosting and developing the OS2display project +theme: just-the-docs + +logo: "/assets/site/logo.svg" +favicon_ico: "/assets/site/favicon.ico" + +color_scheme: os2display + +aux_links: + "github.com/os2display": + - "//github.com/os2display" + "os2.eu/os2display": + - "www.os2.eu/os2display" + +mermaid: + # Version of mermaid library + # Pick an available version from https://cdn.jsdelivr.net/npm/mermaid/ + version: "9.1.3" diff --git a/_sass/color_schemes/os2display.scss b/_sass/color_schemes/os2display.scss new file mode 100644 index 0000000..9862353 --- /dev/null +++ b/_sass/color_schemes/os2display.scss @@ -0,0 +1,13 @@ +//$body-background-color: $white !default; +//$body-heading-color: $grey-dk-300 !default; +//$body-text-color: $grey-dk-100 !default; +$link-color: $blue-200; +//$nav-child-link-color: $grey-dk-100 !default; +//$sidebar-color: $grey-lt-000 !default; +//$base-button-color: #f7f7f7 !default; +$btn-primary-color: $blue-200; +//$code-background-color: $grey-lt-000 !default; +//$feedback-color: darken($sidebar-color, 3%) !default; +//$table-background-color: $white !default; +//$search-background-color: $white !default; +//$search-result-preview-color: $grey-dk-000 !default; \ No newline at end of file diff --git a/admin.md b/admin.md deleted file mode 100644 index 3fdf803..0000000 --- a/admin.md +++ /dev/null @@ -1,13 +0,0 @@ -# Admin - -The admin is build without the following, that therefore need to be installed afterwards: - - [Templates](https://github.com/os2display/display-docs/blob/main/feeds.md]) - - [Layouts](https://github.com/os2display/display-docs/blob/main/layouts.md) - - [Feeds](https://github.com/os2display/display-docs/blob/main/feeds.md]) - - [Themes](https://github.com/os2display/display-templates/tree/develop/src/themes]) NB: is put in through editor unlike the above. - -Please also look at the readme for structure between elements in the admin. - -## Create users manually -@todo - diff --git a/assets/site/favicon.ico b/assets/site/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..4f716e5a8e2f3f9fd697d1eea87add72b71ed93e GIT binary patch literal 1150 zcmdtg%PT}-7{~Ev=A73|NTZRaSlGCxY!szP6EZtxL+pfwQg$rlk_8)C7_y2u!8dCq&@=Q*!gge#FS?k%?Hn>CtQ2bf|eoToA4S+XV+ zjQ`2aCo!&wZ=MIWL1u9(qNEu|3(wU5m9-1s>tTKyXE?wZ9O^NHW1M0c4JfTaU$IZf zVixOo!#w72k5w$;85?nnmiEE;0lTO|urBR1UNMLi6tBHp;sQR3v7hwQKgNn}!V5;x zg)Q7d-_Lk_pS+9je=s*il~g0up%&dx4$9{dS0Kh~b{5n6)#$?j_MjYxa1DL)1n0=$ z9pk8j;yVldL)slAv4#oUU=rGII}$j8>U#&(M0?U+N03z>VC*Ya>$EACSfR#@l}|5* z(F%teEMP@N& + + + + + + + + + + + + + + + diff --git a/components/admin.md b/components/admin.md new file mode 100644 index 0000000..b76d97f --- /dev/null +++ b/components/admin.md @@ -0,0 +1,21 @@ +--- +layout: default +title: Admin (Editor) +parent: Components +has_children: true +nav_order: 2 +--- + +# Admin + +The admin is build without the following, that therefore need to be installed afterwards: + - [Templates](../content_structure/templates) + - [Layouts](../content_structure/layouts) + - [Feeds](../content_structure/feeds) + - [Themes](../content_structure/themes) + +Please also look at the readme for structure between elements in the admin. + +## Create users manually +@todo + diff --git a/api-service.md b/components/api-service.md similarity index 87% rename from api-service.md rename to components/api-service.md index 792c32e..c964a04 100644 --- a/api-service.md +++ b/components/api-service.md @@ -1,3 +1,10 @@ +--- +layout: default +title: API +parent: Components +nav_order: 1 +--- + # API service We use a general API-first approach. diff --git a/components/api-service/security.md b/components/api-service/security.md new file mode 100644 index 0000000..4b84b91 --- /dev/null +++ b/components/api-service/security.md @@ -0,0 +1,11 @@ +--- +layout: default +title: Security +parent: Admin (Editor) +grand_parent: Components +nav_order: 1 +--- + +# Security + +TODO: Describe security setup. \ No newline at end of file diff --git a/client.md b/components/client.md similarity index 90% rename from client.md rename to components/client.md index 7e09df7..d3305c1 100644 --- a/client.md +++ b/components/client.md @@ -1,3 +1,10 @@ +--- +layout: default +title: Client (Screen) +parent: Components +nav_order: 3 +--- + # Client The client is the content player. This will display the content that is bound to the given screen. @@ -25,6 +32,6 @@ See [https://github.com/os2display/display-client/blob/develop/src/region.js](ht ## Event Model -![Event model](assets/client-event-model.png) +![Event model](../assets/client-event-model.png) TODO: Make sure this drawing is up-to-date. diff --git a/components/components.md b/components/components.md new file mode 100644 index 0000000..0b7870f --- /dev/null +++ b/components/components.md @@ -0,0 +1,36 @@ +--- +title: Components +layout: default +nav_order: 2 +has_children: true +--- + +# Components + +## Architecture + +```mermaid +flowchart LR + A[Admin] <-->B(API) + B <--> C(Client) +``` + +## API service + +This is the main component of the system. All content is created/retrieved through api calls to the API service. +The API service is a [Symfony](https://symfony.com/) project built with [API Platform](https://api-platform.com/). +See [api-service.md](api-service) for further descriptions. +See [security.md](api-service/security) for further description of the security setup. + +## Admin + +This is where content, connections and screens are created and connected. +[Go to description of admin elements](https://github.com/os2display/display-admin-client#system-description). +The admin is built with [React](https://reactjs.org/). +See [admin.md](admin) for further descriptions. + +## Client + +This is the output screen where the content will be displayed. +The screen client is built with [React](https://reactjs.org/). +See [client.md](client) for further descriptions. \ No newline at end of file diff --git a/content_structure/content_structure.md b/content_structure/content_structure.md new file mode 100644 index 0000000..025a181 --- /dev/null +++ b/content_structure/content_structure.md @@ -0,0 +1,61 @@ +--- +title: Content Structure +layout: default +nav_order: 2 +has_children: true +--- + +# Content Structure + +| Component | Description | Accessible by | +|-----------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:--------------| +| Slide | A slide is the visible content on a screen. | Admin, editor | +| Media | Media is either images or videos used as content for slides. | Admin, editor | +| Theme | A theme has css, that can override the slide css. | Admin | +| Template | The template is how the slide looks, and which content is on the slide. Templates are imported from manually and developed outside the admin. Templates are accessible to choose on Slides. | Admin, editor | +| Playlist | A playlist arranges the order of the slides, and the playlist is scheduled. | Admin, editor | +| Campaign | A campaign is a playlist, that takes precedence over all other playlists on the screen. If there a multiple campaigns, they are queued. A campaign is either directly attached to a screen, or attached to a group affecting the screens that are members of that group. If a campaign applies to a screen it fills the whole screen, not just a region of the screen. | Admin | +| Group | A group is a collection of screens. | Admin | +| Layout | A layout consists of different regions, and each region can have a number of playlists connected. A layout is connected to a screen. | Admin | +| Screen | A screen is connected to an actual screen, and has a layout with different playlists in. | Admin | + +```mermaid +flowchart LR + Slide -->|1| D[Theme] + Slide -->|1| E[Template] + Slide -->|fa:fa-asterisk| F[Media] +``` + +```mermaid +flowchart LR + Screen-->|fa:fa-asterisk|Layout + Layout -->|fa:fa-asterisk|Playlist + Playlist -->|fa:fa-asterisk|Slide + + Screen-->|fa:fa-asterisk|G[Campaign] + G -->|fa:fa-asterisk|H[Slide] + + Screen-->|fa:fa-asterisk|Group + + Group-->|fa:fa-asterisk|L[Campaign] + L -->|fa:fa-asterisk| M[Slide] + +``` + +## Templates and Screen Layouts + +See [templates.md](templates) for a description of how templates work and how to make new. +See [layouts.md](layouts) for a description of how layouts work and how to make new. + +## Feeds + +See [feeds.md](feeds) for a description of how feeds are set up. + +## Scheduling + +Scheduling and campaigns will be activated when + +* their start time has been reached +* (and) the current playlist has reached its end + +to ensure proper transitions. diff --git a/feeds.md b/content_structure/feeds.md similarity index 93% rename from feeds.md rename to content_structure/feeds.md index 33f0634..086c5fe 100644 --- a/feeds.md +++ b/content_structure/feeds.md @@ -1,3 +1,10 @@ +--- +layout: default +title: Feeds +parent: Content Structure +nav_order: 3 +--- + # Feeds The API supports binding a feed to a slide. This is supported in the admin with the FeedSelector component. diff --git a/layouts.md b/content_structure/layouts.md similarity index 93% rename from layouts.md rename to content_structure/layouts.md index 97da960..10a4ae0 100644 --- a/layouts.md +++ b/content_structure/layouts.md @@ -1,3 +1,10 @@ +--- +layout: default +title: Layouts +parent: Content Structure +nav_order: 1 +--- + # Layouts Layouts are the screen settings, that defines how a screen is divided into different regions. diff --git a/templates.md b/content_structure/templates.md similarity index 98% rename from templates.md rename to content_structure/templates.md index 6dceb22..cb0792f 100644 --- a/templates.md +++ b/content_structure/templates.md @@ -1,3 +1,10 @@ +--- +layout: default +title: Templates +parent: Content Structure +nav_order: 2 +--- + # Templates See [https://github.com/os2display/display-templates](https://github.com/os2display/display-templates) for core templates. diff --git a/content_structure/themes.md b/content_structure/themes.md new file mode 100644 index 0000000..06ee108 --- /dev/null +++ b/content_structure/themes.md @@ -0,0 +1,9 @@ +--- +layout: default +title: Themes +parent: Content Structure +nav_order: 4 +--- + +## Themes +@Todo \ No newline at end of file diff --git a/development.md b/development/development.md similarity index 84% rename from development.md rename to development/development.md index 3f9e4e7..42a89d6 100644 --- a/development.md +++ b/development/development.md @@ -1,3 +1,10 @@ +--- +title: Development +layout: default +nav_order: 4 +has_children: false +--- + # Development To work on the complete system with API, admin, client and templates each project's docker-compose file should be started. diff --git a/hosting.md b/hosting/hosting.md similarity index 98% rename from hosting.md rename to hosting/hosting.md index f57351f..3d4aa76 100644 --- a/hosting.md +++ b/hosting/hosting.md @@ -1,3 +1,10 @@ +--- +title: Hosting +layout: default +nav_order: 3 +has_children: false +--- + # Hosting ## Basics diff --git a/index.md b/index.md new file mode 100644 index 0000000..f80f8f0 --- /dev/null +++ b/index.md @@ -0,0 +1,25 @@ +--- +title: Home +layout: home +nav_order: 1 +--- + +# OS2Display documentation + +This repository contains documentation for OS2Display. + +## Changelog + +See [changelog.md](CHANGELOG) for a list of changes. + +## Roadmap + +See [roadmap.md](roadmap) for a plan upcoming changes. + +## Development setup + +See [development.md](development/development) for a description of how to make changes to the project. + +## Hosting + +See [hosting.md](hosting/hosting) for hosting instructions. diff --git a/roadmap.md b/roadmap.md index 01667af..1c61a34 100644 --- a/roadmap.md +++ b/roadmap.md @@ -1,65 +1,70 @@ -# Roadmap +--- +title: Roadmap +layout: default +nav_order: 4 +--- -## Leverance - 6.12.2021 (leveret) -* Basis klient (vise indhold, én region) -* Basis API -* Basis Admin vedr. slides (inkl. preview), spillelister, skærme, skærmgrupper og tema -* Template: billede-tekst -* Template: boganmeldelse -* Template: slideshow -* Screen layouts (regioner) - -## Leverance - 21.12.2021 (leveret) -* Schedulering/publishing slide og spilleliste API -* Bugs fixes +# Roadmap -## Leverance - 25.1.2022 (leveret) -* Datafeedmotor -* Template: iframe -* Template: RSS -* Template: Kalender -* Template: Tabel -* Template: video -* Test setup -* Bugs fixes +# Funktioner som ikke er planlagt +* Manuel oprettelse af brugere i interface (arkitektur er: https://whimsical.com/oidc-opbygning-FXTDDXjiucEagPYBHmMufR og er løst på commandline niveau) +* Delt indhold på tværs af installationer/kommuner +* Template: Datavisualisering (afventer OS2iot dataopbevaringsgrundlag) -## Leverance 10.2.2022 (leveret) -* Admin Ad login (brugere) -* Klient Login (skærm) -* Template sparkle.io -* Template: Kontakter -* Bug fixes -* Template: infoskærm billede (NB: løst som tema) -* Kampagner (API og Admin) +# Leverancer -## Leverance 14.2.2022 (leveret) -* Kampagner (klient) +## Leverance 3.5.2022 +* Skærm touch * Bug fixes - -## Leverance 10.3.2022 (leveret) -* Brugerstyring -* Template: Poster +* Delte spillelister (API+screen) +* Dokumentation +* Darkmode +* Rejseplan template * Bug fixes +* Dokumentation ## Leverance 22.3.2022 (leveret) * Delte spillelister (admin) * Bugs fixes * Dokumentation -## Leverance 3.5.2022 -* Skærm touch +## Leverance 10.3.2022 (leveret) +* Brugerstyring +* Template: Poster * Bug fixes -* Delte spillelister (API+screen) -* Dokumentation -* Darkmode -* Rejseplan template + +## Leverance 14.2.2022 (leveret) +* Kampagner (klient) * Bug fixes -* Dokumentation -# Funktioner som ikke er planlagt -* Manuel oprettelse af brugere i interface (arkitektur er: https://whimsical.com/oidc-opbygning-FXTDDXjiucEagPYBHmMufR og er løst på commandline niveau) -* Delt indhold på tværs af installationer/kommuner -* Template: Datavisualisering (afventer OS2iot dataopbevaringsgrundlag) +## Leverance 10.2.2022 (leveret) +* Admin Ad login (brugere) +* Klient Login (skærm) +* Template sparkle.io +* Template: Kontakter +* Bug fixes +* Template: infoskærm billede (NB: løst som tema) +* Kampagner (API og Admin) +## Leverance - 25.1.2022 (leveret) +* Datafeedmotor +* Template: iframe +* Template: RSS +* Template: Kalender +* Template: Tabel +* Template: video +* Test setup +* Bugs fixes +## Leverance - 21.12.2021 (leveret) +* Schedulering/publishing slide og spilleliste API +* Bugs fixes +## Leverance - 6.12.2021 (leveret) +* Basis klient (vise indhold, én region) +* Basis API +* Basis Admin vedr. slides (inkl. preview), spillelister, skærme, skærmgrupper og tema +* Template: billede-tekst +* Template: boganmeldelse +* Template: slideshow +* Screen layouts (regioner) diff --git a/security.md b/security.md deleted file mode 100644 index 6f48836..0000000 --- a/security.md +++ /dev/null @@ -1,3 +0,0 @@ -# Security - -TODO: Describe security setup. From 94e67762809addba4b56433668778042f58a83e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ture=20Gj=C3=B8rup?= Date: Tue, 6 Jun 2023 22:11:37 +0200 Subject: [PATCH 25/34] DISPLAY-986: Removed markdown lint --- .github/workflows/pr.yaml | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 .github/workflows/pr.yaml diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml deleted file mode 100644 index 026af60..0000000 --- a/.github/workflows/pr.yaml +++ /dev/null @@ -1,19 +0,0 @@ -on: pull_request -name: Review -jobs: - markdownlint: - name: Markdown Lint - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Yarn install - uses: actions/setup-node@v3 - with: - node-version: '18' - cache: 'yarn' - - run: yarn install - - - name: markdownlint - run: yarn check-coding-standards \ No newline at end of file From 57954d063a53129ed6b176b56968bc438b19b1bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ture=20Gj=C3=B8rup?= Date: Tue, 11 Jul 2023 12:32:25 +0200 Subject: [PATCH 26/34] DISPLAY-986: Updated Changelog --- CHANGELOG.md | 111 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 68 insertions(+), 43 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7eefa50..d5766c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,103 +6,128 @@ nav_order: 5 # Changelog +## 2023-07-11 + +- Released api `1.3.0`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#130---2023-07-11) +- Released admin `1.3.1`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#130---2023-07-11) +- Released admin `1.3.0`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#130---2023-07-11) +- Released client `1.3.0`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#130---2023-07-11) + +## 2023-06-30 +- Released api `1.2.9`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#129---2023-06-30) + - Released client `1.2.7`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#127---2023-06-30) + +## 2023-06-12 + +- Released client `1.2.6`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#126---2023-06-12) + ## 2023-06-06 -* Released client `1.2.5`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#125---2023-06-06). +- Released client `1.2.5`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#125---2023-06-06). ## 2023-06-01 -* Released templates `1.2.6`. See [changelog](https://github.com/os2display/display-templates/blob/develop/CHANGELOG.md#126---2023-06-01). +- Released templates `1.2.6`. See [changelog](https://github.com/os2display/display-templates/blob/develop/CHANGELOG.md#126---2023-06-01) ## 2023-05-25 -- Released client `1.2.4`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#123---2023-03-24) +- Released api `1.2.8`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#128---2023-05-25) +- Released client `1.2.4`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#124---2023-05-25) +- Released admin `1.2.7`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#127---2023-05-25) +## 2023-05-11 + +- Released admin `1.2.6`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#126---2023-05-11) + +## 2023-04-03 + +- Released api `1.2.7`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#127---2023-04-03). ## 2023-03-24 -* Released api `1.2.6`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#126---2023-03-24). -* Released admin `1.2.4`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#124---2023-03-24). -* Released client `1.2.3`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#123---2023-03-24). -* Released templates `1.2.4`. See [changelog](https://github.com/os2display/display-templates/blob/develop/CHANGELOG.md#124---2023-03-24). -* Released admin `1.2.5`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#125---2023-03-24). -* Released templates `1.2.5`. See [changelog](https://github.com/os2display/display-templates/blob/develop/CHANGELOG.md#125---2023-03-24). +- Released api `1.2.6`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#126---2023-03-24). +- Released admin `1.2.5`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#125---2023-03-24). +- Released admin `1.2.4`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#124---2023-03-24). +- Released client `1.2.3`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#123---2023-03-24). +- Released templates `1.2.4`. See [changelog](https://github.com/os2display/display-templates/blob/develop/CHANGELOG.md#124---2023-03-24). + +- Released templates `1.2.5`. See [changelog](https://github.com/os2display/display-templates/blob/develop/CHANGELOG.md#125---2023-03-24). ## 2023-03-16 -* Released api `1.2.5`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#125---2023-03-16). +- Released api `1.2.5`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#125---2023-03-16). ## 2023-03-07 -* Released api `1.2.4`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#124---2023-03-07). -* Released admin `1.2.3`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#123---2023-03-07). -* Released templates `1.2.3`. See [changelog](https://github.com/os2display/display-templates/blob/develop/CHANGELOG.md#123---2023-03-07). -* Released client `1.2.2`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#122---2023-03-07). +- Released api `1.2.4`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#124---2023-03-07). +- Released admin `1.2.3`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#123---2023-03-07). +- Released templates `1.2.3`. See [changelog](https://github.com/os2display/display-templates/blob/develop/CHANGELOG.md#123---2023-03-07). +- Released client `1.2.2`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#122---2023-03-07). ## 2023-02-14 -* Released api `1.2.3`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#123---2023-02-14). +- Released api `1.2.3`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#123---2023-02-14). ## 2023-02-08 -* Released api `1.2.2`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#122---2023-02-08). -* Released admin `1.2.2`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#122---2023-02-08). -* Released templates `1.2.2`. See [changelog](https://github.com/os2display/display-templates/blob/develop/CHANGELOG.md#122---2023-02-08). +- Released api `1.2.2`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#122---2023-02-08). +- Released admin `1.2.2`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#122---2023-02-08). +- Released templates `1.2.2`. See [changelog](https://github.com/os2display/display-templates/blob/develop/CHANGELOG.md#122---2023-02-08). ## 2023-02-02 -* Released api `1.2.1`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#121---2023-02-02). +- Released api `1.2.1`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#121---2023-02-02). ## 2023-01-13 -* Released admin `1.2.1`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#121---2023-01-13). -* Released cient `1.2.1`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#121---2023-01-13). +- Released admin `1.2.1`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#121---2023-01-13). +- Released cient `1.2.1`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#121---2023-01-13). ## 2023-01-05 -* Released api `1.2.0`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#120---2023-01-05). -* Released admin `1.2.0`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#120---2023-01-05). -* Released client `1.2.0`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#120---2023-01-05). -* Released templates `1.2.0`. See [changelog](https://github.com/os2display/display-templates/blob/develop/CHANGELOG.md#120---2023-01-05). +- Released api `1.2.0`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#120---2023-01-05). +- Released admin `1.2.0`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#120---2023-01-05). +- Released client `1.2.0`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#120---2023-01-05). +- Released templates `1.2.0`. See [changelog](https://github.com/os2display/display-templates/blob/develop/CHANGELOG.md#120---2023-01-05). ## 2022-10-06 -* Released admin `1.1.0`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#110---2022-10-06). -* Released client `1.1.0`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#110---2022-10-06). +- Released admin `1.1.0`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#110---2022-10-06). +- Released client `1.1.0`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#110---2022-10-06). ## 2022-09-29 -* Released api `1.1.0`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#110---2022-09-29). +- Released api `1.1.0`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#110---2022-09-29). ## 2022-09-08 -* Released client `1.0.2`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#102---2022-09-08). +- Released client `1.0.2`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#102---2022-09-08). ## 2022-09-05 -* Released api `1.0.4`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#104---2022-09-05). -* Released admin `1.0.3`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#103---2022-09-05). +- Released api `1.0.4`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#104---2022-09-05). +- Released admin `1.0.3`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#103---2022-09-05). ## 2022-09-01 -* Released api `1.0.3`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#103---2022-09-01). -* Released api `1.0.2`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#102---2022-09-01). -* Released api `1.0.1`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#101---2022-09-01). +- Released api `1.0.3`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#103---2022-09-01). +- Released api `1.0.2`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#102---2022-09-01). +- Released api `1.0.1`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#101---2022-09-01). ## 2022-06-02 -* Released admin `1.0.2`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#102---2022-06-02). -* Released templates `1.0.2`. See [changelog](https://github.com/os2display/display-templates/blob/develop/CHANGELOG.md#102---2022-06-02). -* Released templates `1.0.1`. See [changelog](https://github.com/os2display/display-templates/blob/develop/CHANGELOG.md#101---2022-06-02). +- Released admin `1.0.2`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#102---2022-06-02). +- Released templates `1.0.2`. See [changelog](https://github.com/os2display/display-templates/blob/develop/CHANGELOG.md#102---2022-06-02). +- Released templates `1.0.1`. See [changelog](https://github.com/os2display/display-templates/blob/develop/CHANGELOG.md#101---2022-06-02). ## 2022-06-01 -* Released admin `1.0.1`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#101---2022-06-01). -* Released client `1.0.1`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#101---2022-06-01). -* Released templates `1.0.0`. See [changelog](https://github.com/os2display/display-templates/blob/develop/CHANGELOG.md#100---2022-06-01). +- Released admin `1.0.1`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#101---2022-06-01). +- Released client `1.0.1`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#101---2022-06-01). +- Released templates `1.0.0`. See [changelog](https://github.com/os2display/display-templates/blob/develop/CHANGELOG.md#100---2022-06-01). ## 2022-05-18 -* Released api `1.0.0`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#100---2022-05-18). -* Released admin `1.0.0`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#100---2022-05-18). -* Released client `1.0.0`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#100---2022-05-18). +- Released api `1.0.0`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#100---2022-05-18). +- Released admin `1.0.0`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#100---2022-05-18). +- Released client `1.0.0`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#100---2022-05-18). From 8d0feff16492892127d75b5c6017999f9dd9775a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ture=20Gj=C3=B8rup?= Date: Tue, 11 Jul 2023 13:19:04 +0200 Subject: [PATCH 27/34] DISPLAY-986: Updated Changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d5766c2..e245e34 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ nav_order: 5 ## 2023-07-11 +- Released api `1.3.1`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#131---2023-07-11) - Released api `1.3.0`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#130---2023-07-11) - Released admin `1.3.1`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#130---2023-07-11) - Released admin `1.3.0`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#130---2023-07-11) From de3591114ed95f4afb86d85e1b5639b5aef4df05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ture=20Gj=C3=B8rup?= Date: Tue, 11 Jul 2023 14:39:29 +0200 Subject: [PATCH 28/34] SUPP0RT-1071: Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e245e34..122dec1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ nav_order: 5 ## 2023-07-11 +- Released api `1.3.2`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#132---2023-07-11) - Released api `1.3.1`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#131---2023-07-11) - Released api `1.3.0`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#130---2023-07-11) - Released admin `1.3.1`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#130---2023-07-11) From fc0b6db627b9f731c272cf63950e5c44a3809739 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ture=20Gj=C3=B8rup?= Date: Tue, 11 Jul 2023 17:07:26 +0200 Subject: [PATCH 29/34] DISPLAY-986: Updated Changelog --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 122dec1..1775657 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,8 +11,10 @@ nav_order: 5 - Released api `1.3.2`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#132---2023-07-11) - Released api `1.3.1`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#131---2023-07-11) - Released api `1.3.0`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#130---2023-07-11) -- Released admin `1.3.1`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#130---2023-07-11) +- Released admin `1.3.2`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#132---2023-07-11) +- Released admin `1.3.1`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#131---2023-07-11) - Released admin `1.3.0`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#130---2023-07-11) +- Released client `1.3.1`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#131---2023-07-11) - Released client `1.3.0`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#130---2023-07-11) ## 2023-06-30 From 7fd25886c7bb8e366afd36a887b2d8897f0d78ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ture=20Gj=C3=B8rup?= Date: Tue, 11 Jul 2023 18:47:57 +0200 Subject: [PATCH 30/34] DISPLAY-986: Updated Changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1775657..bb1eb5c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,9 +11,12 @@ nav_order: 5 - Released api `1.3.2`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#132---2023-07-11) - Released api `1.3.1`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#131---2023-07-11) - Released api `1.3.0`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#130---2023-07-11) +- Released admin `1.3.3`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#133---2023-07-11) - Released admin `1.3.2`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#132---2023-07-11) - Released admin `1.3.1`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#131---2023-07-11) - Released admin `1.3.0`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#130---2023-07-11) +- Released client `1.3.3`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#132---2023-07-11) +- Released client `1.3.2`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#132---2023-07-11) - Released client `1.3.1`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#131---2023-07-11) - Released client `1.3.0`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#130---2023-07-11) From d8f39a306cb6bac1a185cbe918ca9c963a34aa08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ture=20Gj=C3=B8rup?= Date: Tue, 11 Jul 2023 18:56:13 +0200 Subject: [PATCH 31/34] DISPLAY-986: Updated Changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb1eb5c..f5efbc2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,7 @@ nav_order: 5 - Released admin `1.3.2`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#132---2023-07-11) - Released admin `1.3.1`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#131---2023-07-11) - Released admin `1.3.0`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#130---2023-07-11) -- Released client `1.3.3`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#132---2023-07-11) +- Released client `1.3.3`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#133---2023-07-11) - Released client `1.3.2`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#132---2023-07-11) - Released client `1.3.1`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#131---2023-07-11) - Released client `1.3.0`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#130---2023-07-11) From 3f82274064086ec55e597c211039e78b65baac4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ture=20Gj=C3=B8rup?= Date: Thu, 13 Jul 2023 14:46:01 +0200 Subject: [PATCH 32/34] SUPP0RT-1143: Updated changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f5efbc2..eb02414 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ nav_order: 5 # Changelog +## 2023-07-13 + +- Released client `1.3.4`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#134---2023-07-13) + ## 2023-07-11 - Released api `1.3.2`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#132---2023-07-11) From 8d81f35ccb4f321a05f8f2455061fcff089cda0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ture=20Gj=C3=B8rup?= Date: Thu, 14 Sep 2023 12:16:45 +0200 Subject: [PATCH 33/34] DISPLAY-1039: Update Changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb02414..36410ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,12 @@ nav_order: 5 # Changelog +## 2023-09-14 + +- Released api `1.4.0`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#140---2023-09-14) +- Released admin `1.4.5`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#140---2023-09-14) +- Released client `1.3.4`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#135---2023-09-14) + ## 2023-07-13 - Released client `1.3.4`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#134---2023-07-13) From 0eacb0a249a928cd929bcbe7daf20e6f22c14272 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ture=20Gj=C3=B8rup?= Date: Thu, 14 Sep 2023 13:43:30 +0200 Subject: [PATCH 34/34] DISPLAY-1039: Update Changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 36410ca..6929093 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ nav_order: 5 - Released api `1.4.0`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#140---2023-09-14) - Released admin `1.4.5`. See [changelog](https://github.com/os2display/display-admin-client/blob/develop/CHANGELOG.md#140---2023-09-14) - Released client `1.3.4`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#135---2023-09-14) +- Released templates `1.3.0`. See [changelog](https://github.com/os2display/display-templates/blob/develop/CHANGELOG.md#130---2023-09-14) ## 2023-07-13 @@ -32,7 +33,7 @@ nav_order: 5 ## 2023-06-30 - Released api `1.2.9`. See [changelog](https://github.com/os2display/display-api-service/blob/develop/CHANGELOG.md#129---2023-06-30) - - Released client `1.2.7`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#127---2023-06-30) +- Released client `1.2.7`. See [changelog](https://github.com/os2display/display-client/blob/develop/CHANGELOG.md#127---2023-06-30) ## 2023-06-12