From e713ef54ef39d4759832ada073cea825b4ef26dc Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Thu, 15 Apr 2021 18:04:19 +0000 Subject: [PATCH 1/5] =?UTF-8?q?=F0=9F=A7=BENew=20changelog=20file=20versio?= =?UTF-8?q?n=20[CI=20SKIP]=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f8e1f7..afc1669 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,10 @@ All notable changes to this project will be documented in this file. Dates are d #### [v0.1.2](https://git.odit.services/lfk/mailer/compare/v0.1.1...v0.1.2) +- Merge pull request 'Release 0.1.2' (#14) from dev into main [`15b98e8`](https://git.odit.services/lfk/mailer/commit/15b98e83098906005e0f3f0b24313f9cab6ec1af) - Fixed typos and added missing translations🌎 [`8099d2f`](https://git.odit.services/lfk/mailer/commit/8099d2fdbaa8fea6e4fd6a993ac1cfb09e01d14d) - 🧾New changelog file version [CI SKIP] [skip ci] [`c8378b6`](https://git.odit.services/lfk/mailer/commit/c8378b66ba512a90ca4386d5a3570f4bb8bea049) +- 🧾New changelog file version [CI SKIP] [skip ci] [`fbc95be`](https://git.odit.services/lfk/mailer/commit/fbc95be3455eed0d97a124f7df277d0f902e76c9) - 🚀Bumped version to v0.1.2 [`d550059`](https://git.odit.services/lfk/mailer/commit/d5500594945b99e428ac1651afd1fe8a8eeba192) #### [v0.1.1](https://git.odit.services/lfk/mailer/compare/v0.1.0...v0.1.1) From 1eb1a0ad7e11b8f25b2b8d0efea991cab444c6ee Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Tue, 31 Jan 2023 13:56:59 +0100 Subject: [PATCH 2/5] cleaned up mail texts for lfk 2023 --- src/locales/de.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/locales/de.json b/src/locales/de.json index 2d0be3b..cf75257 100644 --- a/src/locales/de.json +++ b/src/locales/de.json @@ -2,9 +2,9 @@ "a-password-reset-for-your-account-got-requested": "Ein Passwort Reset wurde für dein Konto beantragt.", "all-rights-reserved": "Alle Rechte vorbehalten", "event_name-registration": "{{event_name}} Registrierung", - "if-you-didnt-register-yourself-you-should-contact-us-to-get-your-data-removed-from-our-systems": "Solltest du dich nicht selbst registriert haben schick uns bitte eine Mail und wir entfernen deine Daten aus unserem System: ", + "if-you-didnt-register-yourself-you-should-contact-us-to-get-your-data-removed-from-our-systems": "Solltest du dich nicht selbst registriert haben, sende uns bitte eine Mail und wir entfernen deine Daten aus unserem System: ", "if-you-didnt-request-the-reset-please-ignore-this-mail": "Solltest du den Reset nicht beantragt haben kannst du diese Mail einfach ignorieren.", - "if-you-ever-loose-the-link-you-can-request-a-new-one-by-visiting-our-website": "Solltest du den Link verlieren kannst du auf unserer Website einen neuen beantragen:", + "if-you-ever-loose-the-link-you-can-request-a-new-one-by-visiting-our-website": "Auf unserer Website kannst du jederzeit einen neuen Login-Link beantragen:", "imprint": "Impressum", "lfk-mail-test": "{{copyright_owner}} - Mail test", "lfk-password-reset": "{{copyright_owner}} - Passwort zurücksetzen", @@ -13,8 +13,8 @@ "reset-password": "Passwort zurücksetzen", "test-mail": "Test mail", "thank-you-for-requesting-a-new-link-to-your-event_name-runner-profile": "Danke, dass du einen neuen Profillink für das {{event_name}} Läuferstem beantragt hast.", - "thanks-for-registering-and-welcome-to-the-event_name": "Vielen Dank für die Registrierung und willkommen beim {{event_name}}!", - "the-only-thing-you-have-to-do-now-is-to-bring-your-registration-code-with-you": "Du must nichts weiter machen, außer deinen Registrierungscode zum Lauf mitzubringen.", + "thanks-for-registering-and-welcome-to-the-event_name": "Vielen Dank für die Registrierung beim {{event_name}}", + "the-only-thing-you-have-to-do-now-is-to-bring-your-registration-code-with-you": "Bitte bringe deinen Registrierungscode zum Lauf am 21.04.2023 mit.", "this-is-a-test-mail-triggered-by-an-admin-in-the-lfk-backend": "Das ist eine Testmail, die von einem Admin im LfK! Backend erzeugt wurde.", "this-mail-was-sent-to-recipient_mail-because-someone-request-a-mail-test-for-this-mail-address": "Du bekommst diese Mail, weil jemand eine Testmail für deine Mail-Adresse angefragt hat.", "this-mail-was-sent-to-you-because-someone-request-a-password-reset-for-a-account-linked-to-the-mail-address": "Du bekommst diese E-Mail, weil jemand einen Passwort-Reset für deinen Account beantragt hat.", @@ -24,7 +24,7 @@ "view-my-data": "Meine Daten", "we-successfully-processed-your-registration": "Wir haben deine Registrierung erfolgreich verarbeitet.", "welcome": "Willkommen", - "you-can-view-your-registration-code-lap-times-and-much-more-by-visiting-our-selfservice": "Du kannst deinen Registrierungscode, deine Rundenzeiten und vieles mehr im Selfservice einsehen:", + "you-can-view-your-registration-code-lap-times-and-much-more-by-visiting-our-selfservice": "Deinen Registrierungscode, Rundenzeiten und vieles mehr kannst du im Selfservice einsehen:", "your-event_name-profile": "Dein {{event_name}} Profil", "your-password-wont-be-changed-until-you-click-the-reset-link-below-and-set-a-new-one": "Dein Passwort wird erst zurückgesetzt, wenn du den Reset-Link öffnest und ein neues Passwort setzt.", "your-profile": "Dein Profil" From 809df9c4acd38face38e29fb6257bdd210491494 Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Tue, 31 Jan 2023 13:57:58 +0100 Subject: [PATCH 3/5] update runner-welcome mail template close #15 --- src/Mailer.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Mailer.ts b/src/Mailer.ts index c0cd66e..fb2195f 100644 --- a/src/Mailer.ts +++ b/src/Mailer.ts @@ -134,7 +134,7 @@ export class Mailer { link_imprint: `${config.app_url}/imprint`, link_privacy: `${config.app_url}/privacy`, selfservice_link: `${config.app_url}/selfservice/profile/${token}`, - forgot_link: `${config.app_url}/selfservice`, + forgot_link: `${config.app_url}/selfservice/`, contact_mail: config.contact_mail, event_name: config.event_name } @@ -168,7 +168,7 @@ export class Mailer { link_imprint: `${config.app_url}/imprint`, link_privacy: `${config.app_url}/privacy`, selfservice_link: `${config.app_url}/selfservice/profile/${token}`, - forgot_link: `${config.app_url}/selfservice`, + forgot_link: `${config.app_url}/selfservice/`, contact_mail: config.contact_mail, event_name: config.event_name } From 00bb40ddf999245d9fa0b005f000e670f4daf60c Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Tue, 31 Jan 2023 13:00:29 +0000 Subject: [PATCH 4/5] =?UTF-8?q?=F0=9F=A7=BENew=20changelog=20file=20versio?= =?UTF-8?q?n=20[CI=20SKIP]=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index afc1669..f4b59b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,15 @@ All notable changes to this project will be documented in this file. Dates are displayed in UTC. +#### [v0.1.2](https://git.odit.services/lfk/mailer/compare/v0.1.2...v0.1.2) + +- update runner-welcome mail template [`#15`](https://git.odit.services/lfk/mailer/issues/15) +- 🧾New changelog file version [CI SKIP] [skip ci] [`e713ef5`](https://git.odit.services/lfk/mailer/commit/e713ef54ef39d4759832ada073cea825b4ef26dc) + #### [v0.1.2](https://git.odit.services/lfk/mailer/compare/v0.1.1...v0.1.2) +> 15 April 2021 + - Merge pull request 'Release 0.1.2' (#14) from dev into main [`15b98e8`](https://git.odit.services/lfk/mailer/commit/15b98e83098906005e0f3f0b24313f9cab6ec1af) - Fixed typos and added missing translations🌎 [`8099d2f`](https://git.odit.services/lfk/mailer/commit/8099d2fdbaa8fea6e4fd6a993ac1cfb09e01d14d) - 🧾New changelog file version [CI SKIP] [skip ci] [`c8378b6`](https://git.odit.services/lfk/mailer/commit/c8378b66ba512a90ca4386d5a3570f4bb8bea049) From 247d4b617678655845b5baf6ae5deba01e953a39 Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Tue, 31 Jan 2023 13:01:06 +0000 Subject: [PATCH 5/5] =?UTF-8?q?=F0=9F=93=96New=20license=20file=20version?= =?UTF-8?q?=20[CI=20SKIP]=20[skip=20ci]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- licenses.md | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/licenses.md b/licenses.md index 5ae5909..65efca2 100644 --- a/licenses.md +++ b/licenses.md @@ -244,7 +244,7 @@ SOFTWARE. # i18next-fs-backend **Author**: undefined **Repo**: git@github.com:i18next/i18next-fs-backend.git -**License**: undefined +**License**: MIT **Description**: i18next-fs-backend is a backend layer for i18next using in Node.js and for Deno to load translations from the filesystem. ## License Text @@ -604,7 +604,7 @@ SOFTWARE. **Author**: [object Object] **Repo**: https://github.com/remy/nodemon.git **License**: MIT -**Description**: Simple monitor script for use during development of a node.js app. +**Description**: Simple monitor script for use during development of a Node.js app. ## License Text MIT License @@ -687,6 +687,27 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. **License**: MIT **Description**: Starts server, waits for URL, then runs test command; when the tests end, shuts down server ## License Text +MIT License + +Copyright (c) 2022 bahmutov + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. # ts-jest