Details des Tickets

Beschreibung,Kommentare und Anhänge

merge request id 868
TitelFeature/ll 1551 customer communication template empty html
Beschreibung
Statusmerged
Created at 2023-08-08T06:05:29.927Z
Updated at 2024-10-14T12:44:45.344Z
Source branchfeature/LL-1551-customer-communication-emplate-empty-HTML
Target branchdevelop
AuthorMarkus Gerlach
AssigneeSascha Immig

Discussion notes

added 1 commit
  • 8843f8a2 - LL-1550-user-report-available-until-shows-one-day-too-many-in-export
Compare with previous version
Markus Gerlach 2023-08-08T06:15:22.507Z
added 106 commits
  • 8843f8a2...926e437a - 105 commits from branch develop
  • ed6f0b1d - Merge branch 'develop' into feature/LL-1551-customer-communication-emplate-empty-HTML
Compare with previous version
Markus Gerlach 2023-08-08T06:30:08.934Z
added 1 commit
  • 7e1249c2 - Always transfer style tags from content to css for CustomoerCommunication
Compare with previous version
Markus Gerlach 2023-08-21T10:19:49.660Z
added 1 commit
  • a1ac36bb - update for CustomerCommunicationTest
Compare with previous version
Markus Gerlach 2023-08-21T10:59:45.382Z
added 48 commits
  • a1ac36bb...9f97851f - 47 commits from branch develop
  • dee32057 - Merge branch 'develop' into feature/LL-1551-customer-communication-emplate-empty-HTML
Compare with previous version
Markus Gerlach 2023-08-25T07:56:34.085Z
added 409 commits
  • dee32057...25b0e79a - 408 commits from branch develop
  • 42ba6dc7 - Merge branch 'develop' into feature/LL-1551-customer-communication-emplate-empty-HTML
Compare with previous version
Sascha Immig 2023-12-05T15:22:17.603Z
added 4 commits
  • 6f89fc1e - reworked some naming and translations
  • d49499d1 - optimized index table: the use of iframes inside the table is not effective for usability
  • 31c69de4 - optimized translations
  • 72e13a56 - further optimization for the removal of the frames
Compare with previous version
Sascha Immig 2024-01-17T17:04:15.869Z
added 245 commits
  • 72e13a56...09a0a93a - 244 commits from branch develop
  • 5a410710 - Merge branch 'develop' into feature/LL-1551-customer-communication-emplate-empty-HTML
Compare with previous version
Sascha Immig 2024-03-06T10:25:55.218Z
added 772 commits
  • 5a410710...b0c3e589 - 769 commits from branch develop
  • 15d67cb7 - Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into…
  • d97fc632 - resolved disfunctional usage of Flash::success(__('...')) and Flash::error(...)
  • a2e7adbb - + resolved disfunctional usage of Flash::success(__('...')) and Flash::error(...)
Compare with previous version
Gregor Gabriel 2024-10-04T13:13:12.587Z
added 5 commits
  • bf02accf - removed unused uses of Flash
  • ae7a0e61 - + css now can be injected
  • 409e3d16 - + provided an empty layout template
  • 7efc31d5 - + replaces route that displays received customer communication, as old route to…
  • 4ce4d98f - run php cs fixer
Compare with previous version
Gregor Gabriel 2024-10-07T14:50:29.080Z
added 1 commit
  • fdc0a745 - fixed test problems
Compare with previous version
Gregor Gabriel 2024-10-07T15:06:02.184Z
added 1 commit
  • 20434113 - + fixed broken tests
Compare with previous version
Gregor Gabriel 2024-10-07T15:46:43.120Z
added 1 commit
  • 94abb814 - + fixed one of two phpstan issues - other one is already fixed in release branch
Compare with previous version
Gregor Gabriel 2024-10-08T07:01:06.698Z
added 1 commit
  • 0dbd21ce - fixed css problem in empty template
Compare with previous version
Gregor Gabriel 2024-10-08T07:14:45.148Z
added 1 commit
  • 374fb381 - added annotation
Compare with previous version
Sascha Immig 2024-10-14T10:39:45.305Z
added 1 commit
  • faa2eca8 - updated twig due to vulnerability. used the opportunity to switch from version 2.* to 3.*
Compare with previous version
Sascha Immig 2024-10-14T12:35:33.535Z
enabled an automatic merge when the pipeline for faa2eca8f15f207e9c0746e1168c8641fe83e19e succeeds Sascha Immig 2024-10-14T12:35:50.938Z
merged Sascha Immig 2024-10-14T12:44:45.517Z
mentioned in commit 9d7ae74ee19c5cc89c86975d178ec64d6162ee43 Sascha Immig 2024-10-14T12:44:45.814Z

Merge Commits

Title Id Author Created at Message
fixed css problem in empty template 0dbd21cebe97c59f20d2f5facf375a3d90052b75 TUV\gabrielg 2024-10-08T07:14:39.000Z fixed css problem in empty template
Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into… 15d67cb7805ee6fa1ea6cd3c236dab07c61b954d TUV\gabrielg 2024-10-04T11:51:02.000Z Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-1551-customer-communication-emplate-empty-HTML # Conflicts: # resources/views/admin/customerCommunications/table.blade.php # routes/web.php
+ fixed broken tests 204341137f72aec4b4e1bcd2cfe9322bf948d7f6 TUV\gabrielg 2024-10-07T15:46:36.000Z + fixed broken tests + added button "code" + reworked show template
optimized translations 31c69de449100856771b6fb57720d06e57bbbce3 TUV\immigs 2024-01-17T16:49:15.000Z optimized translations
added annotation 374fb381c330a7ed08bca12115bafdb165eec220 Sascha Immig 2024-10-14T10:37:45.000Z added annotation
+ provided an empty layout template 409e3d168f7c7da0a50da9e12a1be0218b75f4eb TUV\gabrielg 2024-10-07T12:18:37.000Z + provided an empty layout template + using empty template for
Merge branch 'develop' into feature/LL-1551-customer-communication-emplate-empty-HTML 42ba6dc7421a277cf453ed44e4468ae491705883 TUV\immigs 2023-12-05T15:22:03.000Z Merge branch 'develop' into feature/LL-1551-customer-communication-emplate-empty-HTML # Conflicts: # app/Notifications/CustomerCommunicationNotification.php # resources/js/laroute.js
run php cs fixer 4ce4d98f8a552faaebbf412c0a05ae1b661ba155 TUV\gabrielg 2024-10-07T14:49:06.000Z run php cs fixer
Merge branch 'develop' into feature/LL-1551-customer-communication-emplate-empty-HTML 5a410710d2f8d4f14e41cc85e69709928dc358b0 TUV\immigs 2024-03-06T10:25:09.000Z Merge branch 'develop' into feature/LL-1551-customer-communication-emplate-empty-HTML # Conflicts: # resources/lang/de/base.php # resources/lang/fr/base.php
reworked some naming and translations 6f89fc1eb0edae7dcf48ff0f34cfb9f07b9bcb5a TUV\immigs 2024-01-17T14:33:13.000Z reworked some naming and translations
further optimization for the removal of the frames 72e13a567eb76160c35722fbf2a6da1e0da00c84 TUV\immigs 2024-01-17T17:04:02.000Z further optimization for the removal of the frames
+ replaces route that displays received customer communication, as old route to… 7efc31d50baf63e9f76da689c0caae33dd905f0a TUV\gabrielg 2024-10-07T14:48:50.000Z + replaces route that displays received customer communication, as old route to show method did not exactly display the mail and displayed irrelevant stuff too
+ fixed one of two phpstan issues - other one is already fixed in release branch 94abb8147802e1e6d45cc2b9b89f0e06a727b063 TUV\gabrielg 2024-10-08T07:00:57.000Z + fixed one of two phpstan issues - other one is already fixed in release branch + run php cs fixer + removed unused template + optimized some js code + added TODO to remove CustomerCommunication.render() function which seems to be unused
+ resolved disfunctional usage of Flash::success(__('...')) and Flash::error(...) a2e7adbbf216f347ce109058c587bc979ffa55c7 TUV\gabrielg 2024-10-04T13:13:04.000Z + resolved disfunctional usage of Flash::success(__('...')) and Flash::error(...) + changed behaviour after save or update a customer correspondence
+ css now can be injected ae7a0e6134c8a062a116901d1280333020c43de8 TUV\gabrielg 2024-10-07T09:20:02.000Z + css now can be injected + separeded empt and none empty case
removed unused uses of Flash bf02accf1b6ceb06378e0b25c503fe8cfb6f040e TUV\gabrielg 2024-10-04T13:14:51.000Z removed unused uses of Flash
optimized index table: the use of iframes inside the table is not effective for usability d49499d1c23535a28d5732f4af6c70983b4335ba TUV\immigs 2024-01-17T14:34:49.000Z optimized index table: the use of iframes inside the table is not effective for usability
resolved disfunctional usage of Flash::success(__('...')) and Flash::error(...) d97fc6322a68a10c64e12f84a02d796738ec8a13 TUV\gabrielg 2024-10-04T13:10:46.000Z resolved disfunctional usage of Flash::success(__('...')) and Flash::error(...)
updated twig due to vulnerability. used the opportunity to switch from version 2.* to 3.* faa2eca8f15f207e9c0746e1168c8641fe83e19e Sascha Immig 2024-10-14T12:23:51.000Z updated twig due to vulnerability. used the opportunity to switch from version 2.* to 3.* (cherry picked from commit 9d7e79c7c0e4e236cfe8019d24b41e31f72097d7) (cherry picked from commit a1efcb8aeb493d839f8e3392ab3a120319f35fe0)
fixed test problems fdc0a7454be5b4042b33051e41c890652e179b27 TUV\gabrielg 2024-10-07T15:05:55.000Z fixed test problems