From 6f6f2b77d7151bebe5355d1e3574dee6109e9a7d Mon Sep 17 00:00:00 2001
From: Cody <cody@decacon.com>
Date: Thu, 4 Jun 2020 21:11:24 -0700
Subject: [PATCH 1/9] '...' added, Reply Removed

---
 .../Modules/Admin/UserProfile/Index.razor      | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
index b47eb3fe..4579d138 100644
--- a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
+++ b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
@@ -126,7 +126,14 @@ else
                     </Row>
                     <Detail>
                         <td colspan="2"></td>
-                        <td colspan="3">@(context.Body.Length > 100 ? context.Body.Substring(0, 100) : context.Body)</td>
+                        <td colspan="3">
+                            @{ 
+                            string input = "---";
+                            if (context.Body.Contains(input)){ 
+                            context.Body = context.Body.Split(input)[0];
+                            } }
+                            @(context.Body.Length > 100 ? (context.Body.Substring(0, 97) + "...") : context.Body)
+                        </td>
                     </Detail>
                 </Pager>
             }
@@ -149,7 +156,14 @@ else
                     </Row>
                     <Detail>
                         <td colspan="2"></td>
-                        <td colspan="3">@(context.Body.Length > 100 ? context.Body.Substring(0, 100) : context.Body)</td>
+                        <td colspan="3">
+                            @{ 
+                            string input = "---";
+                            if (context.Body.Contains(input)){ 
+                            context.Body = context.Body.Split(input)[0];
+                            } }
+                            @(context.Body.Length > 100 ? (context.Body.Substring(0, 97) + "...") : context.Body)
+                        </td>
                     </Detail>
                 </Pager>
             }

From 7b9cd39cb7163a530b5c8d7a6938bbb26d58bc3c Mon Sep 17 00:00:00 2001
From: Cody <cody@decacon.com>
Date: Thu, 4 Jun 2020 21:20:48 -0700
Subject: [PATCH 2/9] To/From Fields enabled/disabled, reply message fix

---
 .../Modules/Admin/UserProfile/View.razor      | 86 +++++++++++++------
 1 file changed, 61 insertions(+), 25 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/UserProfile/View.razor b/Oqtane.Client/Modules/Admin/UserProfile/View.razor
index 5d5a43f5..39fb13d3 100644
--- a/Oqtane.Client/Modules/Admin/UserProfile/View.razor
+++ b/Oqtane.Client/Modules/Admin/UserProfile/View.razor
@@ -1,15 +1,9 @@
-@namespace Oqtane.Modules.Admin.UserProfile
-@inherits ModuleBase
-@inject NavigationManager NavigationManager
-@inject IUserService UserService
-@inject INotificationService NotificationService
-
-@if (PageState.User != null)
+@if (PageState.User != null)
 {
     <table class="table table-borderless">
         <tr>
             <td>
-                <label  class="control-label">@title: </label>
+                <label class="control-label">@title: </label>
             </td>
             <td>
                 <input class="form-control" @bind="@username" />
@@ -17,47 +11,85 @@
         </tr>
         <tr>
             <td>
-                <label  class="control-label">Subject: </label>
+                <label class="control-label">Subject: </label>
             </td>
             <td>
                 <input class="form-control" @bind="@subject" />
             </td>
         </tr>
+        @if (title == "From")
+        {
+            <td>
+                <input class="form-control" @bind="@subject" readonly />
+            </td>
+        }
+        @if (title == "To")
+        {
+            <td>
+                <input class="form-control" @bind="@subject" />
+            </td>
+            </tr>}
+
         @if (title == "From")
         {
             <tr>
                 <td>
-                    <label  class="control-label">Date: </label>
+                    <label class="control-label">Date: </label>
                 </td>
                 <td>
-                    <input class="form-control" @bind="@createdon" />
+                    <input class="form-control" @bind="@createdon" readonly />
+                </td>
+            </tr>
+        }
+        @if (title == "From")
+        {
+            <tr>
+                <td>
+                    <label class="control-label">Message: </label>
+                </td>
+                <td>
+                    <textarea class="form-control" @bind="@body" rows="5" readonly />
+                </td>
+            </tr>
+        }
+        @if (title == "To")
+        {
+            <tr>
+                <td>
+                    <label class="control-label">Message: </label>
+                </td>
+                <td>
+                    <textarea class="form-control" @bind="@body" rows="5" />
                 </td>
             </tr>
         }
-        <tr>
-            <td>
-                <label  class="control-label">Message: </label>
-            </td>
-            <td>
-                <textarea class="form-control" @bind="@body" rows="5" />
-            </td>
-        </tr>
     </table>
+
     @if (reply != string.Empty)
     {
-        <button type="button" class="btn btn-primary" @onclick="Send">Send</button>
-    }
+        <button type="button" class="btn btn-primary" @onclick="Send">Send</button> }
     else
     {
         if (title == "From")
         {
-            <button type="button" class="btn btn-primary" @onclick="Reply">Reply</button>
-        }
+            <button type="button" class="btn btn-primary" @onclick="Reply">Reply</button>}
     }
     <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
     <br />
     <br />
-    <p>@reply</p>
+    @if (title == "To")
+    {
+        <table class="table table-borderless">
+            <tr>
+                <td>
+                    <label class="control-label">Original Message: </label>
+                </td>
+                <td>
+                    <textarea class="form-control" @bind="@reply" rows="5" readonly />
+                </td>
+            </tr>
+        </table>
+    }
 }
 
 @code {
@@ -124,8 +156,12 @@
     private void Reply()
     {
         title = "To";
-        subject = "RE: " + subject;
+        if (!subject.Contains("RE:"))
+        {
+            subject = "RE: " + subject;
+        }
         reply = body;
+        body = "\n\n--------------------------------------------\nSent: " + createdon + "\nSubject: " + subject + "\n\n" + body;
         StateHasChanged();
     }
 

From f854b948ce291be6236a2303939e2b887b030486 Mon Sep 17 00:00:00 2001
From: Cody <cody@decacon.com>
Date: Thu, 4 Jun 2020 21:22:48 -0700
Subject: [PATCH 3/9] namespaces removed last commit

---
 Oqtane.Client/Modules/Admin/UserProfile/View.razor | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Oqtane.Client/Modules/Admin/UserProfile/View.razor b/Oqtane.Client/Modules/Admin/UserProfile/View.razor
index 39fb13d3..15c2302c 100644
--- a/Oqtane.Client/Modules/Admin/UserProfile/View.razor
+++ b/Oqtane.Client/Modules/Admin/UserProfile/View.razor
@@ -1,4 +1,10 @@
-@if (PageState.User != null)
+@namespace Oqtane.Modules.Admin.UserProfile
+@inherits ModuleBase
+@inject NavigationManager NavigationManager
+@inject IUserService UserService
+@inject INotificationService NotificationService
+
+@if (PageState.User != null)
 {
     <table class="table table-borderless">
         <tr>

From af1aab5b8dd3531746732c7cc11c84831b7f53d4 Mon Sep 17 00:00:00 2001
From: Cody <cody@decacon.com>
Date: Fri, 5 Jun 2020 17:57:25 -0700
Subject: [PATCH 4/9] Updated to latest framework message username

addresses conflicts
---
 .../Modules/Admin/UserProfile/View.razor      | 54 ++++++++++---------
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/UserProfile/View.razor b/Oqtane.Client/Modules/Admin/UserProfile/View.razor
index 15c2302c..c13ef4a9 100644
--- a/Oqtane.Client/Modules/Admin/UserProfile/View.razor
+++ b/Oqtane.Client/Modules/Admin/UserProfile/View.razor
@@ -11,31 +11,36 @@
             <td>
                 <label class="control-label">@title: </label>
             </td>
-            <td>
-                <input class="form-control" @bind="@username" />
-            </td>
+            @if (title == "From")
+            {
+                <td>
+                    <input class="form-control" @bind="@username" readonly />
+                </td>
+            }
+            @if (title == "To")
+            {
+                <td>
+                    <input class="form-control" @bind="@username" />
+                </td>
+            }
         </tr>
         <tr>
             <td>
                 <label class="control-label">Subject: </label>
             </td>
-            <td>
-                <input class="form-control" @bind="@subject" />
-            </td>
+            @if (title == "From")
+            {
+                <td>
+                    <input class="form-control" @bind="@subject" readonly />
+                </td>
+}
+            @if (title == "To")
+            {
+                <td>
+                    <input class="form-control" @bind="@subject" />
+                </td>
+            }
         </tr>
-        @if (title == "From")
-        {
-            <td>
-                <input class="form-control" @bind="@subject" readonly />
-            </td>
-        }
-        @if (title == "To")
-        {
-            <td>
-                <input class="form-control" @bind="@subject" />
-            </td>
-            </tr>}
-
         @if (title == "From")
         {
             <tr>
@@ -46,7 +51,7 @@
                     <input class="form-control" @bind="@createdon" readonly />
                 </td>
             </tr>
-        }
+}
         @if (title == "From")
         {
             <tr>
@@ -57,7 +62,7 @@
                     <textarea class="form-control" @bind="@body" rows="5" readonly />
                 </td>
             </tr>
-        }
+}
         @if (title == "To")
         {
             <tr>
@@ -68,9 +73,10 @@
                     <textarea class="form-control" @bind="@body" rows="5" />
                 </td>
             </tr>
-        }
+}
     </table>
 
+
     @if (reply != string.Empty)
     {
         <button type="button" class="btn btn-primary" @onclick="Send">Send</button> }
@@ -95,8 +101,8 @@
                 </td>
             </tr>
         </table>
+        }
     }
-}
 
 @code {
     private int notificationid;
@@ -207,5 +213,5 @@
             AddModuleMessage("Error Adding Notification", MessageType.Error);
         }
     }
-
 }
+

From 6efbeeb2b41aa7b5802ea501bde2f97c08b97755 Mon Sep 17 00:00:00 2001
From: Cody <cody@decacon.com>
Date: Sat, 6 Jun 2020 08:02:08 -0700
Subject: [PATCH 5/9] Change dashes to underscores

---
 Oqtane.Client/Modules/Admin/UserProfile/View.razor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Oqtane.Client/Modules/Admin/UserProfile/View.razor b/Oqtane.Client/Modules/Admin/UserProfile/View.razor
index c13ef4a9..33365065 100644
--- a/Oqtane.Client/Modules/Admin/UserProfile/View.razor
+++ b/Oqtane.Client/Modules/Admin/UserProfile/View.razor
@@ -173,7 +173,7 @@
             subject = "RE: " + subject;
         }
         reply = body;
-        body = "\n\n--------------------------------------------\nSent: " + createdon + "\nSubject: " + subject + "\n\n" + body;
+        body = "\n\n____________________________________________\nSent: " + createdon + "\nSubject: " + subject + "\n\n" + body;
         StateHasChanged();
     }
 

From 8d1715368603fdba89ab649da7bf9bbd1f93589b Mon Sep 17 00:00:00 2001
From: Cody <cody@decacon.com>
Date: Sat, 6 Jun 2020 08:03:42 -0700
Subject: [PATCH 6/9] replace dashes with underscores

---
 Oqtane.Client/Modules/Admin/UserProfile/Index.razor | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
index 4579d138..5010fa99 100644
--- a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
+++ b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
@@ -128,7 +128,7 @@ else
                         <td colspan="2"></td>
                         <td colspan="3">
                             @{ 
-                            string input = "---";
+                            string input = "___";
                             if (context.Body.Contains(input)){ 
                             context.Body = context.Body.Split(input)[0];
                             } }
@@ -158,7 +158,7 @@ else
                         <td colspan="2"></td>
                         <td colspan="3">
                             @{ 
-                            string input = "---";
+                            string input = "___";
                             if (context.Body.Contains(input)){ 
                             context.Body = context.Body.Split(input)[0];
                             } }

From 095a95a3a95940c692579339d24e2282bc64de81 Mon Sep 17 00:00:00 2001
From: Cody <cody@decacon.com>
Date: Sat, 6 Jun 2020 11:46:35 -0700
Subject: [PATCH 7/9] removes message carriage returns

---
 Oqtane.Client/Modules/Admin/UserProfile/Index.razor | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
index 5010fa99..af9d2a11 100644
--- a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
+++ b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor
@@ -131,6 +131,8 @@ else
                             string input = "___";
                             if (context.Body.Contains(input)){ 
                             context.Body = context.Body.Split(input)[0];
+                            context.Body = context.Body.Replace("\n", "");
+                            context.Body = context.Body.Replace("\r", "");
                             } }
                             @(context.Body.Length > 100 ? (context.Body.Substring(0, 97) + "...") : context.Body)
                         </td>
@@ -161,6 +163,8 @@ else
                             string input = "___";
                             if (context.Body.Contains(input)){ 
                             context.Body = context.Body.Split(input)[0];
+                            context.Body = context.Body.Replace("\n", "");
+                            context.Body = context.Body.Replace("\r", "");
                             } }
                             @(context.Body.Length > 100 ? (context.Body.Substring(0, 97) + "...") : context.Body)
                         </td>

From 51b69e05fbe3cd311bf5020412179b259431c019 Mon Sep 17 00:00:00 2001
From: Cody <cody@decacon.com>
Date: Sat, 6 Jun 2020 15:28:48 -0700
Subject: [PATCH 8/9] Original Message text area full bottom screen

---
 Oqtane.Client/Modules/Admin/UserProfile/View.razor | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/UserProfile/View.razor b/Oqtane.Client/Modules/Admin/UserProfile/View.razor
index 33365065..2e48fcb1 100644
--- a/Oqtane.Client/Modules/Admin/UserProfile/View.razor
+++ b/Oqtane.Client/Modules/Admin/UserProfile/View.razor
@@ -91,16 +91,10 @@
     <br />
     @if (title == "To")
     {
-        <table class="table table-borderless">
-            <tr>
-                <td>
-                    <label class="control-label">Original Message: </label>
-                </td>
-                <td>
-                    <textarea class="form-control" @bind="@reply" rows="5" readonly />
-                </td>
-            </tr>
-        </table>
+        <div class="control-group">
+            <label class="control-label">Original Message </label>
+            <textarea class="form-control" @bind="@reply" rows="5" readonly />
+        </div>
         }
     }
 

From 3e56e9cc040587f92cb992bdfc57f757a51bfd4d Mon Sep 17 00:00:00 2001
From: Bhanu Prakash Korthiwada <hi@bhanu.dev>
Date: Tue, 9 Jun 2020 09:57:09 +0530
Subject: [PATCH 9/9] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d80d120a..ec9fb2c7 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Please note that this project is owned by the .NET Foundation and is governed by
 
 **To get started with Oqtane:**
 
-   1.&nbsp;Install **[.NET Core 3.2 SDK (v3.1.300)](https://dotnet.microsoft.com/download/dotnet-core/thank-you/sdk-3.1.300-windows-x64-installer)**.
+   1.&nbsp;Install **[.NET Core 3.1 SDK (v3.1.300)](https://dotnet.microsoft.com/download/dotnet-core/thank-you/sdk-3.1.300-windows-x64-installer)**.
    
    2.&nbsp;Install the Preview edition of [Visual Studio 2019](https://visualstudio.microsoft.com/vs/preview/) (version 16.6 or higher) with the **ASP.NET and web development** workload enabled. Oqtane works with all editions of Visual Studio from Community to Enterprise. If you do not have a SQL Server installation available already and you wish to use LocalDB for development, you must also install the **.NET desktop development workload**.