merge request id	843
Titel	Feature/ll 1537 test sending for mail templates
Beschreibung
Status	merged
Created at	2023-07-05T15:40:31.817Z
Updated at	2023-07-28T07:34:29.368Z
Source branch	feature/LL-1537-test-sending-for-mail-templates
Target branch	develop
Author	Gregor Gabriel
Assignee	Sascha Immig

Discussion notes

added 1 commit 54232cb5 - added additional test for mail templates Compare with previous version	Gregor Gabriel	2023-07-07T07:47:23.750Z
added 92 commits 54232cb5...eeb87893 - 91 commits from branch develop 4f9577e3 - Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into… Compare with previous version	Gregor Gabriel	2023-07-20T07:54:02.304Z
added 18 commits 4f9577e3...f02b6b41 - 17 commits from branch develop 42fdd8b3 - Merge branch 'develop' into 'feature/LL-1537-test-sending-for-mail-templates' Compare with previous version	Sascha Immig	2023-07-28T07:25:53.585Z
enabled an automatic merge when the pipeline for 42fdd8b3ba3b0fd033e1e2d2dc8d9523bd50444e succeeds	Sascha Immig	2023-07-28T07:27:25.546Z
merged	Sascha Immig	2023-07-28T07:34:29.433Z
mentioned in commit b1dca2ff9d0a878d0c9a926ca4f2b1a1baf08fa4	Sascha Immig	2023-07-28T07:34:29.705Z

Merge Commits

Title	Id	Author	Created at	Message
Merge branch 'develop' into 'feature/LL-1537-test-sending-for-mail-templates'	42fdd8b3ba3b0fd033e1e2d2dc8d9523bd50444e	Sascha Immig	2023-07-28T07:25:51.000Z	Merge branch 'develop' into 'feature/LL-1537-test-sending-for-mail-templates' # Conflicts: # resources/lang/fr/e-mail.php
Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into…	4f9577e34527e68ddf19cfea3bf5ff7c1e1d4b60	TUV\gabrielg	2023-07-20T07:53:54.000Z	Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-1537-test-sending-for-mail-templates # Conflicts: # app/Notifications/AccountCreated.php # app/Notifications/TrainingsAssigned.php # resources/views/admin/mailTemplates/edit.blade.php
added additional test for mail templates	54232cb538f6e4a74a76ed2f74c160f81c86dcf2	TUV\gabrielg	2023-07-07T07:47:19.000Z	added additional test for mail templates
adapted mail template seeder to work initially without a later added column	82d8c17459b138597070bdd39e40339ef8cdc647	TUV\gabrielg	2023-07-05T15:39:56.000Z	adapted mail template seeder to work initially without a later added column
reworked according to Sascha's wishes	f56be4e0d9fd5fd778d65b83ec9f8ed33e4d2edf	TUV\gabrielg	2023-07-05T15:10:37.000Z	reworked according to Sascha's wishes
fixed 3 simple php-stan problems	f683bc6c5e37b8b2ac226fec2f4efdde8a77edbc	TUV\gabrielg	2023-07-05T15:29:44.000Z	fixed 3 simple php-stan problems
added testmail button to mail templates administration	fac13a47c8807e248c130d89f32505073db0fc95	TUV\gabrielg	2023-07-04T13:34:57.000Z	added testmail button to mail templates administration