merge request id	991
Titel	Feature/ll 1698 integration of the authoring tool excelerate
Beschreibung
Status	merged
Created at	2024-07-12T09:55:35.630Z
Updated at	2024-07-29T12:29:52.691Z
Source branch	feature/LL-1698-integration-of-the-authoring-tool-excelerate
Target branch	develop
Author	Markus Gerlach
Assignee	Sascha Immig

Discussion notes

merged	Sascha Immig	2024-07-29T12:29:52.779Z
mentioned in commit dad0be3dbf0a3cd401234769fb6991d817caea6f	Sascha Immig	2024-07-29T12:29:53.162Z

Merge Commits

Title	Id	Author	Created at	Message
remove authoring tool account and contents after deleting client	0341720f0e91049760d4f92a13045d54e83af3cb	gerlachm	2024-05-21T11:33:05.000Z	remove authoring tool account and contents after deleting client secured form
LL-1698-integration-of-the-authoring-tool-excelerat update .env .example	0bc9190315bba64180a5d2d0c97b7cf6b7e8808c	gerlachm	2024-07-12T09:03:21.000Z	LL-1698-integration-of-the-authoring-tool-excelerat update .env .example AUTHORING_TOOL_API_URL AUTHORING_TOOL_TRAINING_LOGIN_PATH
start php-cs-fixer fix	1b5b71659fa2595af2bb8fdd5eae61300bde9203	gerlachm	2024-07-09T14:41:53.000Z	start php-cs-fixer fix
Merge branch 'develop' into feature/LL-1698-integration-of-the-authoring-tool-excelerate	20c13b91cbadceb27487805f1e21e143796baf23	TUV\immigs	2024-07-01T15:17:27.000Z	Merge branch 'develop' into feature/LL-1698-integration-of-the-authoring-tool-excelerate
merge migrations	2e29c6735f27e6dddf4a011af3299ec0e4c4ea59	gerlachm	2024-05-16T07:55:45.000Z	merge migrations
Merge branch 'develop' into feature/LL-1698-integration-of-the-authoring-tool-excelerate	348c50a41ce8c9e633f7e74b675741c54ee58c25	gerlachm	2024-07-01T06:26:45.000Z	Merge branch 'develop' into feature/LL-1698-integration-of-the-authoring-tool-excelerate
Merge branch 'develop' into feature/LL-1698-integration-of-the-authoring-tool-excelerate	4941964b8bb51a6a6695c77842df8249d3fa2fb2	gerlachm	2024-07-09T14:29:58.000Z	Merge branch 'develop' into feature/LL-1698-integration-of-the-authoring-tool-excelerate # Conflicts: # app/Models/User.php # resources/lang/en/permissions.php
LL-1697: die Bestätigung der Authorisierung wird nun übersprungen. Wenn es…	5f87287d13d57907073440202bcb00f16f9c79d8	Richard Klings	2024-07-11T08:18:49.000Z	LL-1697: die Bestätigung der Authorisierung wird nun übersprungen. Wenn es andere Oauth-clients gibt, dann muss diese Stelle ggf. auf einen bestimmten Client eingeschränkt werden.
merge migrations	68e46d68c0146d5d00f90a50c70589221bae6cd5	gerlachm	2024-05-16T07:09:04.000Z	merge migrations
Add AuthoringToolTest	7a790e7b1895e0e80ca651420df8f9ac41d0ff2d	gerlachm	2024-05-16T11:44:03.000Z	Add AuthoringToolTest
LL-1698-integration-of-the-authoring-tool-excelerate	817b857a3bb5d7093a4db17de666aebd32a31457	gerlachm	2024-06-24T10:54:02.000Z	LL-1698-integration-of-the-authoring-tool-excelerate Conversion to SFTP Conversion of SFTP user with additional exports folder
update superadmin ui for filter authoring toll	841d2a2acdc84984602847628089636a69af66a8	gerlachm	2024-05-16T06:50:26.000Z	update superadmin ui for filter authoring toll
add column to authoring tool overview	b95c1762cbee83fe85356655a1bc4d6560cd1158	gerlachm	2024-05-21T12:21:30.000Z	add column to authoring tool overview
Merge branch 'develop' into feature/LL-1698-integration-of-the-authoring-tool-excelerate	cbf892307fe51f8ab2d65c1cd2f458f04d57830a	gerlachm	2024-07-04T11:02:26.000Z	Merge branch 'develop' into feature/LL-1698-integration-of-the-authoring-tool-excelerate # Conflicts: # app/Models/Training.php
fix error for empty list	cc00c9e607240198ff6c4286ce53df65cf94ebab	gerlachm	2024-05-15T12:28:44.000Z	fix error for empty list
remove $user->syncPermissions([]); and $client->syncPermissions([]);	db27034dec76808922142ad63367739b7fa1038e	gerlachm	2024-05-15T10:10:34.000Z	remove $user->syncPermissions([]); and $client->syncPermissions([]);
Merge branch 'develop' into feature/LL-1698-integration-of-the-authoring-tool-excelerate	ead518c3c878000281e45582af56430d205d8c04	gerlachm	2024-06-25T07:28:11.000Z	Merge branch 'develop' into feature/LL-1698-integration-of-the-authoring-tool-excelerate # Conflicts: # resources/js/laroute.js
Merge branch 'develop' into feature/LL-1698-integration-of-the-authoring-tool-excelerate	f070c45b2b68675fc7c755eea2ce6fe032a009d4	gerlachm	2024-05-16T13:08:51.000Z	Merge branch 'develop' into feature/LL-1698-integration-of-the-authoring-tool-excelerate
Merge branch 'feature/LL-1697-oauth' into…	f0e1b4944cdcd0aeac146ae1e6690cb74a7e750f	Richard Klings	2024-07-11T08:30:11.000Z	Merge branch 'feature/LL-1697-oauth' into feature/LL-1698-integration-of-the-authoring-tool-excelerate
Merge branch 'develop' into feature/LL-1698-integration-of-the-authoring-tool-excelerate	f8fae3c740e22b1b27a089faa605bf467f053ae7	gerlachm	2024-05-21T12:33:20.000Z	Merge branch 'develop' into feature/LL-1698-integration-of-the-authoring-tool-excelerate