merge dev to main (#208 )

Co-authored-by: Nicolai Ort <info@nicolai-ort.com> Reviewed-on: #208 Co-authored-by: Philipp Dormann <philipp@philippdormann.de> Co-committed-by: Philipp Dormann <philipp@philippdormann.de>
Merge pull request 'Releases 0.13.2 & 0.13.3' (#203 ) from dev into main
2023-11-06 17:18:48 +00:00 · 2023-02-15 13:59:07 +00:00
17 changed files with 746 additions and 642 deletions
--- a/.drone.yml
+++ b/.drone.yml
@@ -0,0 +1,174 @@
+---
+kind: secret
+name: docker_username
+get:
+  path: odit-registry-builder
+  name: username
+
+---
+kind: secret
+name: docker_password
+get:
+  path: odit-registry-builder
+  name: password
+
+---
+kind: secret
+name: git_ssh
+get:
+  path: odit-git-bot
+  name: sshkey
+
+---
+kind: secret
+name: ci_token
+get:
+  path: odit-ci-bot
+  name: apikey
+
+---
+kind: secret
+name: npm_url
+get:
+  path: odit-npm-cache
+  name: url
+
+---
+kind: pipeline
+type: kubernetes
+name: tests:node
+clone:
+  disable: true
+steps:
+  - name: checkout pr
+    image: alpine/git
+    commands:
+      - git clone $DRONE_REMOTE_URL .
+      - git checkout $DRONE_SOURCE_BRANCH
+  - name: run tests
+    image: registry.odit.services/hub/library/node:19.5.0-alpine3.16
+    commands:
+      - npm config set registry $NPM_REGISTRY_URL && npm i -g pnpm@8
+      - pnpm i
+      - pnpm test:ci
+    environment:
+      NPM_REGISTRY_URL:
+        from_secret: npm_url
+trigger:
+  event:
+    - pull_request
+
+---
+kind: pipeline
+type: kubernetes
+name: build:dev
+clone:
+  disable: true
+
+steps:
+  - name: clone
+    image: alpine/git
+    commands:
+      - git clone $DRONE_REMOTE_URL .
+      - git checkout dev
+  - name: build dev
+    depends_on: ["clone"]
+    image: registry.odit.services/library/drone-kaniko
+    settings:
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+      build_args:
+        - NPM_REGISTRY_URL:
+          from_secret: npm_url
+      repo: lfk/backend
+      tags:
+        - dev
+      cache: true
+      registry: registry.odit.services
+
+trigger:
+  branch:
+    - dev
+  event:
+    - push
+
+---
+kind: pipeline
+type: kubernetes
+name: build:latest
+clone:
+  disable: true
+
+steps:
+  - name: clone
+    image: alpine/git
+    commands:
+      - git clone $DRONE_REMOTE_URL .
+      - git checkout dev
+      - git merge main
+      - git checkout main
+  - name: build latest
+    depends_on: ["clone"]
+    image: registry.odit.services/library/drone-kaniko
+    settings:
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+      build_args:
+        - NPM_REGISTRY_URL:
+          from_secret: npm_url
+      repo: lfk/backend
+      tags:
+        - latest
+      cache: true
+      registry: registry.odit.services
+  - name: push merge to repo
+    depends_on: ["clone"]
+    image: appleboy/drone-git-push
+    settings:
+      branch: dev
+      commit: false
+      remote: git@git.odit.services:lfk/backend.git
+      ssh_key:
+        from_secret: git_ssh
+
+trigger:
+  branch:
+    - main
+  event:
+    - push
+
+---
+kind: pipeline
+type: kubernetes
+name: build:tags
+
+steps:
+  - name: build $DRONE_TAG
+    depends_on: ["clone"]
+    image: registry.odit.services/library/drone-kaniko
+    settings:
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+      build_args:
+        - NPM_REGISTRY_URL:
+          from_secret: npm_url
+      repo: lfk/backend
+      tags:
+        - "${DRONE_TAG}"
+      cache: true
+      registry: registry.odit.services
+  - name: trigger js lib build
+    image: idcooldi/drone-webhook
+    settings:
+      urls: https://ci.odit.services/api/repos/lfk/lfk-client-js/builds?SOURCE_TAG=${DRONE_TAG}
+      bearer:
+        from_secret: ci_token
+trigger:
+  event:
+    - tag
--- a/.env.example
+++ b/.env.example
@@ -7,5 +7,4 @@ DB_PASSWORD=bla
 DB_NAME=./test.sqlite
 NODE_ENV=production
 POSTALCODE_COUNTRYCODE=DE
-SEED_TEST_DATA=false
-SELFSERVICE_URL=bla
+SEED_TEST_DATA=false
--- a/.gitea/workflows/release.yml
+++ b/.gitea/workflows/release.yml
@@ -1,33 +0,0 @@
-name: Build release images
-on:
-  push:
-    tags:
-      - "*.*.*"
-
-jobs:
-  build-container:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 19
-      - run: npm i -g pnpm@8 && pnpm i
-      - run: pnpm licenses:export
-      - name: Login to registry
-        uses: docker/login-action@v3
-        with:
-          registry: registry.odit.services
-          username: ${{ vars.REGISTRY_USERNAME }}
-          password: ${{ secrets.REGISTRY_PASSWORD }}
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Build and push
-        uses: docker/build-push-action@v6
-        with:
-          push: true
-          tags: |
-            ${{ vars.REGISTRY }}/lfk/backend:${{ github.ref_name }}
-          platforms: linux/amd64,linux/arm64
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,54 +2,8 @@

 All notable changes to this project will be documented in this file. Dates are displayed in UTC.

-#### [1.3.0](https://git.odit.services/lfk/backend/compare/1.2.1...1.3.0)
-
- feat: created_via for tracking how runners got into the system [`#212`](https://git.odit.services/lfk/backend/pull/212)
- feat: created_via for tracking how runners got into the system (#212) [`#211`](https://git.odit.services/lfk/backend/issues/211)
- ci: move to gitea workflows [`ebde8c6`](https://git.odit.services/lfk/backend/commit/ebde8c6ffd8b17c6752da8c4d8eb3095105f6132)
- build: docker "AS" casing [`0a43f1b`](https://git.odit.services/lfk/backend/commit/0a43f1bb5b26d3acb0d4d91648473f0dc55e8637)
- refactor(RunnerController.remove): only load necessary relations [`8c6fdb2`](https://git.odit.services/lfk/backend/commit/8c6fdb22390218e385780fadb3bdaf32148ac054)
- refactor(RunnerTeamController.remove): only load necessary relations [`c0d5af5`](https://git.odit.services/lfk/backend/commit/c0d5af5d7ab44cfdf19014e0d774fb560d08f6d7)
- fix: add .created_via to ResponseParticipant constructor [`2e271bc`](https://git.odit.services/lfk/backend/commit/2e271bcd52f02ab7449cd15916b0afc86e8b0a90)
-
-#### [1.2.1](https://git.odit.services/lfk/backend/compare/1.2.0...1.2.1)
-
-> 11 December 2024
-
- refactor: allow selfservice link every 30s [`07bf28b`](https://git.odit.services/lfk/backend/commit/07bf28b14458849930748ce041fb65e572759482)
- chore(release): 1.2.1 [`4008a5e`](https://git.odit.services/lfk/backend/commit/4008a5ee720b212bac9cba64417058bf4526060b)
-
-#### [1.2.0](https://git.odit.services/lfk/backend/compare/v1.1.4...1.2.0)
-
-> 11 December 2024
-
- refactor: move to new mailer [`0f4c8b2`](https://git.odit.services/lfk/backend/commit/0f4c8b2051cae17fbdd7e02017ad5b41c61e210c)
- refactor(ci): Switch to new woodpecker [`b3a73b2`](https://git.odit.services/lfk/backend/commit/b3a73b25e80a0466ff83e43481271fc0cd499a0d)
- feat: middlename [`6eff243`](https://git.odit.services/lfk/backend/commit/6eff2438035b368eb45931fad9402a6cb942b350)
- SELFSERVICE_URL [`765ef84`](https://git.odit.services/lfk/backend/commit/765ef849035ca4f8b2253bb76d15be8e9a3e6763)
- FRONTEND_URL env [`296ba8d`](https://git.odit.services/lfk/backend/commit/296ba8ddab1dba46f8201829d9a7e5fc1c88c0f8)
- chore: update readme [`d842c14`](https://git.odit.services/lfk/backend/commit/d842c14240fb4a7f70c66143bbe877f8168ef6d4)
- chore(release): 1.2.0 [`6764bf8`](https://git.odit.services/lfk/backend/commit/6764bf80eac832d186e688319d8a959543a1495f)
- Merge pull request 'refactor: move to new mailer' (#209) from refactor/new-mailer into dev [`bda1f97`](https://git.odit.services/lfk/backend/commit/bda1f971d1a14ea403439533c7ae31280c7df167)
-
-#### [v1.1.4](https://git.odit.services/lfk/backend/compare/v1.1.3...v1.1.4)
-
-> 20 November 2024
-
- build: package lock [`50dd703`](https://git.odit.services/lfk/backend/commit/50dd703a1bd276a607cc10a087c7e90fd880847a)
- fix(deps): Bump sqlite3 [`cd3cd81`](https://git.odit.services/lfk/backend/commit/cd3cd81360777e8bc4d78e861354e58c8da79cc7)
- feat(ci)!: Switch to woodpecker [`3192365`](https://git.odit.services/lfk/backend/commit/3192365793fae59f2b89e3231db298654f0a28e9)
- fix(deps): Bumped argon2 to latest version for arm support [`cf48c00`](https://git.odit.services/lfk/backend/commit/cf48c00ddb2ac33263549876928db50ae152c12d)
- fix: updated README for pnpm, typos [`5082b1b`](https://git.odit.services/lfk/backend/commit/5082b1b8b1c0ae9e8ffa9c71c4d7923fd9223c87)
- 🚀Bumped version to v1.1.4 [`a54cb28`](https://git.odit.services/lfk/backend/commit/a54cb287a4323ac8de77f51711cc6c52ec290859)
- ci: drop lfk-client-node [`075d484`](https://git.odit.services/lfk/backend/commit/075d484f1169bfc5c5b68cb9712116b0e270b471)
- fix(dependencies): Switch back to previous class-validator version to produce a working build [`74d334f`](https://git.odit.services/lfk/backend/commit/74d334f9b747a77115bd9b97729ef1120822e128)
-
 #### [v1.1.3](https://git.odit.services/lfk/backend/compare/v1.1.2...v1.1.3)

-> 10 May 2023
-
- 🚀Bumped version to v1.1.3 [`057a8ee`](https://git.odit.services/lfk/backend/commit/057a8ee699d08c0e4a80cb50a8820f819569c9ac)
 - feat(orgs): Also resolve child-teams' distances and add them to org total [`8d94186`](https://git.odit.services/lfk/backend/commit/8d9418635d3e381c0f55a2521a3334ba497c169a)
 - fix(orgs): Removed unused log [`f2832a2`](https://git.odit.services/lfk/backend/commit/f2832a2daecc7bc7bbee4d4fceeab8db194730cf)

--- a/4
+++ b/4
@@ -1,5 +1,5 @@
 # Typescript Build
-FROM registry.odit.services/hub/library/node:21.1.0-alpine3.18 AS build
+FROM registry.odit.services/hub/library/node:21.1.0-alpine3.18 as build
 ARG NPM_REGISTRY_URL=https://registry.npmjs.org
 WORKDIR /app

@@ -14,7 +14,7 @@ RUN pnpm run build \
    && pnpm i --production --prefer-offline

 # final image
-FROM registry.odit.services/hub/library/node:21.1.0-alpine3.18 AS final
+FROM registry.odit.services/hub/library/node:21.1.0-alpine3.18 as final
 WORKDIR /app
 COPY --from=build /app/package.json /app/package.json
 COPY --from=build /app/ormconfig.js /app/ormconfig.js
--- a/README.md
+++ b/README.md
@@ -35,6 +35,13 @@ pnpm test:watch
 pnpm test:ci
 ```

+### Use your own mail templates
+> You use your own mail templates by replacing the default ones we provided (either in-code or by mounting them into the /app/static/mail_templates folder).
+
+The mail templates always come in a .html and a .txt variant to provide compatability with legacy mail clients.
+Currently the following templates exist:
+* pw-reset.(html/txt)
+
 ### Generate Docs
 ```bash
 pnpm docs
@@ -59,7 +66,6 @@ pnpm docs
 | SEED_TEST_DATA         | Boolean            | False                | If you want the app to seed some example data set this to true                                                 |
 | MAILER_URL             | String(Url)        | N/A                  | The mailer's base url (no trailing slash)                                                                      |
 | MAILER_KEY             | String             | N/A                  | The mailer's api key.                                                                                          |
-| SELFSERVICE_URL        | String(Url)        | N/A                  | The link to selfservice (no trailing slash)                                                                    |
 | IMPRINT_URL            | String(Url)        | /imprint             | The link to a imprint page for the system (Defaults to the frontend's imprint)                                 |
 | PRIVACY_URL            | String(Url)        | /privacy             | The link to a privacy page for the system (Defaults to the frontend's privacy page)                            |

--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@odit/lfk-backend",
-  "version": "1.3.0",
+  "version": "1.1.3",
  "main": "src/app.ts",
  "repository": "https://git.odit.services/lfk/backend",
  "engines": {
@@ -26,12 +26,12 @@
  "license": "CC-BY-NC-SA-4.0",
  "dependencies": {
    "@odit/class-validator-jsonschema": "2.1.1",
-    "argon2": "0.31.2",
+    "argon2": "0.27.1",
    "axios": "0.21.1",
    "body-parser": "1.19.0",
    "check-password-strength": "2.0.2",
    "class-transformer": "0.3.1",
-    "class-validator": "0.13.0",
+    "class-validator": "0.13.1",
    "consola": "2.15.0",
    "cookie": "0.4.1",
    "cookie-parser": "1.4.5",
@@ -46,7 +46,7 @@
    "reflect-metadata": "0.1.13",
    "routing-controllers": "0.9.0-alpha.6",
    "routing-controllers-openapi": "2.2.0",
-    "sqlite3": "5.1.6",
+    "sqlite3": "5.0.0",
    "typeorm": "0.2.30",
    "typeorm-routing-controllers-extensions": "0.2.0",
    "typeorm-seeding": "1.6.1",
@@ -94,7 +94,7 @@
    "git": {
      "commit": true,
      "requireCleanWorkingDir": false,
-      "commitMessage": "chore(release): v${version}",
+      "commitMessage": "🚀Bumped version to v${version}",
      "requireBranch": "dev",
      "push": true,
      "tag": true,
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/src/controllers/RunnerController.ts
+++ b/src/controllers/RunnerController.ts
@@ -132,7 +132,7 @@ export class RunnerController {
 	async remove(@Param("id") id: number, @QueryParam("force") force: boolean) {
 		let runner = await this.runnerRepository.findOne({ id: id });
 		if (!runner) { return null; }
-		const responseRunner = await this.runnerRepository.findOne(runner);
+		const responseRunner = await this.runnerRepository.findOne(runner, { relations: ['scans', 'group', 'group.parentGroup', 'scans.track', 'cards'] });

 		if (!runner) {
 			throw new RunnerNotFoundError();
--- a/src/controllers/RunnerSelfServiceController.ts
+++ b/src/controllers/RunnerSelfServiceController.ts
@@ -127,11 +127,11 @@ export class RunnerSelfServiceController {
 		const runner = await this.runnerRepository.findOne({ email: mail });
 		if (!runner) { throw new RunnerNotFoundError(); }

-		if (runner.resetRequestedTimestamp > (Math.floor(Date.now() / 1000) - 30)) { throw new RunnerSelfserviceTimeoutError(); }
+		if (runner.resetRequestedTimestamp > (Math.floor(Date.now() / 1000) - 60 * 15)) { throw new RunnerSelfserviceTimeoutError(); }
 		const token = JwtCreator.createSelfService(runner);

 		try {
-			await Mailer.sendSelfserviceForgottenMail(runner.email, runner.id, runner.firstname, runner.middlename, runner.lastname, token, locale)
+			await Mailer.sendSelfserviceForgottenMail(runner.email, token, locale)
 		} catch (error) {
 			throw new MailSendingError();
 		}
@@ -157,7 +157,7 @@ export class RunnerSelfServiceController {
 		response.token = JwtCreator.createSelfService(runner);

 		try {
-			await Mailer.sendSelfserviceWelcomeMail(runner.email, runner.id, runner.firstname, runner.middlename, runner.lastname, response.token, locale)
+			await Mailer.sendSelfserviceWelcomeMail(runner.email, response.token, locale)
 		} catch (error) {
 			throw new MailSendingError();
 		}
@@ -182,7 +182,7 @@ export class RunnerSelfServiceController {
 		response.token = JwtCreator.createSelfService(runner);

 		try {
-			await Mailer.sendSelfserviceWelcomeMail(runner.email, runner.id, runner.firstname, runner.middlename, runner.lastname, response.token, locale)
+			await Mailer.sendSelfserviceWelcomeMail(runner.email, response.token, locale)
 		} catch (error) {
 			throw new MailSendingError();
 		}
--- a/src/controllers/RunnerTeamController.ts
+++ b/src/controllers/RunnerTeamController.ts
@@ -119,7 +119,7 @@ export class RunnerTeamController {
 	async remove(@Param("id") id: number, @QueryParam("force") force: boolean) {
 		let team = await this.runnerTeamRepository.findOne({ id: id });
 		if (!team) { return null; }
-		let runnerTeam = await this.runnerTeamRepository.findOne(team, { relations: ['runners'] });
+		let runnerTeam = await this.runnerTeamRepository.findOne(team, { relations: ['parentGroup', 'contact', 'runners'] });

 		if (!force) {
 			if (runnerTeam.runners.length != 0) {
--- a/src/errors/RunnerErrors.ts
+++ b/src/errors/RunnerErrors.ts
@@ -47,14 +47,14 @@ export class RunnerEmailNeededError extends NotAcceptableError {
 }

 /**
- * Error to throw when a runner already requested a new selfservice link in the last 30s.
+ * Error to throw when a runner already requested a new selfservice link in the last 24hrs.
 */
 export class RunnerSelfserviceTimeoutError extends NotAcceptableError {
 	@IsString()
 	name = "RunnerSelfserviceTimeoutError"

 	@IsString()
-	message = "You can only reqest a new token every 30s."
+	message = "You can only reqest a new token every 24hrs."
 }

 /**
--- a/src/mailer.ts
+++ b/src/mailer.ts
@@ -18,19 +18,9 @@ export class Mailer {
     */
    public static async sendResetMail(to_address: string, token: string, locale: string = "en") {
        try {
-            await axios.request({
-                method: 'POST',
-                url: `${Mailer.base}/api/v1/email`,
-                headers: {
-                    authorization: `Bearer ${Mailer.key}`,
-                    'content-type': 'application/json'
-                },
-                data: {
-                    to: to_address,
-                    templateName: 'password-reset',
-                    language: locale,
-                    data: { token: token }
-                }
+            await axios.post(`${Mailer.base}/reset?locale=${locale}&key=${Mailer.key}`, {
+                address: to_address,
+                resetKey: token
            });
        } catch (error) {
            if (Mailer.testing) { return true; }
@@ -42,26 +32,12 @@ export class Mailer {
     * Function for sending a runner selfservice welcome mail.
     * @param to_address The address the mail will be sent to. Should always get pulled from a runner object.
     * @param token The requested selfservice token - will be combined with the app_url to generate a selfservice profile link.
-    */
-    public static async sendSelfserviceWelcomeMail(to_address: string, runner_id: number, firstname: string, middlename: string, lastname: string, token: string, locale: string = "en") {
+     */
+    public static async sendSelfserviceWelcomeMail(to_address: string, token: string, locale: string = "en") {
        try {
-            await axios.request({
-                method: 'POST',
-                url: `${Mailer.base}/api/v1/email`,
-                headers: {
-                    authorization: `Bearer ${Mailer.key}`,
-                    'content-type': 'application/json'
-                },
-                data: {
-                    to: to_address,
-                    templateName: 'welcome',
-                    language: locale,
-                    data: {
-                        name: `${firstname} ${middlename} ${lastname}`,
-                        barcode_content: `${runner_id}`,
-                        link: `${process.env.SELFSERVICE_URL}/profile/${token}`
-                    }
-                }
+            await axios.post(`${Mailer.base}/registration?locale=${locale}&key=${Mailer.key}`, {
+                address: to_address,
+                selfserviceToken: token
            });
        } catch (error) {
            if (Mailer.testing) { return true; }
@@ -73,26 +49,12 @@ export class Mailer {
     * Function for sending a runner selfservice link forgotten mail.
     * @param to_address The address the mail will be sent to. Should always get pulled from a runner object.
     * @param token The requested selfservice token - will be combined with the app_url to generate a selfservice profile link.
-    */
-    public static async sendSelfserviceForgottenMail(to_address: string, runner_id: number, firstname: string, middlename: string, lastname: string, token: string, locale: string = "en") {
+     */
+    public static async sendSelfserviceForgottenMail(to_address: string, token: string, locale: string = "en") {
        try {
-            await axios.request({
-                method: 'POST',
-                url: `${Mailer.base}/api/v1/email`,
-                headers: {
-                    authorization: `Bearer ${Mailer.key}`,
-                    'content-type': 'application/json'
-                },
-                data: {
-                    to: to_address,
-                    templateName: 'welcome',
-                    language: locale,
-                    data: {
-                        name: `${firstname} ${middlename} ${lastname}`,
-                        barcode_content: `${runner_id}`,
-                        link: `${process.env.SELFSERVICE_URL}/profile/${token}`
-                    }
-                }
+            await axios.post(`${Mailer.base}/registration_forgot?locale=${locale}&key=${Mailer.key}`, {
+                address: to_address,
+                selfserviceToken: token
            });
        } catch (error) {
            if (Mailer.testing) { return true; }
--- a/src/models/actions/create/CreateSelfServiceCitizenRunner.ts
+++ b/src/models/actions/create/CreateSelfServiceCitizenRunner.ts
@@ -26,7 +26,6 @@ export class CreateSelfServiceCitizenRunner extends CreateParticipant {
    public async toEntity(): Promise<Runner> {
        let newRunner: Runner = new Runner();

-        newRunner.created_via = "selfservice";
        newRunner.firstname = this.firstname;
        newRunner.middlename = this.middlename;
        newRunner.lastname = this.lastname;
--- a/src/models/actions/create/CreateSelfServiceRunner.ts
+++ b/src/models/actions/create/CreateSelfServiceRunner.ts
@@ -28,7 +28,6 @@ export class CreateSelfServiceRunner extends CreateParticipant {
    public async toEntity(group: RunnerGroup): Promise<Runner> {
        let newRunner: Runner = new Runner();

-        newRunner.created_via = "selfservice";
        newRunner.firstname = this.firstname;
        newRunner.middlename = this.middlename;
        newRunner.lastname = this.lastname;
--- a/src/models/entities/Participant.ts
+++ b/src/models/entities/Participant.ts
@@ -75,14 +75,6 @@ export abstract class Participant {
  @IsEmail()
  email?: string;

-  /**
-   * how the participant got into the system
-   */
-  @Column({ nullable: true, default: "backend" })
-  @IsOptional()
-  @IsEmail()
-  created_via?: string;
-
  /**
   * Turns this entity into it's response class.
   */
--- a/src/models/responses/ResponseParticipant.ts
+++ b/src/models/responses/ResponseParticipant.ts
@@ -50,12 +50,6 @@ export abstract class ResponseParticipant implements IResponse {
    @IsString()
    email?: string;

-    /**
-     * how the participant got into the system
-     */
-    @IsString()
-    created_via?: string;
-
    /**
     * The participant's address.
     */
@@ -70,7 +64,6 @@ export abstract class ResponseParticipant implements IResponse {
    public constructor(participant: Participant) {
        this.id = participant.id;
        this.firstname = participant.firstname;
-        this.created_via = participant.created_via;
        this.middlename = participant.middlename;
        this.lastname = participant.lastname;
        this.phone = participant.phone;
Author	SHA1	Message	Date
Philipp Dormann	5ef3b6eb97	merge dev to main (#208 ) Co-authored-by: Nicolai Ort <info@nicolai-ort.com> Reviewed-on: #208 Co-authored-by: Philipp Dormann <philipp@philippdormann.de> Co-committed-by: Philipp Dormann <philipp@philippdormann.de>	2023-11-06 17:18:48 +00:00
Nicolai Ort	e98e7717aa	Merge pull request 'Releases 0.13.2 & 0.13.3' (#203 ) from dev into main Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #203 Reviewed-by: Philipp Dormann <philipp@noreply.git.odit.services>	2023-02-15 13:59:07 +00:00