diff --git a/Authentication/MongoAuth/MongoMembershipProvider.cs b/Authentication/MongoAuth/MongoMembershipProvider.cs index f2b82ca..4d227d7 100644 --- a/Authentication/MongoAuth/MongoMembershipProvider.cs +++ b/Authentication/MongoAuth/MongoMembershipProvider.cs @@ -72,10 +72,9 @@ namespace MongoAuth if (!string.IsNullOrEmpty(DatabaseConfig.Username) && !string.IsNullOrEmpty(DatabaseConfig.Password)) { - settings.Credentials = new List - { - MongoCredential.CreateCredential(DatabaseConfig.Database, DatabaseConfig.Username, DatabaseConfig.Password) - }; + settings.Credential = MongoCredential.CreateCredential(DatabaseConfig.Database, + DatabaseConfig.Username, + DatabaseConfig.Password); } MongoClient dbClient = new MongoClient(settings); diff --git a/Authentication/MongoAuth/MongoRoleProvider.cs b/Authentication/MongoAuth/MongoRoleProvider.cs index 9e5d246..7b7ca98 100644 --- a/Authentication/MongoAuth/MongoRoleProvider.cs +++ b/Authentication/MongoAuth/MongoRoleProvider.cs @@ -37,10 +37,9 @@ namespace MongoAuth if (!string.IsNullOrEmpty(DatabaseConfig.Username) && !string.IsNullOrEmpty(DatabaseConfig.Password)) { - settings.Credentials = new List - { - MongoCredential.CreateCredential(DatabaseConfig.Database, DatabaseConfig.Username, DatabaseConfig.Password) - }; + settings.Credential = MongoCredential.CreateCredential(DatabaseConfig.Database, + DatabaseConfig.Username, + DatabaseConfig.Password); } MongoClient dbClient = new MongoClient(settings); diff --git a/BuildFeed.Local/InvariantTerms.cs b/BuildFeed.Local/InvariantTerms.cs index bbc34e8..78d1a59 100644 --- a/BuildFeed.Local/InvariantTerms.cs +++ b/BuildFeed.Local/InvariantTerms.cs @@ -4,7 +4,7 @@ namespace BuildFeed.Local { public class InvariantTerms { - public const string DeveloperName = "Thomas Hounsell"; + public const string DeveloperName = "The BuildFeed Team"; public const string ProductName = "Windows NT"; public const string SiteName = "BuildFeed"; } diff --git a/BuildFeed.Local/Properties/AssemblyInfo.cs b/BuildFeed.Local/Properties/AssemblyInfo.cs index 5b63323..4ff5785 100644 --- a/BuildFeed.Local/Properties/AssemblyInfo.cs +++ b/BuildFeed.Local/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("BuildFeed.Local")] -[assembly: AssemblyCopyright("Copyright © 2016, Thomas Hounsell")] +[assembly: AssemblyCopyright("Copyright © 2013 - 2018, The BuildFeed Team")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/BuildFeed.Local/VariantTerms.Designer.cs b/BuildFeed.Local/VariantTerms.Designer.cs index bf9a024..2b24597 100644 --- a/BuildFeed.Local/VariantTerms.Designer.cs +++ b/BuildFeed.Local/VariantTerms.Designer.cs @@ -19,7 +19,7 @@ namespace BuildFeed.Local { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class VariantTerms { @@ -186,6 +186,15 @@ namespace BuildFeed.Local { } } + /// + /// Looks up a localized string similar to Blog. + /// + public static string Common_Blog { + get { + return ResourceManager.GetString("Common_Blog", resourceCulture); + } + } + /// /// Looks up a localized string similar to Change password. /// @@ -312,6 +321,15 @@ namespace BuildFeed.Local { } } + /// + /// Looks up a localized string similar to Winter. + /// + public static string Common_ThemeWinter { + get { + return ResourceManager.GetString("Common_ThemeWinter", resourceCulture); + } + } + /// /// Looks up a localized string similar to | Page {0}. /// diff --git a/BuildFeed.Local/VariantTerms.en.resx b/BuildFeed.Local/VariantTerms.en.resx index 504c8f9..bb1dc5c 100644 --- a/BuildFeed.Local/VariantTerms.en.resx +++ b/BuildFeed.Local/VariantTerms.en.resx @@ -159,6 +159,9 @@ Admin + + Blog + Change password @@ -201,6 +204,9 @@ Light + + Winter + | Page {0} @@ -422,6 +428,9 @@ The {0} Team. Year + + Every account is validated by an administrator, so be patient and check again later + Additions to BuildFeed @@ -497,6 +506,9 @@ The {0} Team. Remember me + + Thank you for registering + Username @@ -515,11 +527,4 @@ The {0} Team. Week - - - Every account is validated by an administrator, so be patient and check again later - - - Thank you for registering - \ No newline at end of file diff --git a/BuildFeed.Local/VariantTerms.resx b/BuildFeed.Local/VariantTerms.resx index 504c8f9..bb1dc5c 100644 --- a/BuildFeed.Local/VariantTerms.resx +++ b/BuildFeed.Local/VariantTerms.resx @@ -159,6 +159,9 @@ Admin + + Blog + Change password @@ -201,6 +204,9 @@ Light + + Winter + | Page {0} @@ -422,6 +428,9 @@ The {0} Team. Year + + Every account is validated by an administrator, so be patient and check again later + Additions to BuildFeed @@ -497,6 +506,9 @@ The {0} Team. Remember me + + Thank you for registering + Username @@ -515,11 +527,4 @@ The {0} Team. Week - - - Every account is validated by an administrator, so be patient and check again later - - - Thank you for registering - \ No newline at end of file diff --git a/BuildFeed.Model/BuildFeed.Model.csproj b/BuildFeed.Model/BuildFeed.Model.csproj index 02c35bd..331c92a 100644 --- a/BuildFeed.Model/BuildFeed.Model.csproj +++ b/BuildFeed.Model/BuildFeed.Model.csproj @@ -37,8 +37,8 @@ ..\packages\DnsClient.1.0.7\lib\net45\DnsClient.dll - - ..\packages\HtmlAgilityPack.1.6.7\lib\Net45\HtmlAgilityPack.dll + + ..\packages\HtmlAgilityPack.1.6.11\lib\Net45\HtmlAgilityPack.dll ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll diff --git a/BuildFeed.Model/BuildRepository.cs b/BuildFeed.Model/BuildRepository.cs index 83efe6f..1574d89 100644 --- a/BuildFeed.Model/BuildRepository.cs +++ b/BuildFeed.Model/BuildRepository.cs @@ -36,10 +36,8 @@ namespace BuildFeed.Model if (!string.IsNullOrEmpty(MongoConfig.Username) && !string.IsNullOrEmpty(MongoConfig.Password)) { - settings.Credentials = new List - { - MongoCredential.CreateCredential(MongoConfig.Database, MongoConfig.Username, MongoConfig.Password) - }; + settings.Credential = + MongoCredential.CreateCredential(MongoConfig.Database, MongoConfig.Username, MongoConfig.Password); } var dbClient = new MongoClient(settings); diff --git a/BuildFeed.Model/MetaItem.cs b/BuildFeed.Model/MetaItem.cs index efd6995..ecb6184 100644 --- a/BuildFeed.Model/MetaItem.cs +++ b/BuildFeed.Model/MetaItem.cs @@ -44,10 +44,8 @@ namespace BuildFeed.Model if (!string.IsNullOrEmpty(MongoConfig.Username) && !string.IsNullOrEmpty(MongoConfig.Password)) { - settings.Credentials = new List - { - MongoCredential.CreateCredential(MongoConfig.Database, MongoConfig.Username, MongoConfig.Password) - }; + settings.Credential = + MongoCredential.CreateCredential(MongoConfig.Database, MongoConfig.Username, MongoConfig.Password); } MongoClient dbClient = new MongoClient(settings); diff --git a/BuildFeed.Model/Properties/AssemblyInfo.cs b/BuildFeed.Model/Properties/AssemblyInfo.cs index 084fe90..8e21a56 100644 --- a/BuildFeed.Model/Properties/AssemblyInfo.cs +++ b/BuildFeed.Model/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("BuildFeed.Model")] -[assembly: AssemblyCopyright("Copyright © 2016, Thomas Hounsell")] +[assembly: AssemblyCopyright("Copyright © 2013 - 2018, The BuildFeed Team")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/BuildFeed.Model/packages.config b/BuildFeed.Model/packages.config index 92d5274..0ab4c5c 100644 --- a/BuildFeed.Model/packages.config +++ b/BuildFeed.Model/packages.config @@ -2,7 +2,7 @@ - + diff --git a/BuildFeed/BuildFeed.csproj b/BuildFeed/BuildFeed.csproj index 5dbc5a2..b91be94 100644 --- a/BuildFeed/BuildFeed.csproj +++ b/BuildFeed/BuildFeed.csproj @@ -70,8 +70,8 @@ ..\packages\DnsClient.1.0.7\lib\net45\DnsClient.dll - - ..\packages\HtmlAgilityPack.1.6.7\lib\Net45\HtmlAgilityPack.dll + + ..\packages\HtmlAgilityPack.1.6.11\lib\Net45\HtmlAgilityPack.dll ..\packages\Humanizer.Core.2.2.0\lib\netstandard1.0\Humanizer.dll @@ -98,11 +98,11 @@ ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - - ..\packages\OneSignal.CSharp.SDK.0.10\lib\net45\OneSignal.CSharp.SDK.dll + + ..\packages\OneSignal.RestAPIv3.Client.1.0.3\lib\net452\OneSignal.RestAPIv3.Client.dll - - ..\packages\RestSharp.106.1.0\lib\net452\RestSharp.dll + + ..\packages\RestSharp.106.2.0\lib\net452\RestSharp.dll @@ -194,6 +194,10 @@ ..\packages\System.Text.RegularExpressions.4.3.0\lib\net463\System.Text.RegularExpressions.dll + + ..\packages\System.ValueTuple.4.4.0\lib\net47\System.ValueTuple.dll + True + diff --git a/BuildFeed/Code/OneSignalHelper.cs b/BuildFeed/Code/OneSignalHelper.cs index 637898d..8c5f433 100644 --- a/BuildFeed/Code/OneSignalHelper.cs +++ b/BuildFeed/Code/OneSignalHelper.cs @@ -4,9 +4,9 @@ using System.Configuration; using System.Globalization; using BuildFeed.Local; using BuildFeed.Model; -using OneSignal.CSharp.SDK; -using OneSignal.CSharp.SDK.Resources; -using OneSignal.CSharp.SDK.Resources.Notifications; +using OneSignal.RestAPIv3.Client; +using OneSignal.RestAPIv3.Client.Resources; +using OneSignal.RestAPIv3.Client.Resources.Notifications; namespace BuildFeed.Code { diff --git a/BuildFeed/Code/Options/Theme.cs b/BuildFeed/Code/Options/Theme.cs index d9c26b3..63cd3f5 100644 --- a/BuildFeed/Code/Options/Theme.cs +++ b/BuildFeed/Code/Options/Theme.cs @@ -44,6 +44,7 @@ namespace BuildFeed.Code.Options [Display(ResourceType = typeof(VariantTerms), Name = nameof(VariantTerms.Common_ThemeLight))] Light, + [Display(ResourceType = typeof(VariantTerms), Name = nameof(VariantTerms.Common_ThemeWinter))] Winter } } \ No newline at end of file diff --git a/BuildFeed/Controllers/apiController.cs b/BuildFeed/Controllers/apiController.cs index ffe4834..01bf502 100644 --- a/BuildFeed/Controllers/apiController.cs +++ b/BuildFeed/Controllers/apiController.cs @@ -11,7 +11,7 @@ using BuildFeed.Local; using BuildFeed.Model; using BuildFeed.Model.Api; using BuildFeed.Model.View; -using OneSignal.CSharp.SDK; +using OneSignal.RestAPIv3.Client; #pragma warning disable SG0016 // Controller method is vulnerable to CSRF - Not relevant for API diff --git a/BuildFeed/Controllers/frontController.cs b/BuildFeed/Controllers/frontController.cs index 6043fb5..d103690 100644 --- a/BuildFeed/Controllers/frontController.cs +++ b/BuildFeed/Controllers/frontController.cs @@ -14,7 +14,7 @@ using System.Web.Mvc; using BuildFeed.Code; using BuildFeed.Model; using BuildFeed.Model.View; -using OneSignal.CSharp.SDK; +using OneSignal.RestAPIv3.Client; namespace BuildFeed.Controllers { diff --git a/BuildFeed/Properties/AssemblyInfo.cs b/BuildFeed/Properties/AssemblyInfo.cs index 16dd922..dc0e127 100644 --- a/BuildFeed/Properties/AssemblyInfo.cs +++ b/BuildFeed/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("BuildFeed")] -[assembly: AssemblyCopyright("Copyright © 2016, Thomas Hounsell")] +[assembly: AssemblyCopyright("Copyright © 2013 - 2018, The BuildFeed Team")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/BuildFeed/Views/shared/_default.cshtml b/BuildFeed/Views/shared/_default.cshtml index 6dfd50d..498029d 100644 --- a/BuildFeed/Views/shared/_default.cshtml +++ b/BuildFeed/Views/shared/_default.cshtml @@ -16,7 +16,7 @@ - + @@ -119,6 +119,11 @@ @VariantTerms.Common_RssFeeds +
  • + + @VariantTerms.Common_Blog + +
  • @VariantTerms.Common_Twitter @@ -132,74 +137,74 @@
    • @@ -213,26 +218,26 @@

    @VariantTerms.Common_NavigationTheme