merge request id	609
Titel	LL-1224 - lang: en translation added and separate email translation file…
Beschreibung	LL-1224 - lang: en translation added and separate email translation file inserted, docs: merge and extended mails and notifications into mails-notifications Add new translation files into lang/de/e-mail.php and lang/en/e-mail.php for all templates in …\views\emails\... Deleted old Template from myC orders/created.plade.php mails and notifications were merged into mails-notifications to avoid duplications. The data was sorted according to its type and the email template used for a better overview. The tables were extended by the used email template.
Status	merged
Created at	2022-04-12T09:51:17.416Z
Updated at	2022-04-26T17:06:55.699Z
Source branch	feature/LL-1124-switch-mails-to-multilingualism
Target branch	develop
Author	Markus Gerlach
Assignee	Sascha Immig

Discussion notes

added 67 commits f8dbf2f7...b11ea171 - 66 commits from branch develop 06c11509 - Merge branch 'develop' into 'feature/LL-1124-switch-mails-to-multilingualism' Compare with previous version	Markus Gerlach	2022-04-12T13:02:02.918Z
added 3 commits b074e369 - Simplified placeholder for campaign mails. Optimized use of english language. 64a1e468 - removed extlines about additional documents from accounting 8cea739b - simplification by consolidating two placeholders Compare with previous version	Sascha Immig	2022-04-26T15:13:58.863Z
added 1 commit 973b05d9 - updated dompdf Compare with previous version	Sascha Immig	2022-04-26T15:44:15.869Z
added 1 commit 4b2a670c - updated composer/composer Compare with previous version	Sascha Immig	2022-04-26T15:56:27.169Z
merged	Sascha Immig	2022-04-26T17:06:55.742Z

Merge Commits

Title	Id	Author	Created at	Message
Merge branch 'develop' into 'feature/LL-1124-switch-mails-to-multilingualism'	06c115093eea0c1be716476f4ccde0c314254706	Markus Gerlach	2022-04-12T13:01:59.000Z	Merge branch 'develop' into 'feature/LL-1124-switch-mails-to-multilingualism' # Conflicts: # resources/views/emails/campaigns/ended.blade.php # resources/views/emails/campaigns/ending.blade.php # resources/views/emails/subscriptions/updated.blade.php # resources/views/emails/subscriptions/updated_inform_client.blade.php
updated composer/composer	4b2a670cb364a9acad614fb10b85b3953ea1a06c	TUV\immigs	2022-04-26T15:56:16.000Z	updated composer/composer
removed extlines about additional documents from accounting	64a1e4681956b6346ecba23396a21ade6e3facbb	TUV\immigs	2022-04-26T15:06:39.000Z	removed extlines about additional documents from accounting
simplification by consolidating two placeholders	8cea739b68b515241a3f4f26e823846cb77d7571	TUV\immigs	2022-04-26T15:13:15.000Z	simplification by consolidating two placeholders
updated dompdf	973b05d9a87c0b62f07d82937dfbcf15bbce04eb	TUV\immigs	2022-04-26T15:42:13.000Z	updated dompdf
Simplified placeholder for campaign mails. Optimized use of english language.	b074e3694432e79be4b493d5f988b0402ceecf20	TUV\immigs	2022-04-25T19:58:48.000Z	Simplified placeholder for campaign mails. Optimized use of english language.
LL-1224 - lang: en translation added and separate email translation file…	f8dbf2f7d89a24edde4832dd2fa115df6a0bb31a	markusgerlach	2022-04-12T09:39:33.000Z	LL-1224 - lang: en translation added and separate email translation file inserted, docs: merge and extended mails and notifications into mails-notifications Add new translation files into lang/de/e-mail.php and lang/en/e-mail.php for all templates in …\views\emails\... Deleted old Template from myC orders/created.plade.php mails and notifications were merged into mails-notifications to avoid duplications. The data was sorted according to its type and the email template used for a better overview. The tables were extended by the used email template.