From 1e8a0d8c0acf84417d6d3909aca1de216e886b1e Mon Sep 17 00:00:00 2001
From: Michal Feher <feher@studiotem.com>
Date: Wed, 27 Sep 2023 15:20:01 +0200
Subject: [PATCH 1/5] no message

---
 app/.env.production | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/.env.production b/app/.env.production
index 2002315..e1febcc 100644
--- a/app/.env.production
+++ b/app/.env.production
@@ -1 +1 @@
-VUE_APP_WAXIOS_URL=https://taskmanager.internal.studiotem.com/api/
\ No newline at end of file
+VUE_APP_WAXIOS_URL=https://tm.jandl.sk/api/
\ No newline at end of file

From 14287d8de748ee00a890597f61d7b6749c9de269 Mon Sep 17 00:00:00 2001
From: root <root@jandl-taskmanager-prod1.internal.studiotem.com>
Date: Wed, 27 Sep 2023 15:21:59 +0200
Subject: [PATCH 2/5] from server

---
 app/.env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/.env b/app/.env
index 2002315..1c053c8 100644
--- a/app/.env
+++ b/app/.env
@@ -1 +1 @@
-VUE_APP_WAXIOS_URL=https://taskmanager.internal.studiotem.com/api/
\ No newline at end of file
+VUE_APP_WAXIOS_URL=https://tm.jandl.sk/api/

From 5340fd58e10bd068bf5b65af66260d04c34843da Mon Sep 17 00:00:00 2001
From: Michal Feher <feher@studiotem.com>
Date: Wed, 27 Sep 2023 15:39:36 +0200
Subject: [PATCH 3/5] no message

---
 be/app/Mail/NewTask.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/be/app/Mail/NewTask.php b/be/app/Mail/NewTask.php
index 40777b0..4a5c00a 100644
--- a/be/app/Mail/NewTask.php
+++ b/be/app/Mail/NewTask.php
@@ -46,7 +46,7 @@ class NewTask extends Mailable
             replyTo: [
                 new Address($this->creator->email, ($this->creator) ? $this->creator->firstname . ' ' . $this->creator->lastname : ''),
             ],
-            subject: $this->subtask->mastertask->project->code . ' ' . $this->subtask->mastertask->project->code . ' - vytvorený Sub Task',
+            subject: $this->subtask->mastertask->project->code . ' ' . $this->subtask->mastertask->project->name . ' - vytvorený Sub Task',
         );
     }
 

From 2f6bff8ff19ff059217ab0f0ff96f3cce50a2cf1 Mon Sep 17 00:00:00 2001
From: Michal Feher <feher@studiotem.com>
Date: Wed, 27 Sep 2023 16:13:27 +0200
Subject: [PATCH 4/5] no message

---
 be/resources/views/emails/task/sub_task_created.blade.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/be/resources/views/emails/task/sub_task_created.blade.php b/be/resources/views/emails/task/sub_task_created.blade.php
index 63d64d6..ce9a0b5 100644
--- a/be/resources/views/emails/task/sub_task_created.blade.php
+++ b/be/resources/views/emails/task/sub_task_created.blade.php
@@ -1,12 +1,13 @@
 Task založil: {{($creator) ? $creator->firstname . ' ' . $creator->lastname : ''}} <br>
 Job number: {{$subtask->mastertask->project->code}} <br>
 Názov Tasku: {{($subtask->title) ?: $subtask->mastertask->title}} <br>
-Deadline do: {{($subtask->deadline) ?: $subtask->mastertask->deadline}} <br>
+Deadline do: {{($subtask->deadline) ?: $subtask->mastertask->deadline}} <br> <br>
 Ľudia v Master Tasku: <br>
 
 @foreach($usersInMasterTask as $key => $user)
     {{ $user->firstname }} {{ $user->lastname }} <br>
 @endforeach
+<br>
 
 Odkaz na Task: {{ url( env( 'APP_URL_FE' ) . '/#/app/dashboard/tasks?subtask=' . $subtask->id) }} <br><br>
 Popis: {!!($subtask->description) ?: $subtask->mastertask->description !!} <br>

From 7aa0b5fafd3bb63b1dc9302b47559d6051fcbe3b Mon Sep 17 00:00:00 2001
From: Michal Feher <feher@studiotem.com>
Date: Wed, 27 Sep 2023 16:22:44 +0200
Subject: [PATCH 5/5] no message

---
 be/app/Listeners/SendEditedSubTaskNotification.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/be/app/Listeners/SendEditedSubTaskNotification.php b/be/app/Listeners/SendEditedSubTaskNotification.php
index 503900a..8410633 100644
--- a/be/app/Listeners/SendEditedSubTaskNotification.php
+++ b/be/app/Listeners/SendEditedSubTaskNotification.php
@@ -67,7 +67,7 @@ class SendEditedSubTaskNotification implements ShouldQueue
             }
 
             // aby nechodilo "Updated by: 63"
-            if ($key == 'updated_by' && $diff == 1) {
+            if ($key == 'updated_by') {
                 $user =  User::find($diff);
                 $difference[$key] = ($user) ? $user->firstname . ' ' . $user->lastname : '';
             } else {