Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into dev

Browse Source
This commit is contained in:
Charles Nurse
2021-04-19 11:08:35 -07:00
parent 096f8249c3 947c254e12
commit 74c403cef1
112 changed files with 1696 additions and 1232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Oqtane.Shared/Models/Site.cs
View File

@ -18,6 +18,7 @@ namespace Oqtane.Models
public int? PwaAppIconFileId { get; set; }
public int? PwaSplashIconFileId { get; set; }
public bool AllowRegistration { get; set; }
public string SiteGuid { get; set; }
public string CreatedBy { get; set; }
public DateTime CreatedOn { get; set; }

4
Oqtane.Shared/Models/Theme.cs
View File

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
namespace Oqtane.Models
@ -14,6 +14,7 @@ namespace Oqtane.Models
Contact = "";
License = "";
Dependencies = "";
Template = "";
}
public string ThemeName { get; set; }
@ -28,6 +29,7 @@ namespace Oqtane.Models
public List<ThemeControl> Themes { get; set; }
public List<ThemeControl> Layouts { get; set; }
public List<ThemeControl> Containers { get; set; }
public string Template { get; set; }
//[Obsolete("This property is obsolete. Use Themes instead.", false)]
public string ThemeControls { get; set; }

2
Oqtane.Shared/Shared/Constants.cs
View File

@ -13,7 +13,7 @@ namespace Oqtane.Shared {
public const string DefaultTheme = "Oqtane.Themes.OqtaneTheme.Default, Oqtane.Client";
public const string DefaultLayout = "Oqtane.Themes.OqtaneTheme.SinglePane, Oqtane.Client";
public const string DefaultContainer = "Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client";
public const string DefaultContainer = "Oqtane.Themes.OqtaneTheme.DefaultTitle, Oqtane.Client";
public const string DefaultAdminContainer = "Oqtane.Themes.AdminContainer, Oqtane.Client";
public const string ActionToken = "{Action}";

6
Oqtane.Shared/Shared/PaneNames.cs
View File

@ -1,9 +1,5 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace Oqtane.Shared {
public class PaneNames {
public const string Admin = "Admin";
public const string Admin = "Content";
}
}