merge request id	760
Titel	Feature/ll 1387 replace js prompt
Beschreibung
Status	merged
Created at	2023-02-28T15:16:25.573Z
Updated at	2023-03-08T16:19:32.753Z
Source branch	feature/LL-1387-replace-js-prompt
Target branch	develop
Author	Richard Klings
Assignee	Gregor Gabriel

Discussion notes

assigned to @gabrielg	Sascha Immig	2023-03-08T10:39:57.905Z
added 1 commit 102f5ac8 - replaced text by delete icon as it was so before Compare with previous version	Gregor Gabriel	2023-03-08T16:07:57.069Z
enabled an automatic merge when the pipeline for 102f5ac89708656c8a9ea8c46556eb135544f80a succeeds	Gregor Gabriel	2023-03-08T16:09:20.603Z
merged	Gregor Gabriel	2023-03-08T16:19:32.838Z
mentioned in commit 84ec084d4d6069ba6ae1e3a2f3365704491193c9	Gregor Gabriel	2023-03-08T16:19:33.090Z

Merge Commits

Title	Id	Author	Created at	Message
Merge branch 'develop' into feature/LL-1387-replace-js-prompt	0d4cf9ba289804e2e068a0a5970a3bc2a16cee4b	Richard Klings	2023-02-27T15:18:28.000Z	Merge branch 'develop' into feature/LL-1387-replace-js-prompt # Conflicts: # .gitlab-ci.yml # resources/views/admin/organizationUnits/users/table.blade.php
replaced text by delete icon as it was so before	102f5ac89708656c8a9ea8c46556eb135544f80a	TUV\gabrielg	2023-03-08T16:07:48.000Z	replaced text by delete icon as it was so before
LL-1387: features war bereits ein Eintrag. in tarif-features geändert.	3ec027fe813d13d5c8df79f046c1687c5f4dc056	Richard Klings	2023-02-28T12:29:59.000Z	LL-1387: features war bereits ein Eintrag. in tarif-features geändert.
Versuch die pipeline wieder hinzubekommen	6ca10374c4b7236abee9eb5ee726163bf9191030	Richard Klings	2023-02-08T13:45:36.000Z	Versuch die pipeline wieder hinzubekommen
Zwischen commit	81f37522bfa0617fa138258de6427cf88ef797a8	Richard Klings	2023-02-08T13:41:15.000Z	Zwischen commit
Merge branch 'develop' into feature/LL-1387-replace-js-prompt (Konflikte wegen…	8f2bbce1b760e9ebe2c8c36d6645f771b2a8dd9c	Richard Klings	2023-02-10T09:50:36.000Z	Merge branch 'develop' into feature/LL-1387-replace-js-prompt (Konflikte wegen der Behebung des franz. Apostroph-Problemes im prompt, das im feature-branch wegfällt # Conflicts: # resources/views/admin/categories/edit.blade.php # resources/views/admin/classroomTrainings/assignment/users/table.blade.php # resources/views/admin/clients/api_keys/edit.blade.php # resources/views/admin/contentBlocks/edit.blade.php # resources/views/admin/contentBlocks/position/table.blade.php # resources/views/admin/contents/edit.blade.php # resources/views/admin/contents/svn/table.blade.php # resources/views/admin/faqs/edit.blade.php # resources/views/admin/groups/assignment/users/table.blade.php # resources/views/admin/links/edit.blade.php # resources/views/admin/media/edit.blade.php # resources/views/admin/menus/edit.blade.php # resources/views/admin/organizationUnits/users/table.blade.php # resources/views/admin/pages/edit.blade.php # resources/views/admin/participationCertificates/edit.blade.php # resources/views/admin/redirects/edit.blade.php # resources/views/admin/reminderTemplates/edit.blade.php # resources/views/admin/roles/table.blade.php # resources/views/admin/tags/edit.blade.php # resources/views/admin/targetAudiences/edit.blade.php # resources/views/admin/tariffFeatures/edit.blade.php # resources/views/admin/tariffs/edit.blade.php # resources/views/admin/trainingProviders/edit.blade.php # resources/views/admin/trainingProviders/includes/users.blade.php # resources/views/admin/users/edit.blade.php
Merge branch 'develop' into feature/LL-1387-replace-js-prompt	95759f7fed1179220b1622370ff3a3ac98d76df1	Richard Klings	2023-02-28T12:50:59.000Z	Merge branch 'develop' into feature/LL-1387-replace-js-prompt
Falscher Host	a4f82db19400508160da156ab75ce6a647aef45f	Richard Klings	2023-02-08T13:53:48.000Z	Falscher Host
Falscher Host	b0e92390de05a4170af0adf20806c007e8c0001f	Richard Klings	2023-02-08T13:55:25.000Z	Falscher Host
LL-1387: Anpassung des Wordings	c99f76c8577d26f86d720113a30f73d6aeb4cb28	Richard Klings	2023-02-27T11:49:24.000Z	LL-1387: Anpassung des Wordings
LL-1387: Konflikt behoben	ff1e2b6b30deed745da31e242bc8770ad4a6e178	Richard Klings	2023-02-22T10:48:11.000Z	LL-1387: Konflikt behoben