merge request id	204
Titel	Feature/ll 384 crosscheck notifications
Beschreibung	- Notifications werden nun sauber angezeigt - reminder Variante triggert jetzt N Tage nach Buchungsstart und nicht N Tage nach Content-Aufruf - Administration von Reminder-Templates für Mandanten fit gemacht
Status	merged
Created at	2020-06-17T11:25:59.338Z
Updated at	2020-06-18T15:37:35.873Z
Source branch	feature/LL-384-crosscheck-notifications
Target branch	develop
Author	Gregor Gabriel
Assignee	Sascha Immig

Discussion notes

added 54 commits 83936922...c77a06e9 - 53 commits from branch develop 7679fd26 - Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into… Compare with previous version	Gregor Gabriel	2020-06-18T14:00:43.476Z
added 1 commit 873a546d - fixed tests Compare with previous version	Gregor Gabriel	2020-06-18T14:40:30.929Z
added 1 commit 47545692 - added reminder permissions Compare with previous version	Gregor Gabriel	2020-06-18T15:11:36.309Z
merged	Sascha Immig	2020-06-18T15:37:35.930Z
mentioned in commit 01ec225bcd3f35874713db713fa9c582b62613f9	Sascha Immig	2020-06-18T15:37:36.011Z

Merge Commits

Title	Id	Author	Created at	Message
fixed notification display functions for reminder notifications	2496f8c979613c6fb3186393ef9b5af2ccd981b6	TUV\gabrielg	2020-06-15T15:20:32.000Z	fixed notification display functions for reminder notifications
Changed behaviour of reminder if option "days after start" is selected	38bc5262c90550170e304b7da43c668e05bc2a04	TUV\gabrielg	2020-06-16T12:08:36.000Z	Changed behaviour of reminder if option "days after start" is selected
added reminder permissions	47545692c15ddf6900e3d32f82d49e7624874e2e	TUV\gabrielg	2020-06-18T15:11:30.000Z	added reminder permissions fixed menu display
made sure notification will really be send	4ca51695315ac91bc6ba0c36b3ffe4f29e449231	TUV\gabrielg	2020-06-16T08:13:25.000Z	made sure notification will really be send
Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into…	7679fd263cc877b60ec5bd55bbb879674ba1b7ba	TUV\gabrielg	2020-06-18T14:00:33.000Z	Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-384-crosscheck-notifications # Conflicts: # app/Models/TrainingReminder.php # app/Notifications/TrainingReminder.php # tests/Feature/TrainingReminderTest.php
Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into…	769b522b21002db22472daa88f679c6bd94ac949	TUV\gabrielg	2020-06-15T13:56:58.000Z	Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-384-crosscheck-notifications # Conflicts: # resources/lang/de.json
+ added reminder template permissions to config/subscription.php	83936922c38e106482672a7a4b5e402210c758bb	TUV\gabrielg	2020-06-17T11:19:28.000Z	+ added reminder template permissions to config/subscription.php
fixed tests	873a546da92d1ef931cf7607ee236680153755a5	TUV\gabrielg	2020-06-18T14:40:21.000Z	fixed tests
+ added missing text and link to internal reminder	8821b88df5ce2ce4278df4046832f9ab7e075d56	TUV\gabrielg	2020-05-29T10:46:26.000Z	+ added missing text and link to internal reminder
+ fixed reminder test	d451a0ad248357fed877eb4bb24d759b810f64cd	TUV\gabrielg	2020-06-17T11:14:31.000Z	+ fixed reminder test + prepared reminder templates for clients