From cc65555c3dcc6e51dd04512f041615911a55ef75 Mon Sep 17 00:00:00 2001 From: Mark Davis Date: Tue, 5 Dec 2023 12:17:02 -0800 Subject: [PATCH 1/4] minor fix to routing --- Oqtane.Server/Pages/_Host.cshtml.cs | 2 +- Oqtane.Server/appsettings.json | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Oqtane.Server/Pages/_Host.cshtml.cs b/Oqtane.Server/Pages/_Host.cshtml.cs index 50fb2575..a451f5a0 100644 --- a/Oqtane.Server/Pages/_Host.cshtml.cs +++ b/Oqtane.Server/Pages/_Host.cshtml.cs @@ -505,7 +505,7 @@ namespace Oqtane.Pages { if (resource.Url.StartsWith("~")) { - resource.Url = resource.Url.Replace("~", "/Themes/" + name + "/").Replace("//", "/"); + resource.Url = resource.Url.Replace("~", "/Themes/" + Utilities.GetTypeName(name) + "/").Replace("//", "/"); } if (!resource.Url.Contains("://") && alias.BaseUrl != "" && !resource.Url.StartsWith(alias.BaseUrl)) { diff --git a/Oqtane.Server/appsettings.json b/Oqtane.Server/appsettings.json index ccf00c5c..2c4c7f58 100644 --- a/Oqtane.Server/appsettings.json +++ b/Oqtane.Server/appsettings.json @@ -2,10 +2,10 @@ "Runtime": "Server", "RenderMode": "ServerPrerendered", "Database": { - "DefaultDBType": "" + "DefaultDBType": "Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Database.SqlServer" }, "ConnectionStrings": { - "DefaultConnection": "" + "DefaultConnection": "Data Source=pmc-sql.database.windows.net;Initial Catalog=pmc-cart-dev-sqldb;User ID=sql-dev-pmc;Password=1PwdCartCode!;Encrypt=false;TrustServerCertificate=false;" }, "Installation": { "DefaultAlias": "", @@ -54,5 +54,6 @@ "LogLevel": { "Default": "Information" } - } -} + }, + "InstallationId": "c6f298a3-7a64-419e-89ca-4d73946a53fe" +} \ No newline at end of file From 7b7e64576f44206896402fc3735cf85b89d8f730 Mon Sep 17 00:00:00 2001 From: Mark Davis <311063+markdav-is@users.noreply.github.com> Date: Sat, 27 Jan 2024 20:30:20 -0800 Subject: [PATCH 2/4] Update appsettings.json --- Oqtane.Server/appsettings.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Oqtane.Server/appsettings.json b/Oqtane.Server/appsettings.json index 2c4c7f58..6d3d01af 100644 --- a/Oqtane.Server/appsettings.json +++ b/Oqtane.Server/appsettings.json @@ -5,7 +5,7 @@ "DefaultDBType": "Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Database.SqlServer" }, "ConnectionStrings": { - "DefaultConnection": "Data Source=pmc-sql.database.windows.net;Initial Catalog=pmc-cart-dev-sqldb;User ID=sql-dev-pmc;Password=1PwdCartCode!;Encrypt=false;TrustServerCertificate=false;" + "DefaultConnection": "" }, "Installation": { "DefaultAlias": "", @@ -56,4 +56,4 @@ } }, "InstallationId": "c6f298a3-7a64-419e-89ca-4d73946a53fe" -} \ No newline at end of file +} From caa83d769f8a8503d92092eec7496227914a0333 Mon Sep 17 00:00:00 2001 From: Mark Davis <311063+markdav-is@users.noreply.github.com> Date: Fri, 15 Nov 2024 10:27:53 -0800 Subject: [PATCH 3/4] Create CONTRIBUTING.md --- CONTRIBUTING.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000..eef872ac --- /dev/null +++ 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! From d3717dbe19c62b81f05839a1038404b8dd1db3a0 Mon Sep 17 00:00:00 2001 From: Mark Davis Date: Fri, 15 Nov 2024 10:31:49 -0800 Subject: [PATCH 4/4] Remove DefaultDBType value and InstallationId from appsettings.json The commit removes the value for DefaultDBType and InstallationId from the appsettings.json file. --- Oqtane.Server/appsettings.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Oqtane.Server/appsettings.json b/Oqtane.Server/appsettings.json index f8a82901..28270bab 100644 --- a/Oqtane.Server/appsettings.json +++ b/Oqtane.Server/appsettings.json @@ -2,7 +2,7 @@ "RenderMode": "Interactive", "Runtime": "Server", "Database": { - "DefaultDBType": "Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Database.SqlServer" + "DefaultDBType": "" }, "ConnectionStrings": { "DefaultConnection": "" @@ -54,6 +54,5 @@ "LogLevel": { "Default": "Information" } - }, - "InstallationId": "c6f298a3-7a64-419e-89ca-4d73946a53fe" + } }