Revert "Fix for Tabpanel is not updating the UI. #4778 "

Merge pull request #4874 from oqtane/revert-4871-HTMLTabError
Revert "Rework for Tabstrip regression issue"
2024-11-26 13:36:05 -05:00 · 2024-11-26 13:35:37 -05:00 · 2024-11-26 13:35:21 -05:00 · 2024-11-26 11:27:52 -05:00 · 2024-11-26 11:25:35 -05:00 · 2024-11-26 11:25:23 -05:00
36 changed files with 324 additions and 185 deletions
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -0,0 +1,24 @@
+# Contributing to Oqtane
+
+## How to Contribute
+
+We track all of our issues on Github. If you want to contribute, everything starts with an issue. If you don't have an issue yet, you can add one. Then a core contributor will tag it as either an enhancement [ENH] or a bug [BUG].  Tagged issues are open for contribution.
+
+## Use GitHub-flow process
+- Make a comment on the issue that you intend to work on it and read all the comments to gain a full understanding.
+- Fork the repository
+- Create a new branch and update your comment on the issue with a llink to the branch
+- Make your changes and commit them
+- Push to the branch
+- Create a pull request
+
+## Reporting Bugs
+
+- Check if the issue has already been reported.
+- Open a new issue if it hasn’t been reported.
+
+## Requesting Features
+
+- Use the feature request template in the Issues tab.
+
+Thank you for contributing!
--- a/Oqtane.Client/Modules/Admin/Modules/Settings.razor
+++ b/Oqtane.Client/Modules/Admin/Modules/Settings.razor
@ -12,7 +12,7 @@
@if (_initialized)
 {
    <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
-        <TabStrip>
+        <TabStrip ActiveTab="@_activetab">
            <TabPanel Name="Settings" Heading="Settings" ResourceKey="Settings">
                @if (_containers != null)
                {
@ -162,6 +162,7 @@
    private DateTime? _effectivedate = null;
    private DateTime? _expirydate = null;
    private List<Page> _pages;
+    private string _activetab = "";

    protected override async Task OnInitializedAsync()
    {
@ -241,6 +242,7 @@

    private async Task SaveModule()
    {
+
        validated = true;
        var interop = new Interop(JSRuntime);
        if (await interop.FormValid(form))
@ -261,21 +263,21 @@
                pagemodule.ExpiryDate = Utilities.LocalDateAndTimeAsUtc(_expirydate);
                pagemodule.ContainerType = (_containerType != "-") ? _containerType : string.Empty;
                if (!string.IsNullOrEmpty(pagemodule.ContainerType) && pagemodule.ContainerType == PageState.Page.DefaultContainerType)
-				{
-					pagemodule.ContainerType = string.Empty;
-				}
-				if (!string.IsNullOrEmpty(pagemodule.ContainerType) && pagemodule.ContainerType == PageState.Site.DefaultContainerType)
-				{
-					pagemodule.ContainerType = string.Empty;
-				}
-				await PageModuleService.UpdatePageModuleAsync(pagemodule);
-				await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);
+                {
+                    pagemodule.ContainerType = string.Empty;
+                }
+                if (!string.IsNullOrEmpty(pagemodule.ContainerType) && pagemodule.ContainerType == PageState.Site.DefaultContainerType)
+                {
+                    pagemodule.ContainerType = string.Empty;
+                }
+                await PageModuleService.UpdatePageModuleAsync(pagemodule);
+                await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);

-				var module = ModuleState;
-				module.AllPages = bool.Parse(_allPages);
-				module.PageModuleId = ModuleState.PageModuleId;
-				module.PermissionList = _permissionGrid.GetPermissionList();
-				await ModuleService.UpdateModuleAsync(module);
+                var module = ModuleState;
+                module.AllPages = bool.Parse(_allPages);
+                module.PageModuleId = ModuleState.PageModuleId;
+                module.PermissionList = _permissionGrid.GetPermissionList();
+                await ModuleService.UpdateModuleAsync(module);

                if (_moduleSettingsType != null)
                {
@ -300,11 +302,13 @@
            }
            else
            {
+                _activetab = "Settings";
                AddModuleMessage(Localizer["Message.Required.Title"], MessageType.Warning);
            }
        }
        else
        {
+            _activetab = "Settings";
            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
        }
    }
--- a/Oqtane.Client/Modules/Admin/Site/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Site/Index.razor
@ -32,32 +32,32 @@
                        <option value="-">&lt;@SharedLocalizer["Not Specified"]&gt;</option>
                        @foreach (Page page in _pages)
                        {
-							if (UserSecurity.ContainsRole(page.PermissionList, PermissionNames.View, RoleNames.Everyone))
-							{
-								<option value="@(page.PageId)">@(new string('-', page.Level * 2))@(page.Name)</option>
-							}
+                            if (UserSecurity.ContainsRole(page.PermissionList, PermissionNames.View, RoleNames.Everyone))
+                            {
+                                <option value="@(page.PageId)">@(new string('-', page.Level * 2))@(page.Name)</option>
+                            }
                        }
                    </select>
                </div>
            </div>
-			<div class="row mb-1 align-items-center">
-				<Label Class="col-sm-3" For="isDeleted" HelpText="Is this site deleted?" ResourceKey="IsDeleted">Deleted? </Label>
-				<div class="col-sm-9">
-					<select id="isDeleted" class="form-select" @bind="@_isdeleted" required>
-						<option value="True">@SharedLocalizer["Yes"]</option>
-						<option value="False">@SharedLocalizer["No"]</option>
-					</select>
-				</div>
-			</div>
-			<div class="row mb-1 align-items-center">
-				<Label Class="col-sm-3" For="sitemap" HelpText="The site map url for this site which can be submitted to search engines for indexing" ResourceKey="SiteMap">Site Map: </Label>
-				<div class="col-sm-9">
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="isDeleted" HelpText="Is this site deleted?" ResourceKey="IsDeleted">Deleted? </Label>
+                <div class="col-sm-9">
+                    <select id="isDeleted" class="form-select" @bind="@_isdeleted" required>
+                        <option value="True">@SharedLocalizer["Yes"]</option>
+                        <option value="False">@SharedLocalizer["No"]</option>
+                    </select>
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="sitemap" HelpText="The site map url for this site which can be submitted to search engines for indexing" ResourceKey="SiteMap">Site Map: </Label>
+                <div class="col-sm-9">
                    <div class="input-group">
                        <input id="sitemap" class="form-control" @bind="@_sitemap" disabled />
                        <a href="@_sitemap" class="btn btn-secondary" target="_new">@Localizer["Browse"]</a>
                    </div>
                </div>
-			</div>
+            </div>
            <div class="row mb-1 align-items-center">
                <Label Class="col-sm-3" For="siteguid" HelpText="The Unique Identifier For The Site" ResourceKey="SiteGuid">ID: </Label>
                <div class="col-sm-9">
@ -159,8 +159,8 @@
            </div>
        </Section>
        <Section Name="PageContent" Heading="Page Content" ResourceKey="PageContent">
-           <div class="container">
-               <div class="row mb-1 align-items-center">
+            <div class="container">
+                <div class="row mb-1 align-items-center">
                    <Label Class="col-sm-3" For="headcontent" HelpText="Optionally enter content to be included in the page head (ie. meta, link, or script tags)" ResourceKey="HeadContent">Head Content: </Label>
                    <div class="col-sm-9">
                        <textarea id="headcontent" class="form-control" @bind="@_headcontent" rows="3"></textarea>
@ -213,10 +213,10 @@
                <div class="row mb-1 align-items-center">
                    <Label Class="col-sm-3" For="password" HelpText="Enter the password for your SMTP account" ResourceKey="SmtpPassword">Password: </Label>
                    <div class="col-sm-9">
-						<div class="input-group">
-							<input id="password" type="@_smtppasswordtype" class="form-control" @bind="@_smtppassword" autocomplete="off"/>
+                        <div class="input-group">
+                            <input id="password" type="@_smtppasswordtype" class="form-control" @bind="@_smtppassword" autocomplete="off"/>
                            <button type="button" class="btn btn-secondary" @onclick="@ToggleSMTPPassword" tabindex="-1">@_togglesmtppassword</button>
-						</div>
+                        </div>
                    </div>
                </div>
                <div class="row mb-1 align-items-center">
@ -225,15 +225,15 @@
                        <input id="sender" class="form-control" @bind="@_smtpsender" />
                    </div>
                </div>
-				<div class="row mb-1 align-items-center">
-					<Label Class="col-sm-3" For="relay" HelpText="Only specify this option if you have properly configured an SMTP Relay Service to route your outgoing mail. This option will send notifications from the user's email rather than from the Email Sender specified above." ResourceKey="SmtpRelay">Relay Configured? </Label>
-					<div class="col-sm-9">
-						<select id="relay" class="form-select" @bind="@_smtprelay" required>
-							<option value="True">@SharedLocalizer["Yes"]</option>
-							<option value="False">@SharedLocalizer["No"]</option>
-						</select>
-					</div>
-				</div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="relay" HelpText="Only specify this option if you have properly configured an SMTP Relay Service to route your outgoing mail. This option will send notifications from the user's email rather than from the Email Sender specified above." ResourceKey="SmtpRelay">Relay Configured? </Label>
+                    <div class="col-sm-9">
+                        <select id="relay" class="form-select" @bind="@_smtprelay" required>
+                            <option value="True">@SharedLocalizer["Yes"]</option>
+                            <option value="False">@SharedLocalizer["No"]</option>
+                        </select>
+                    </div>
+                </div>
                <div class="row mb-1 align-items-center">
                    <Label Class="col-sm-3" For="smtpenabled" HelpText="Specify if SMTP is enabled for this site" ResourceKey="SMTPEnabled">Enabled? </Label>
                    <div class="col-sm-9">
@ -244,10 +244,10 @@
                    </div>
                </div>
                <div class="row mb-1 align-items-center">
-					<Label Class="col-sm-3" For="retention" HelpText="Number of days of notifications to retain" ResourceKey="Retention">Retention (Days): </Label>
-					<div class="col-sm-9">
+                    <Label Class="col-sm-3" For="retention" HelpText="Number of days of notifications to retain" ResourceKey="Retention">Retention (Days): </Label>
+                    <div class="col-sm-9">
                        <input id="retention" class="form-control" type="number" min="0" step="1" @bind="@_retention" />
-					</div>
+                    </div>
                </div>
                <button type="button" class="btn btn-secondary" @onclick="SendEmail">@Localizer["Smtp.TestConfig"]</button>
                <br /><br />
@ -280,57 +280,57 @@
        </Section>
        @if (_aliases != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
        {
-			<Section Name="Aliases" Heading="Aliases" ResourceKey="Aliases">
-	            <div class="container">
-					<div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="aliases" HelpText="The urls for the site. This can include domain names (ie. domain.com), subdomains (ie. sub.domain.com) or virtual folders (ie. domain.com/folder)." ResourceKey="Aliases">Aliases: </Label>
-						<div class="col-sm-9">
-							<button type="button" class="btn btn-primary" @onclick="AddAlias">@SharedLocalizer["Add"]</button>
-							<Pager Items="@_aliases">
-								<Header>
-									<th style="width: 1px;">&nbsp;</th>
-									<th style="width: 1px;">&nbsp;</th>
-									<th>@Localizer["AliasName"]</th>
-									<th>@Localizer["AliasDefault"]</th>
-								</Header>
-								<Row>
-									@if (context.AliasId != _aliasid)
-									{
-										<td>
-											@if (_aliasid == -1)
-											{
-												<button type="button" class="btn btn-primary" @onclick="@(() => EditAlias(context))">@SharedLocalizer["Edit"]</button>
-											}
-										</td>
-										<td>
-											@if (_aliasid == -1)
-											{
-												<ActionDialog Action="Delete" OnClick="@(async () => await DeleteAlias(context))" ResourceKey="DeleteAlias" Class="btn btn-danger" Header="Delete Alias" Message="@string.Format(Localizer["Confirm.Alias.Delete", context.Name])" />
-											}
-										</td>
-										<td>@context.Name</td>
+            <Section Name="Aliases" Heading="Aliases" ResourceKey="Aliases">
+                <div class="container">
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="aliases" HelpText="The urls for the site. This can include domain names (ie. domain.com), subdomains (ie. sub.domain.com) or virtual folders (ie. domain.com/folder)." ResourceKey="Aliases">Aliases: </Label>
+                        <div class="col-sm-9">
+                            <button type="button" class="btn btn-primary" @onclick="AddAlias">@SharedLocalizer["Add"]</button>
+                            <Pager Items="@_aliases">
+                                <Header>
+                                    <th style="width: 1px;">&nbsp;</th>
+                                    <th style="width: 1px;">&nbsp;</th>
+                                    <th>@Localizer["AliasName"]</th>
+                                    <th>@Localizer["AliasDefault"]</th>
+                                </Header>
+                                <Row>
+                                    @if (context.AliasId != _aliasid)
+                                    {
+                                        <td>
+                                            @if (_aliasid == -1)
+                                            {
+                                                <button type="button" class="btn btn-primary" @onclick="@(() => EditAlias(context))">@SharedLocalizer["Edit"]</button>
+                                            }
+                                        </td>
+                                        <td>
+                                            @if (_aliasid == -1)
+                                            {
+                                                <ActionDialog Action="Delete" OnClick="@(async () => await DeleteAlias(context))" ResourceKey="DeleteAlias" Class="btn btn-danger" Header="Delete Alias" Message="@string.Format(Localizer["Confirm.Alias.Delete", context.Name])" />
+                                            }
+                                        </td>
+                                        <td>@context.Name</td>
                                        <td>@((context.IsDefault) ? SharedLocalizer["Yes"] : SharedLocalizer["No"])</td>
-									}
-									else
-									{
-										<td><button type="button" class="btn btn-success" @onclick="@(async () => await SaveAlias())">@SharedLocalizer["Save"]</button></td>
-										<td><button type="button" class="btn btn-secondary" @onclick="@(async () => await CancelAlias())">@SharedLocalizer["Cancel"]</button></td>
-										<td>
-											<input id="aliasname" class="form-control" @bind="@_aliasname" />
-										</td>
-										<td>
-											<select id="defaultalias" class="form-select" @bind="@_defaultalias" required>
-												<option value="True">@SharedLocalizer["Yes"]</option>
-												<option value="False">@SharedLocalizer["No"]</option>
-											</select>
-										</td>
-									}
-								</Row>
-							</Pager>
-						</div>
-					</div>
-				</div>
-			</Section>
+                                    }
+                                    else
+                                    {
+                                        <td><button type="button" class="btn btn-success" @onclick="@(async () => await SaveAlias())">@SharedLocalizer["Save"]</button></td>
+                                        <td><button type="button" class="btn btn-secondary" @onclick="@(async () => await CancelAlias())">@SharedLocalizer["Cancel"]</button></td>
+                                        <td>
+                                            <input id="aliasname" class="form-control" @bind="@_aliasname" />
+                                        </td>
+                                        <td>
+                                            <select id="defaultalias" class="form-select" @bind="@_defaultalias" required>
+                                                <option value="True">@SharedLocalizer["Yes"]</option>
+                                                <option value="False">@SharedLocalizer["No"]</option>
+                                            </select>
+                                        </td>
+                                    }
+                                </Row>
+                            </Pager>
+                        </div>
+                    </div>
+                </div>
+            </Section>
            <Section Name="Hosting" Heading="Hosting Model" ResourceKey="Hosting">
                <div class="container">
                    <div class="row mb-1 align-items-center">
@ -376,7 +376,7 @@
            <Section Name="TenantInformation" Heading="Database" ResourceKey="TenantInformation">
                <div class="container">
                    <div class="row mb-1 align-items-center">
-						<Label Class="col-sm-3" For="tenant" HelpText="The name of the database used for the site. Note that this is not the physical database name but rather the tenant name which is used within the framework to identify a database." ResourceKey="Tenant">Database: </Label>
+                        <Label Class="col-sm-3" For="tenant" HelpText="The name of the database used for the site. Note that this is not the physical database name but rather the tenant name which is used within the framework to identify a database." ResourceKey="Tenant">Database: </Label>
                        <div class="col-sm-9">
                            <input id="tenant" class="form-control" @bind="@_tenant" readonly />
                        </div>
@ -390,7 +390,7 @@
                    <div class="row mb-1 align-items-center">
                        <Label Class="col-sm-3" For="connectionstring" HelpText="The name of the connection string in appsettings.json which will be used to connect to the database" ResourceKey="ConnectionString">Connection: </Label>
                        <div class="col-sm-9">
-							<input id="connectionstring" class="form-control" @bind="@_connectionstring" readonly />
+                            <input id="connectionstring" class="form-control" @bind="@_connectionstring" readonly />
                        </div>
                    </div>
                </div>
@ -481,6 +481,11 @@
    {
        try
        {
+            if (PageState.QueryString.ContainsKey("updated"))
+            {
+                AddModuleMessage(Localizer["Success.Settings.SaveSite"], MessageType.Success);
+            }
+
            Site site = await SiteService.GetSiteAsync(PageState.Site.SiteId);
            if (site != null)
            {
@ -736,7 +741,7 @@

                        await logger.LogInformation("Site Settings Saved {Site}", site);

-                        NavigationManager.NavigateTo(NavigateUrl(), true); // reload
+                        NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path, "updated=true"), true); // reload
                    }
                }
                else
--- a/Oqtane.Client/Modules/Controls/Pager.razor
+++ b/Oqtane.Client/Modules/Controls/Pager.razor
@ -21,7 +21,7 @@

        @if ((Toolbar == "Top" || Toolbar == "Both") && _pages > 0 && Items.Count() > _maxItems)
        {
-            <ul class="pagination justify-content-center my-2">
+            <ul class="pagination justify-content-@PaginationAlignment.ToLower() my-2">
                <li class="page-item@((_page > 1) ? " app-pager-pointer" : " disabled")">
                    <a class="page-link shadow-none" @onclick=@(async () => UpdateList(1))><span class="oi oi-media-step-backward" title="start" aria-hidden="true"></span></a>
                </li>
@ -84,7 +84,7 @@

        @if ((Toolbar == "Top" || Toolbar == "Both") && _pages > 0 && Items.Count() > _maxItems)
        {
-            <ul class="pagination justify-content-center my-2">
+            <ul class="pagination justify-content-@PaginationAlignment.ToLower() my-2">
                <li class="page-item@((_page > 1) ? " app-pager-pointer" : " disabled")">
                    <a class="page-link shadow-none" href="@PageUrl(1, _search)"><span class="oi oi-media-step-backward" title="start" aria-hidden="true"></span></a>
                </li>
@ -200,7 +200,7 @@
    {
        @if (PageState.RenderMode == RenderModes.Interactive || ModuleState.RenderMode == RenderModes.Interactive)
        {
-            <ul class="pagination justify-content-center my-2">
+            <ul class="pagination justify-content-@PaginationAlignment.ToLower() my-2">
                <li class="page-item@((_page > 1) ? " app-pager-pointer" : " disabled")">
                    <a class="page-link shadow-none" @onclick=@(async () => UpdateList(1))><span class="oi oi-media-step-backward" title="start" aria-hidden="true"></span></a>
                </li>
@ -248,7 +248,7 @@
        }
        else
        {
-            <ul class="pagination justify-content-center my-2">
+            <ul class="pagination justify-content-@PaginationAlignment.ToLower() my-2">
                <li class="page-item@((_page > 1) ? " app-pager-pointer" : " disabled")">
                    <a class="page-link shadow-none" href="@PageUrl(1, _search)"><span class="oi oi-media-step-backward" title="start" aria-hidden="true"></span></a>
                </li>
@ -368,6 +368,12 @@
    [SupplyParameterFromForm(FormName = "PagerForm")]
    public string _Search { get => ""; set => _search = value; }

+    /// <summary>
+    /// Accepted values are Start or Center or End. The default value is Center
+    /// </summary>
+    [Parameter]
+    public string PaginationAlignment { get; set; } = "center"; // Alignment of the Page Numbering start, center, end
+
    private IEnumerable<TableItem> ItemList { get; set; }

    protected override void OnInitialized()
--- a/Oqtane.Client/Modules/Controls/QuillJSTextEditor.razor
+++ b/Oqtane.Client/Modules/Controls/QuillJSTextEditor.razor
@ -277,7 +277,7 @@
 		{
            // include CSS theme
            var interop = new Interop(JSRuntime);
-            await interop.IncludeLink("", "stylesheet", $"css/quill/quill.{_theme}.css", "text/css", "", "", "");
+            await interop.IncludeLink("", "stylesheet", $"{PageState?.Alias.BaseUrl}/css/quill/quill.{_theme}.css", "text/css", "", "", "");
        }

        await base.OnAfterRenderAsync(firstRender);
--- a/Oqtane.Client/Modules/Controls/TabPanel.razor
+++ b/Oqtane.Client/Modules/Controls/TabPanel.razor
@ -36,14 +36,7 @@ else

        Parent.AddTabPanel((TabPanel)this);

-        if (string.IsNullOrEmpty(Heading))
-        {
-            Heading = Localize(nameof(Name), Name);
-        }
-        else
-        {
-            Heading = Localize(nameof(Heading), Heading);
-        }
+        Heading = string.IsNullOrEmpty(Heading) ? Localize(nameof(Name), Name) : Localize(nameof(Heading), Heading);
    }

    public string DisplayHeading()
--- a/Oqtane.Client/Oqtane.Client.csproj
+++ b/Oqtane.Client/Oqtane.Client.csproj
@ -4,7 +4,7 @@
    <TargetFramework>net9.0</TargetFramework>
    <OutputType>Exe</OutputType>
    <Configurations>Debug;Release</Configurations>
-    <Version>6.0.0</Version>
+    <Version>6.0.1</Version>
    <Product>Oqtane</Product>
    <Authors>Shaun Walker</Authors>
    <Company>.NET Foundation</Company>
@ -12,7 +12,7 @@
    <Copyright>.NET Foundation</Copyright>
    <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
    <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.1</PackageReleaseNotes>
    <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
    <RepositoryType>Git</RepositoryType>
    <RootNamespace>Oqtane</RootNamespace>
--- a/Oqtane.Client/Resources/Modules/Admin/Upgrade/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Upgrade/Index.resx
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
  <!-- 
    Microsoft ResX Schema 
@ -151,6 +151,6 @@
    <value>You Cannot Perform A System Update In A Development Environment</value>
  </data>
  <data name="Disclaimer.Text" xml:space="preserve">
-    <value>Please Note That The System Update Capability Is A Simplified Upgrade Process Intended For Small To Medium Sized Installations. For Larger Enterprise Installations You Will Want To Use A Manual Upgrade Process. Also Note That The System Update Capability Is Not Recommended When Using Microsoft Azure Due To The Limitations Of That Environment. </value>
+    <value>Please Note That The System Update Capability Is A Simplified Upgrade Process Intended For Small To Medium Sized Installations. For Larger Enterprise Installations You Will Want To Use A Manual Upgrade Process. Also Note That The System Update Capability Is Not Recommended When Using Microsoft Azure Due To Environmental Limitations.</value>
  </data>
 </root>
--- a/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj
+++ b/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj
@ -2,7 +2,7 @@

  <PropertyGroup>
    <TargetFramework>net9.0</TargetFramework>
-    <Version>6.0.0</Version>
+    <Version>6.0.1</Version>
    <Product>Oqtane</Product>
    <Authors>Shaun Walker</Authors>
    <Company>.NET Foundation</Company>
@ -10,7 +10,7 @@
    <Copyright>.NET Foundation</Copyright>
    <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
    <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.1</PackageReleaseNotes>
    <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
    <RepositoryType>Git</RepositoryType>
    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
--- a/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj
+++ b/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj
@ -2,7 +2,7 @@

  <PropertyGroup>
    <TargetFramework>net9.0</TargetFramework>
-    <Version>6.0.0</Version>
+    <Version>6.0.1</Version>
    <Product>Oqtane</Product>
    <Authors>Shaun Walker</Authors>
    <Company>.NET Foundation</Company>
@ -10,7 +10,7 @@
    <Copyright>.NET Foundation</Copyright>
    <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
    <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.1</PackageReleaseNotes>
    <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
    <RepositoryType>Git</RepositoryType>
    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
@ -36,7 +36,7 @@
    <PackageReference Include="EFCore.NamingConventions" Version="8.0.3" />
    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.0" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.0-rc.2" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.1" />
  </ItemGroup>

  <ItemGroup>
--- a/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj
+++ b/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj
@ -2,7 +2,7 @@

  <PropertyGroup>
    <TargetFramework>net9.0</TargetFramework>
-    <Version>6.0.0</Version>
+    <Version>6.0.1</Version>
    <Product>Oqtane</Product>
    <Authors>Shaun Walker</Authors>
    <Company>.NET Foundation</Company>
@ -10,7 +10,7 @@
    <Copyright>.NET Foundation</Copyright>
    <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
    <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.1</PackageReleaseNotes>
    <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
    <RepositoryType>Git</RepositoryType>
    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
--- a/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj
+++ b/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj
@ -2,7 +2,7 @@

  <PropertyGroup>
    <TargetFramework>net9.0</TargetFramework>
-    <Version>6.0.0</Version>
+    <Version>6.0.1</Version>
    <Product>Oqtane</Product>
    <Authors>Shaun Walker</Authors>
    <Company>.NET Foundation</Company>
@ -10,7 +10,7 @@
    <Copyright>.NET Foundation</Copyright>
    <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
    <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.1</PackageReleaseNotes>
    <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
    <RepositoryType>Git</RepositoryType>
    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
--- a/Oqtane.Maui/Oqtane.Maui.csproj
+++ b/Oqtane.Maui/Oqtane.Maui.csproj
@ -6,7 +6,7 @@
    <!-- <TargetFrameworks>net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks> -->
 		<!-- <TargetFrameworks>$(TargetFrameworks);net9.0-tizen</TargetFrameworks> -->
 		<OutputType>Exe</OutputType>
-    <Version>6.0.0</Version>
+    <Version>6.0.1</Version>
    <Product>Oqtane</Product>
    <Authors>Shaun Walker</Authors>
    <Company>.NET Foundation</Company>
@ -14,7 +14,7 @@
    <Copyright>.NET Foundation</Copyright>
    <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
    <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.1</PackageReleaseNotes>
    <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
    <RepositoryType>Git</RepositoryType>
    <RootNamespace>Oqtane.Maui</RootNamespace>
@ -30,7 +30,7 @@
 		<ApplicationId>com.oqtane.maui</ApplicationId>
    
 		<!-- Versions -->
-		<ApplicationDisplayVersion>6.0.0</ApplicationDisplayVersion>
+		<ApplicationDisplayVersion>6.0.1</ApplicationDisplayVersion>
 		<ApplicationVersion>1</ApplicationVersion>

    <!-- To develop, package, and publish an app to the Microsoft Store, see: https://aka.ms/MauiTemplateUnpackaged -->
--- a/Oqtane.Package/Oqtane.Client.nuspec
+++ b/Oqtane.Package/Oqtane.Client.nuspec
@ -2,7 +2,7 @@
 <package>
  <metadata>
    <id>Oqtane.Client</id>
-    <version>6.0.0</version>
+    <version>6.0.1</version>
    <authors>Shaun Walker</authors>
    <owners>.NET Foundation</owners>
    <title>Oqtane Framework</title>
@ -12,14 +12,14 @@
    <requireLicenseAcceptance>false</requireLicenseAcceptance>
    <license type="expression">MIT</license>
    <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.0</releaseNotes>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.1</releaseNotes>
    <readme>readme.md</readme>
    <icon>icon.png</icon>
    <tags>oqtane</tags>
  </metadata>
  <files>
-    <file src="..\Oqtane.Client\bin\Release\net8.0\Oqtane.Client.dll" target="lib\net9.0" /> 
-    <file src="..\Oqtane.Client\bin\Release\net8.0\Oqtane.Client.pdb" target="lib\net9.0" /> 
+    <file src="..\Oqtane.Client\bin\Release\net9.0\Oqtane.Client.dll" target="lib\net9.0" /> 
+    <file src="..\Oqtane.Client\bin\Release\net9.0\Oqtane.Client.pdb" target="lib\net9.0" /> 
    <file src="icon.png" target="" />
    <file src="readme.md" target="" />
  </files>
--- a/Oqtane.Package/Oqtane.Framework.nuspec
+++ b/Oqtane.Package/Oqtane.Framework.nuspec
@ -2,7 +2,7 @@
 <package>
  <metadata>
    <id>Oqtane.Framework</id>
-    <version>6.0.0</version>
+    <version>6.0.1</version>
    <authors>Shaun Walker</authors>
    <owners>.NET Foundation</owners>
    <title>Oqtane Framework</title>
@ -11,8 +11,8 @@
    <copyright>.NET Foundation</copyright>
    <requireLicenseAcceptance>false</requireLicenseAcceptance>
    <license type="expression">MIT</license>
-    <projectUrl>https://github.com/oqtane/oqtane.framework/releases/download/v6.0.0/Oqtane.Framework.6.0.0.Upgrade.zip</projectUrl>
-    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.0</releaseNotes>
+    <projectUrl>https://github.com/oqtane/oqtane.framework/releases/download/v6.0.1/Oqtane.Framework.6.0.1.Upgrade.zip</projectUrl>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.1</releaseNotes>
    <readme>readme.md</readme>
    <icon>icon.png</icon>
    <tags>oqtane framework</tags>
--- a/Oqtane.Package/Oqtane.Server.nuspec
+++ b/Oqtane.Package/Oqtane.Server.nuspec
@ -2,7 +2,7 @@
 <package>
  <metadata>
    <id>Oqtane.Server</id>
-    <version>6.0.0</version>
+    <version>6.0.1</version>
    <authors>Shaun Walker</authors>
    <owners>.NET Foundation</owners>
    <title>Oqtane Framework</title>
@ -12,14 +12,14 @@
    <requireLicenseAcceptance>false</requireLicenseAcceptance>
    <license type="expression">MIT</license>
    <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.0</releaseNotes>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.1</releaseNotes>
    <readme>readme.md</readme>
    <icon>icon.png</icon>
    <tags>oqtane</tags>
  </metadata>
  <files>
-    <file src="..\Oqtane.Server\bin\Release\net8.0\Oqtane.Server.dll" target="lib\net9.0" /> 
-    <file src="..\Oqtane.Server\bin\Release\net8.0\Oqtane.Server.pdb" target="lib\net9.0" /> 
+    <file src="..\Oqtane.Server\bin\Release\net9.0\Oqtane.Server.dll" target="lib\net9.0" /> 
+    <file src="..\Oqtane.Server\bin\Release\net9.0\Oqtane.Server.pdb" target="lib\net9.0" /> 
    <file src="icon.png" target="" />
    <file src="readme.md" target="" />
  </files>
--- a/Oqtane.Package/Oqtane.Shared.nuspec
+++ b/Oqtane.Package/Oqtane.Shared.nuspec
@ -2,7 +2,7 @@
 <package>
  <metadata>
    <id>Oqtane.Shared</id>
-    <version>6.0.0</version>
+    <version>6.0.1</version>
    <authors>Shaun Walker</authors>
    <owners>.NET Foundation</owners>
    <title>Oqtane Framework</title>
@ -12,14 +12,14 @@
    <requireLicenseAcceptance>false</requireLicenseAcceptance>
    <license type="expression">MIT</license>
    <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.0</releaseNotes>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.1</releaseNotes>
    <readme>readme.md</readme>
    <icon>icon.png</icon>
    <tags>oqtane</tags>
  </metadata>
  <files>
-    <file src="..\Oqtane.Shared\bin\Release\net8.0\Oqtane.Shared.dll" target="lib\net9.0" />
-    <file src="..\Oqtane.Shared\bin\Release\net8.0\Oqtane.Shared.pdb" target="lib\net9.0" />
+    <file src="..\Oqtane.Shared\bin\Release\net9.0\Oqtane.Shared.dll" target="lib\net9.0" />
+    <file src="..\Oqtane.Shared\bin\Release\net9.0\Oqtane.Shared.pdb" target="lib\net9.0" />
    <file src="icon.png" target="" />
    <file src="readme.md" target="" />
  </files>
--- a/Oqtane.Package/Oqtane.Updater.nuspec
+++ b/Oqtane.Package/Oqtane.Updater.nuspec
@ -2,7 +2,7 @@
 <package>
  <metadata>
    <id>Oqtane.Updater</id>
-    <version>6.0.0</version>
+    <version>6.0.1</version>
    <authors>Shaun Walker</authors>
    <owners>.NET Foundation</owners>
    <title>Oqtane Framework</title>
@ -12,13 +12,13 @@
    <requireLicenseAcceptance>false</requireLicenseAcceptance>
    <license type="expression">MIT</license>
    <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.0</releaseNotes>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.1</releaseNotes>
    <readme>readme.md</readme>
    <icon>icon.png</icon>
    <tags>oqtane</tags>
  </metadata>
  <files>
-    <file src="..\Oqtane.Updater\bin\Release\net8.0\publish\*.*" target="lib\net9.0" />
+    <file src="..\Oqtane.Updater\bin\Release\net9.0\publish\*.*" target="lib\net9.0" />
    <file src="icon.png" target="" />
    <file src="readme.md" target="" />
  </files>
--- a/Oqtane.Package/install.ps1
+++ b/Oqtane.Package/install.ps1
@ -1 +1 @@
-Compress-Archive -Path "..\Oqtane.Server\bin\Release\net9.0\publish\*" -DestinationPath "Oqtane.Framework.6.0.0.Install.zip" -Force 
+Compress-Archive -Path "..\Oqtane.Server\bin\Release\net9.0\publish\*" -DestinationPath "Oqtane.Framework.6.0.1.Install.zip" -Force 
--- a/Oqtane.Package/release.cmd
+++ b/Oqtane.Package/release.cmd
@ -36,6 +36,7 @@ if "%%~nxi" == "%%j" set /A found=1
 )
 if not !found! == 1 rmdir /Q/S "%%i"
 )
+del "..\Oqtane.Server\bin\Release\net9.0\publish\Oqtane.Server.staticwebassets.endpoints.json"
 del "..\Oqtane.Server\bin\Release\net9.0\publish\appsettings.json"
 ren "..\Oqtane.Server\bin\Release\net9.0\publish\appsettings.release.json" "appsettings.json"
 C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe ".\install.ps1"
--- a/Oqtane.Package/upgrade.ps1
+++ b/Oqtane.Package/upgrade.ps1
@ -1 +1 @@
-Compress-Archive -Path "..\Oqtane.Server\bin\Release\net9.0\publish\*" -DestinationPath "Oqtane.Framework.6.0.0.Upgrade.zip" -Force 
+Compress-Archive -Path "..\Oqtane.Server\bin\Release\net9.0\publish\*" -DestinationPath "Oqtane.Framework.6.0.1.Upgrade.zip" -Force 
--- a/Oqtane.Server/Controllers/UserController.cs
+++ b/Oqtane.Server/Controllers/UserController.cs
@ -136,7 +136,7 @@ namespace Oqtane.Controllers
                    filtered.PhotoFileId = user.PhotoFileId;
                    filtered.LastLoginOn = user.LastLoginOn;
                    filtered.LastIPAddress = user.LastIPAddress;
-                    filtered.TwoFactorRequired = false;
+                    filtered.TwoFactorRequired = user.TwoFactorRequired;
                    filtered.Roles = user.Roles;
                    filtered.CreatedBy = user.CreatedBy;
                    filtered.CreatedOn = user.CreatedOn;
--- a/Oqtane.Server/Infrastructure/UpgradeManager.cs
+++ b/Oqtane.Server/Infrastructure/UpgradeManager.cs
@ -69,6 +69,9 @@ namespace Oqtane.Infrastructure
                    case "5.2.1":
                        Upgrade_5_2_1(tenant, scope);
                        break;
+                    case "6.0.1":
+                        Upgrade_6_0_1(tenant, scope);
+                        break;
                }
            }
        }
@ -371,7 +374,7 @@ namespace Oqtane.Infrastructure
                try
                {
                    // delete legacy Views assemblies which will cause startup errors due to missing HostModel
-                    // note that the following files will be deleted however the framework has already started up so a restart will be required
+                    // note that the following files will be deleted however the framework has already started up so another restart will be required
                    var binFolder = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
                    var filepath = Path.Combine(binFolder, "Oqtane.Server.Views.dll");
                    if (System.IO.File.Exists(filepath)) System.IO.File.Delete(filepath);
@ -441,6 +444,54 @@ namespace Oqtane.Infrastructure
            AddPagesToSites(scope, tenant, pageTemplates);
        }

+        private void Upgrade_6_0_1(Tenant tenant, IServiceScope scope)
+        {
+            // assemblies which have been relocated to the bin/refs folder in .NET 9
+            string[] assemblies = {
+                "Microsoft.AspNetCore.Authorization.dll",
+                "Microsoft.AspNetCore.Components.Authorization.dll",
+                "Microsoft.AspNetCore.Components.dll",
+                "Microsoft.AspNetCore.Components.Forms.dll",
+                "Microsoft.AspNetCore.Components.Web.dll",
+                "Microsoft.AspNetCore.Cryptography.Internal.dll",
+                "Microsoft.AspNetCore.Cryptography.KeyDerivation.dll",
+                "Microsoft.AspNetCore.Metadata.dll",
+                "Microsoft.Extensions.Caching.Memory.dll",
+                "Microsoft.Extensions.Configuration.Binder.dll",
+                "Microsoft.Extensions.Configuration.FileExtensions.dll",
+                "Microsoft.Extensions.Configuration.Json.dll",
+                "Microsoft.Extensions.DependencyInjection.Abstractions.dll",
+                "Microsoft.Extensions.DependencyInjection.dll",
+                "Microsoft.Extensions.Diagnostics.Abstractions.dll",
+                "Microsoft.Extensions.Diagnostics.dll",
+                "Microsoft.Extensions.Http.dll",
+                "Microsoft.Extensions.Identity.Core.dll",
+                "Microsoft.Extensions.Identity.Stores.dll",
+                "Microsoft.Extensions.Localization.Abstractions.dll",
+                "Microsoft.Extensions.Localization.dll",
+                "Microsoft.Extensions.Logging.Abstractions.dll",
+                "Microsoft.Extensions.Logging.dll",
+                "Microsoft.Extensions.Options.dll",
+                "Microsoft.JSInterop.dll",
+                "System.Text.Json.dll"
+            };
+
+            foreach (var assembly in assemblies)
+            {
+                try
+                {
+                    var binFolder = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
+                    var filepath = Path.Combine(binFolder, assembly);
+                    if (System.IO.File.Exists(filepath)) System.IO.File.Delete(filepath);
+                }
+                catch (Exception ex)
+                {
+                    // error deleting asesmbly
+                    Debug.WriteLine($"Oqtane Error: 6.0.1 Upgrade Error Removing {assembly} - {ex}");
+                }
+            }
+        }
+
        private void AddPagesToSites(IServiceScope scope, Tenant tenant, List<PageTemplate> pageTemplates)
        {
            var tenants = scope.ServiceProvider.GetRequiredService<ITenantManager>();
--- a/Oqtane.Server/Managers/UserManager.cs
+++ b/Oqtane.Server/Managers/UserManager.cs
@ -339,20 +339,20 @@ namespace Oqtane.Managers
                    user = _users.GetUser(user.Username);
                    if (!user.IsDeleted)
                    {
-                        if (user.TwoFactorRequired)
+                        var alias = _tenantManager.GetAlias();
+                        var twoFactorSetting = _settings.GetSetting(EntityNames.Site, alias.SiteId, "LoginOptions:TwoFactor")?.SettingValue ?? "false";
+                        var twoFactorRequired = twoFactorSetting == "required" || user.TwoFactorRequired;
+                        if (twoFactorRequired)
                        {
                            var token = await _identityUserManager.GenerateTwoFactorTokenAsync(identityuser, "Email");
                            user.TwoFactorCode = token;
                            user.TwoFactorExpiry = DateTime.UtcNow.AddMinutes(10);
                            _users.UpdateUser(user);
-                            var alias = _tenantManager.GetAlias();
-                            string url = alias.Protocol + alias.Name;
                            string siteName = _sites.GetSite(alias.SiteId).Name;
                            string subject = _localizer["TwoFactorEmailSubject"];
                            subject = subject.Replace("[SiteName]", siteName);
                            string body = _localizer["TwoFactorEmailBody"].Value;
                            body = body.Replace("[UserDisplayName]", user.DisplayName);
-                            body = body.Replace("[URL]", url);
                            body = body.Replace("[SiteName]", siteName);
                            body = body.Replace("[Token]", token);
                            var notification = new Notification(alias.SiteId, user, subject, body);
--- a/Oqtane.Server/Migrations/Tenant/06000101_AddLanguageName.cs
+++ b/Oqtane.Server/Migrations/Tenant/06000101_AddLanguageName.cs
@ -0,0 +1,32 @@
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Oqtane.Databases.Interfaces;
+using Oqtane.Migrations.EntityBuilders;
+using Oqtane.Repository;
+
+namespace Oqtane.Migrations.Tenant
+{
+    [DbContext(typeof(TenantDBContext))]
+    [Migration("Tenant.06.00.01.01")]
+    public class AddLanguageName : MultiDatabaseMigration
+    {
+        public AddLanguageName(IDatabase database) : base(database)
+        {
+        }
+
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            // Name column was removed in 5.2.4 however SQLite does not support column removal so it had to be restored
+            if (ActiveDatabase.Name != "Sqlite")
+            {
+                var languageEntityBuilder = new LanguageEntityBuilder(migrationBuilder, ActiveDatabase);
+                languageEntityBuilder.AddStringColumn("Name", 100, true);
+            }
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            // not implemented
+        }
+    }
+}
--- a/Oqtane.Server/Oqtane.Server.csproj
+++ b/Oqtane.Server/Oqtane.Server.csproj
@ -3,7 +3,7 @@
  <PropertyGroup>
    <TargetFramework>net9.0</TargetFramework>
    <Configurations>Debug;Release</Configurations>
-    <Version>6.0.0</Version>
+    <Version>6.0.1</Version>
    <Product>Oqtane</Product>
    <Authors>Shaun Walker</Authors>
    <Company>.NET Foundation</Company>
@ -11,7 +11,7 @@
    <Copyright>.NET Foundation</Copyright>
    <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
    <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.1</PackageReleaseNotes>
    <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
    <RepositoryType>Git</RepositoryType>
    <RootNamespace>Oqtane</RootNamespace>
--- a/Oqtane.Server/Repository/LanguageRepository.cs
+++ b/Oqtane.Server/Repository/LanguageRepository.cs
@ -31,7 +31,7 @@ namespace Oqtane.Repository
                    .ToList()
                    .ForEach(l => l.IsDefault = false);
            }
-
+            language.Name = ""; // stored in database but not used (SQLite limitation)
            db.Language.Add(language);
            db.SaveChanges();

@ -55,6 +55,7 @@ namespace Oqtane.Repository
                    .ForEach(l => l.IsDefault = false);
            }

+            language.Name = ""; // stored in database but not used (SQLite limitation)
            db.SaveChanges();
        }

--- a/Oqtane.Server/Resources/Managers/UserManager.resx
+++ b/Oqtane.Server/Resources/Managers/UserManager.resx
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
  <!-- 
    Microsoft ResX Schema 
@ -118,7 +118,7 @@
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <data name="ForgotPasswordEmailBody" xml:space="preserve">
-    <value>Dear [UserDisplayName]&lt;br&gt;&lt;br&gt;You recently requested to reset your password. Please use the link below to complete the process: &lt;b&gt;&lt;a href="[URL]"&gt;&lt;br&gt;&lt;br&gt;Click here to Reset Password&lt;/a&gt;&lt;/b&gt;&lt;br&gt;&lt;br&gt;Please note that the link is only valid for 24 hours so if you are unable to take action within that time period, you should initiate another password reset on the site.&lt;br&gt;&lt;br&gt;If you did not request to reset your password you can safely ignore this message.&lt;br&gt;&lt;br&gt;Thank You!&lt;br&gt;[SiteName] team</value>
+    <value>Dear [UserDisplayName]&lt;br&gt;&lt;br&gt;You recently requested to reset your password. Please use the link below to complete the process: &lt;b&gt;&lt;a href="[URL]"&gt;&lt;br&gt;&lt;br&gt;Click here to Reset Password&lt;/a&gt;&lt;/b&gt;&lt;br&gt;&lt;br&gt;Please note that the link is only valid for 24 hours so if you are unable to take action within that time period, you should initiate another password reset on the site.&lt;br&gt;&lt;br&gt;If you did not request to reset your password you can safely ignore this message.&lt;br&gt;&lt;br&gt;Thank You!&lt;br&gt;[SiteName] Team</value>
  </data>
  <data name="ForgotPasswordEmailSubject" xml:space="preserve">
    <value>Password Reset Notification Sent For [SiteName]</value>
@ -130,7 +130,7 @@
    <value>User Account Notification for [SiteName]</value>
  </data>
  <data name="TwoFactorEmailBody" xml:space="preserve">
-    <value>Dear [UserDisplayName] + ",&lt;br&gt;&lt;br&gt;You requested a secure verification code to log in to your account. Please enter the secure verification code on the site:&lt;br&gt;&lt;br&gt;&lt;b&gt;[Token] &lt;/b&gt;&lt;br&gt;&lt;br&gt;Please note that the code is only valid for 10 minutes so if you are unable to take action within that time period, you should initiate a new login on the [Alias].&lt;br&gt;&lt;br&gt;Thank You!&lt;br&gt;[SiteName] Team"</value>
+    <value>Dear [UserDisplayName],&lt;br&gt;&lt;br&gt;You requested a secure verification code to log in to your account. Please enter the secure verification code on the site:&lt;br&gt;&lt;br&gt;&lt;b&gt;[Token] &lt;/b&gt;&lt;br&gt;&lt;br&gt;Please note that the code is only valid for 10 minutes so if you are unable to take action within that time period, you should initiate a new login on the site.&lt;br&gt;&lt;br&gt;Thank You!&lt;br&gt;[SiteName] Team</value>
  </data>
  <data name="TwoFactorEmailSubject" xml:space="preserve">
    <value>User Verification Code for [SiteName]</value>
--- a/Oqtane.Shared/Models/File.cs
+++ b/Oqtane.Shared/Models/File.cs
@ -56,7 +56,9 @@ namespace Oqtane.Models
        public string Description { get; set; }

        /// <summary>
-        /// Deprecated - not used
+        /// Deprecated
+        /// Note that this property still exists in the database because columns cannot be dropped in SQLite
+        /// Therefore the property must be retained/mapped even though the framework no longer uses it
        /// </summary>
        public bool? IsDeleted { get; set; }

--- a/Oqtane.Shared/Models/Folder.cs
+++ b/Oqtane.Shared/Models/Folder.cs
@ -63,7 +63,9 @@ namespace Oqtane.Models
        public bool IsSystem { get; set; }

        /// <summary>
-        /// Deprecated - not used
+        /// Deprecated
+        /// Note that this property still exists in the database because columns cannot be dropped in SQLite
+        /// Therefore the property must be retained/mapped even though the framework no longer uses it
        /// </summary>
        public bool? IsDeleted { get; set; }

--- a/Oqtane.Shared/Models/Language.cs
+++ b/Oqtane.Shared/Models/Language.cs
@ -29,9 +29,10 @@ namespace Oqtane.Models
        /// </summary>
        public bool IsDefault { get; set; }

-        [NotMapped]
        /// <summary>
        /// Language Name - corresponds to <see cref="Culture.DisplayName"/>, _not_ <see cref="Culture.Name"/>
+        /// Note that this property still exists in the database because columns cannot be dropped in SQLite
+        /// Therefore the property must be retained/mapped even though the framework populates it from the Culture API
        /// </summary>
        public string Name { get; set; }

--- a/Oqtane.Shared/Oqtane.Shared.csproj
+++ b/Oqtane.Shared/Oqtane.Shared.csproj
@ -3,7 +3,7 @@
  <PropertyGroup>
    <TargetFramework>net9.0</TargetFramework>
    <Configurations>Debug;Release</Configurations>
-    <Version>6.0.0</Version>
+    <Version>6.0.1</Version>
    <Product>Oqtane</Product>
    <Authors>Shaun Walker</Authors>
    <Company>.NET Foundation</Company>
@ -11,7 +11,7 @@
    <Copyright>.NET Foundation</Copyright>
    <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
    <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.1</PackageReleaseNotes>
    <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
    <RepositoryType>Git</RepositoryType>
    <RootNamespace>Oqtane</RootNamespace>
--- a/Oqtane.Shared/Shared/Constants.cs
+++ b/Oqtane.Shared/Shared/Constants.cs
@ -4,8 +4,8 @@ namespace Oqtane.Shared
 {
    public class Constants
    {
-        public static readonly string Version = "6.0.0";
-        public const string ReleaseVersions = "1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,2.0.0,2.0.1,2.0.2,2.1.0,2.2.0,2.3.0,2.3.1,3.0.0,3.0.1,3.0.2,3.0.3,3.1.0,3.1.1,3.1.2,3.1.3,3.1.4,3.2.0,3.2.1,3.3.0,3.3.1,3.4.0,3.4.1,3.4.2,3.4.3,4.0.0,4.0.1,4.0.2,4.0.3,4.0.4,4.0.5,4.0.6,5.0.0,5.0.1,5.0.2,5.0.3,5.1.0,5.1.1,5.1.2,5.2.0,5.2.1,5.2.2,5.2.3,5.2.4,6.0.0";
+        public static readonly string Version = "6.0.1";
+        public const string ReleaseVersions = "1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,2.0.0,2.0.1,2.0.2,2.1.0,2.2.0,2.3.0,2.3.1,3.0.0,3.0.1,3.0.2,3.0.3,3.1.0,3.1.1,3.1.2,3.1.3,3.1.4,3.2.0,3.2.1,3.3.0,3.3.1,3.4.0,3.4.1,3.4.2,3.4.3,4.0.0,4.0.1,4.0.2,4.0.3,4.0.4,4.0.5,4.0.6,5.0.0,5.0.1,5.0.2,5.0.3,5.1.0,5.1.1,5.1.2,5.2.0,5.2.1,5.2.2,5.2.3,5.2.4,6.0.0,6.0.1";
        public const string PackageId = "Oqtane.Framework";
        public const string ClientId = "Oqtane.Client";
        public const string UpdaterPackageId = "Oqtane.Updater";
--- a/Oqtane.Updater/Oqtane.Updater.csproj
+++ b/Oqtane.Updater/Oqtane.Updater.csproj
@ -3,7 +3,7 @@
  <PropertyGroup>
    <TargetFramework>net9.0</TargetFramework>
    <OutputType>Exe</OutputType>
-    <Version>6.0.0</Version>
+    <Version>6.0.1</Version>
    <Product>Oqtane</Product>
    <Authors>Shaun Walker</Authors>
    <Company>.NET Foundation</Company>
@ -11,7 +11,7 @@
    <Copyright>.NET Foundation</Copyright>
    <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
    <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.1</PackageReleaseNotes>
    <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
    <RepositoryType>Git</RepositoryType>
    <RootNamespace>Oqtane</RootNamespace>
--- a/README.md
+++ b/README.md
@ -1,26 +1,28 @@
-# Latest Release
-
-[5.2.4](https://github.com/oqtane/oqtane.framework/releases/tag/v5.2.4) was released on October 17, 2024 and is a maintenance release including 51 pull requests by 7 different contributors, pushing the total number of project commits all-time to over 5900. The Oqtane framework continues to evolve at a rapid pace to meet the needs of .NET developers.
-
-[![Deploy to Azure](https://aka.ms/deploytoazurebutton)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Foqtane%2Foqtane.framework%2Fmaster%2Fazuredeploy.json)
-
 # Oqtane Framework

 ![Oqtane](https://github.com/oqtane/framework/blob/master/oqtane.png?raw=true "Oqtane")

-Oqtane is an open source CMS and Application Framework that provides advanced functionality for developing web, mobile, and desktop applications on .NET. It leverages Blazor to compose a fully dynamic digital experience which can be hosted on Static Blazor, Blazor Server, Blazor WebAssembly, or Blazor Hybrid (via .NET MAUI).
+Oqtane is an open source Content Management System (CMS) and Application Framework that provides advanced functionality for developing web, mobile, and desktop applications on modern .NET. 

-Oqtane is being developed based on some fundamental principles which are outlined in the [Oqtane Philosophy](https://www.oqtane.org/blog/!/20/oqtane-philosophy).
+Oqtane allows you to "Build Applications, Not Infrastructure" which means that you can focus your investment on solving your unique business challenges rather than wasting time and effort on building general infrastructure. 

-Please note that this project is owned by the .NET Foundation and is governed by the **[.NET Foundation Contributor Covenant Code of Conduct](https://dotnetfoundation.org/code-of-conduct)**
+Oqtane is "Rocket Fuel for Blazor" as it provides powerful capabilities to accelerate your Blazor development experience, providing scalable services and a composable UI which can be hosted on Static Blazor, Blazor Server, Blazor WebAssembly, or Blazor Hybrid (via .NET MAUI).

-# Getting Started (Version 5.x)
+Oqtane is being developed based on some fundamental principles which are outlined in the [Oqtane Philosophy](https://www.oqtane.org/blog/!/20/oqtane-philosophy). This project is an official member of the .NET Foundation and is governed by the **[.NET Foundation Contributor Covenant Code of Conduct](https://dotnetfoundation.org/code-of-conduct)**
+
+# Latest Release
+
+[6.0.0](https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.0) was released on November 14, 2024 and is a major release including 39 pull requests by 6 different contributors, pushing the total number of project commits all-time to over 6000. The Oqtane framework continues to evolve at a rapid pace to meet the needs of .NET developers.
+
+[![Deploy to Azure](https://aka.ms/deploytoazurebutton)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Foqtane%2Foqtane.framework%2Fmaster%2Fazuredeploy.json)
+
+# Getting Started (Version 6.x)

 **Installing using source code from the Dev/Master branch:**

- Install **[.NET 8.0.10 SDK](https://dotnet.microsoft.com/download/dotnet/8.0)**.
+- Install **[.NET 9.0.0 SDK](https://dotnet.microsoft.com/download/dotnet/9.0)**.

- Install the latest edition (v17.9 or higher) of [Visual Studio 2022](https://visualstudio.microsoft.com/downloads) with the **ASP.NET and web development** workload enabled. Oqtane works with ALL editions of Visual Studio from Community to Enterprise. If you wish to use LocalDB for development ( not a requirement as Oqtane supports SQLite, mySQL, and PostgreSQL ) you must also install the **Data storage and processing**.  
+- Install the latest edition (v17.12 or higher) of [Visual Studio 2022](https://visualstudio.microsoft.com/downloads) with the **ASP.NET and web development** workload enabled. Oqtane works with ALL editions of Visual Studio from Community to Enterprise. If you wish to use LocalDB for development ( not a requirement as Oqtane supports SQLite, mySQL, and PostgreSQL ) you must also install the **Data storage and processing**.  

 - Clone (or download) the Oqtane Master or Dev branch source code to your local system.

@ -84,7 +86,7 @@ Connect with other developers, get support, and share ideas by joining the Oqtan
 # Roadmap
 This project is open source, and therefore is a work in progress...
      
-6.0.0 (Nov 13, 2024)
+[6.0.0](https://github.com/oqtane/oqtane.framework/releases/tag/v6.0.0) (Nov 14, 2024)
 - [x] Migration to .NET 9

 [5.2.4](https://github.com/oqtane/oqtane.framework/releases/tag/v5.2.4) (Oct 17, 2024)
--- a/SECURITY.md
+++ b/SECURITY.md
@ -0,0 +1,15 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+We make every effort to ensure rapid and thorough analysis of reported issues and, where appropriate, provide workarounds and updated application releases to fix them. If you identify a potential security vulnerability please report it via [the GitHub feature for reporting a security vulnerability](https://github.com/oqtane/oqtane.framework/security/advisories/new).
+
+All submitted information is viewed only by members of the Oqtane Security Team, and will not be discussed outside the Team without the permission of the person/company who reported the issue. Each confirmed issue is assigned a severity level (critical, moderate, or low) corresponding to its potential impact on an Oqtane installation.
+
+* **Critical** means the issue can be exploited by a remote attacker to gain access to data or functionality. All critical issue security bulletins include a recommended workaround or fix that should be applied as soon as possible.
+* **Moderate** means the issue can compromise data or functionality on a portal/website only if some other condition is met (e.g. a particular module or a user within a particular role is required). Moderate issue security bulletins typically include recommended actions to resolve the issue.
+* **Low** means the issue is very difficult to exploit or has a limited potential impact.
+
+Once an issue has been resolved via a public release of Oqtane, the release notes on GitHub are updated to reflect that security bulletins exist for the release. We strongly suggest using the "Watch" option on GitHub for "Releases" at a minimum to receive notifications of updated Oqtane releases.
+
+As a general policy, Oqtane does not issue Hot Fix releases to prior versions of the software.  If a remediation is possible via configuration it shall be noted as applicable in the posted bulletins.
Author	SHA1	Message	Date
Shaun Walker	a5ccc23604	Revert "Fix for Tabpanel is not updating the UI. #4778 "	2024-11-26 13:36:05 -05:00
Shaun Walker	1ed4c8a094	Merge pull request #4874 from oqtane/revert-4871-HTMLTabError Revert "Rework for Tabstrip regression issue"	2024-11-26 13:35:37 -05:00
Shaun Walker	4a74549c1b	Revert "Rework for Tabstrip regression issue"	2024-11-26 13:35:21 -05:00
Shaun Walker	a499cfb98f	Merge pull request #4871 from leigh-pointer/HTMLTabError Rework for Tabstrip regression issue	2024-11-26 11:27:52 -05:00
Shaun Walker	01038c8296	Merge pull request #4873 from sbwalker/dev include SECURITY.md	2024-11-26 11:25:35 -05:00
sbwalker	7407f79b3d	include SECURITY.md	2024-11-26 11:25:23 -05:00
Leigh Pointer	a845dd1976	Rework for Tabstrip regression issue Fix for Tabpanel is not updating the UI. #4778 #4828	2024-11-26 15:39:51 +01:00
Leigh Pointer	9d7549da70	Reverted TabStrip and Panel	2024-11-26 10:33:18 +01:00
Shaun Walker	f5cc61384f	Merge pull request #4870 from sbwalker/dev reference Quill CSS theme using BaseUrl so that it works in .NET MAUI as well as web	2024-11-25 14:20:15 -05:00
sbwalker	844778d36a	reference Quill CSS theme using BaseUrl so that it works in .NET MAUI as well as web	2024-11-25 14:19:58 -05:00
Shaun Walker	871b0a274e	Merge pull request #4869 from sbwalker/dev improve message grammar	2024-11-25 13:48:41 -05:00
sbwalker	737740a3ca	improve message grammar	2024-11-25 13:48:28 -05:00
Shaun Walker	ae8d600600	Update README.md	2024-11-25 09:11:12 -05:00
Shaun Walker	2f1691bfb0	Update README.md	2024-11-25 09:10:20 -05:00
Shaun Walker	a3d25f91c8	Update README.md	2024-11-25 09:09:52 -05:00
Shaun Walker	ff84b50817	Update README.md	2024-11-25 09:09:13 -05:00
Shaun Walker	0be8242284	Merge pull request #4862 from leigh-pointer/SettingsSetTabOnSave Updated the Module Settings to use the new ActiveTab parameter	2024-11-25 08:39:45 -05:00
Shaun Walker	e25a6259ea	Merge pull request #4861 from zyhfish/task/fix-4841 Fix #4841: force 2FA validation when it's required in site level.	2024-11-25 08:39:26 -05:00
Leigh Pointer	1578f82efb	Updated the Module Settings to use the new ActiveTab parameter	2024-11-23 11:42:22 +01:00
Ben	b5f75f0c5e	Fix #4841 : force 2FA validation when it's required in site level.	2024-11-23 13:04:27 +08:00
Shaun Walker	601caab3b6	Merge pull request #4860 from sbwalker/dev fix #4760 - display update confirmation message in Site Settings	2024-11-22 16:34:46 -05:00
sbwalker	6d3092f440	fix #4760 - display update confirmation message in Site Settings	2024-11-22 16:34:35 -05:00
Shaun Walker	ef27937c7a	Merge pull request #4785 from thabaum/refactored-heading-ifelse Fixes #4784: Refactor TabPanel Heading Assignment Logic	2024-11-22 15:34:51 -05:00
Shaun Walker	f4a7b79c4f	Merge pull request #4828 from leigh-pointer/TabChange Fix for Tabpanel is not updating the UI. #4778	2024-11-22 15:30:51 -05:00
Shaun Walker	2531776a48	Merge pull request #4859 from sbwalker/dev prepare for 6.0.1	2024-11-22 12:29:56 -05:00
sbwalker	ced80419aa	prepare for 6.0.1	2024-11-22 12:29:44 -05:00
Shaun Walker	ad2816f4e8	Merge pull request #4858 from sbwalker/dev fix #4848 - remove assemblies from /bin which have been moved to /bin/refs in .NET 9	2024-11-22 12:14:04 -05:00
sbwalker	3528b8c674	fix #4848 - remove assemblies from /bin which have been moved to /bin/refs in .NET 9	2024-11-22 12:13:45 -05:00
Shaun Walker	80c83c626d	Merge pull request #4853 from leigh-pointer/PagerAlignment Fix for #4852 align the Page numbers container	2024-11-22 11:56:12 -05:00
Shaun Walker	6a355f2aea	Merge pull request #4857 from sbwalker/dev fix #4855 - dropping required column causes issue on SQLite	2024-11-22 11:55:56 -05:00
sbwalker	7d94e4a53a	fix #4855 - dropping required column causes issue on SQLite	2024-11-22 11:55:43 -05:00
Shaun Walker	823c04742e	Merge pull request #4854 from sbwalker/dev resolve .NET version issue in nuspec files	2024-11-21 10:54:06 -05:00
sbwalker	043fb1abd1	resolve .NET version issue in nuspec files	2024-11-21 10:53:52 -05:00
Leigh Pointer	f01e85b690	Fix for #4852 align the Page numbers container	2024-11-21 16:05:32 +01:00
Shaun Walker	7eb1298847	Merge pull request #4847 from sbwalker/dev do not include Oqtane.Server.staticwebassets.endpoints.json in release packages	2024-11-19 13:50:05 -05:00
sbwalker	a5480c9a96	do not include Oqtane.Server.staticwebassets.endpoints.json in release packages	2024-11-19 13:49:45 -05:00
Shaun Walker	f948600e86	Merge pull request #4845 from sbwalker/dev fix 2 factor authentication email	2024-11-18 15:04:01 -05:00
sbwalker	420182b9bf	fix 2 factor authentication email	2024-11-18 15:03:48 -05:00
Shaun Walker	8c430ce1a6	Merge pull request #4837 from Trifoia/4803-Add-a-CONTRIBUTING.md 4803 add a contributing.md	2024-11-15 15:02:28 -05:00
Mark Davis	d3717dbe19	Remove DefaultDBType value and InstallationId from appsettings.json The commit removes the value for DefaultDBType and InstallationId from the appsettings.json file.	2024-11-15 10:31:49 -08:00
Mark Davis	caa83d769f	Create CONTRIBUTING.md	2024-11-15 10:27:53 -08:00
Mark Davis	365f87828f	Merge remote-tracking branch 'oqtane/dev' into dev	2024-11-15 09:52:50 -08:00
Shaun Walker	f780887866	Update README.md	2024-11-14 15:46:26 -05:00
Leigh Pointer	db6dd5abee	Fix for TabPanel is not updating the UI. #4778 Modified that TabStrip and TabPane, now when the ActiveTab is changed the TabPanel is selected	2024-11-14 10:35:15 +01:00
Leigh Pointer	702eb9e466	Revert "Fix for Page Management tab panel is not updating the UI. #4778 " This reverts commit `3c99006226`.	2024-11-14 10:33:10 +01:00
Leigh Pointer	3c99006226	Fix for Page Management tab panel is not updating the UI. #4778	2024-11-14 10:31:53 +01:00
Cody	d77e898929	Refactor TabPanel Heading Assignment Logic - Simplified the logic for setting the Heading property in the TabPanel component. - Replaced the if-else statement with a ternary operator for improved readability and maintainability. - Ensured that the functionality remains unchanged and verified correct assignment of headings.	2024-10-24 12:43:20 -07:00
Mark Davis	bf175984f3	Merge remote-tracking branch 'origin/dev' into dev	2024-09-11 18:23:41 -07:00
Mark Davis	4b17847ea5	Merge remote-tracking branch 'oqtane/dev' into dev	2024-07-05 21:53:14 -07:00
Mark Davis	2addcc3ab5	Merge branch 'dev' of https://github.com/Trifoia/oqtane.framework into dev	2024-03-28 13:47:43 -07:00
markdav-is	370b39a139	Merge branch 'release/v5.0.1' into dev	2024-01-27 21:18:58 -08:00
Mark Davis	7b7e64576f	Update appsettings.json	2024-01-27 20:30:20 -08:00
Mark Davis	286928d59e	Merge tag 'v5.0.1' into dev	2023-12-29 11:54:39 -08:00
Mark Davis	cc65555c3d	minor fix to routing	2023-12-05 12:17:02 -08:00
Mark Davis	63e3923349	Merge remote-tracking branch 'oqtane/dev' into dev	2023-11-17 12:55:40 -08:00