diff --git a/Disco.BI/Disco.BI.csproj b/Disco.BI/Disco.BI.csproj index 8beaac0a..e67cc353 100644 --- a/Disco.BI/Disco.BI.csproj +++ b/Disco.BI/Disco.BI.csproj @@ -10,7 +10,7 @@ Properties Disco Disco.BI - v4.5.2 + v4.6.2 512 ..\ diff --git a/Disco.BI/Properties/Resources.Designer.cs b/Disco.BI/Properties/Resources.Designer.cs index 70d245f4..f789e168 100644 --- a/Disco.BI/Properties/Resources.Designer.cs +++ b/Disco.BI/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace Disco.Properties { // 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", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/Disco.BI/app.config b/Disco.BI/app.config index f12e1e2f..4ebd93b2 100644 --- a/Disco.BI/app.config +++ b/Disco.BI/app.config @@ -1,57 +1,57 @@ - + -
+
- - + + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - \ No newline at end of file + diff --git a/Disco.Data/App.config b/Disco.Data/App.config index 24c7f4a8..f2516e03 100644 --- a/Disco.Data/App.config +++ b/Disco.Data/App.config @@ -15,6 +15,6 @@ - + - \ No newline at end of file + diff --git a/Disco.Data/Disco.Data.csproj b/Disco.Data/Disco.Data.csproj index 08459754..f41fd7c7 100644 --- a/Disco.Data/Disco.Data.csproj +++ b/Disco.Data/Disco.Data.csproj @@ -10,7 +10,7 @@ Properties Disco.Data Disco.Data - v4.5.2 + v4.6.2 512 ..\ diff --git a/Disco.Data/Properties/Resources.Designer.cs b/Disco.Data/Properties/Resources.Designer.cs index de46338e..fa987387 100644 --- a/Disco.Data/Properties/Resources.Designer.cs +++ b/Disco.Data/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.17929 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ namespace Disco.Data.Properties { // 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", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/Disco.Models/App.config b/Disco.Models/App.config index c68f3757..ea64970f 100644 --- a/Disco.Models/App.config +++ b/Disco.Models/App.config @@ -12,6 +12,6 @@ - + - \ No newline at end of file + diff --git a/Disco.Models/Disco.Models.csproj b/Disco.Models/Disco.Models.csproj index 6b904b7a..52c5ee8e 100644 --- a/Disco.Models/Disco.Models.csproj +++ b/Disco.Models/Disco.Models.csproj @@ -10,7 +10,7 @@ Properties Disco.Models Disco.Models - v4.5.2 + v4.6.2 512 diff --git a/Disco.Services.Plugins.ManifestGenerator/App.config b/Disco.Services.Plugins.ManifestGenerator/App.config index 1327618b..b4565340 100644 --- a/Disco.Services.Plugins.ManifestGenerator/App.config +++ b/Disco.Services.Plugins.ManifestGenerator/App.config @@ -1,38 +1,38 @@ - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - \ No newline at end of file + diff --git a/Disco.Services.Plugins.ManifestGenerator/Disco.Services.Plugins.ManifestGenerator.csproj b/Disco.Services.Plugins.ManifestGenerator/Disco.Services.Plugins.ManifestGenerator.csproj index f7e8241e..1a9b69c3 100644 --- a/Disco.Services.Plugins.ManifestGenerator/Disco.Services.Plugins.ManifestGenerator.csproj +++ b/Disco.Services.Plugins.ManifestGenerator/Disco.Services.Plugins.ManifestGenerator.csproj @@ -9,9 +9,10 @@ Properties Disco.Services.Plugins.ManifestGenerator Disco.Services.Plugins.ManifestGenerator - v4.5.2 + v4.6.2 512 true + AnyCPU diff --git a/Disco.Services/App.config b/Disco.Services/App.config index 2e657e04..f787e7ee 100644 --- a/Disco.Services/App.config +++ b/Disco.Services/App.config @@ -12,7 +12,7 @@ - + diff --git a/Disco.Services/Authorization/Claims.cs b/Disco.Services/Authorization/Claims.cs index 33a3becd..b0b59012 100644 --- a/Disco.Services/Authorization/Claims.cs +++ b/Disco.Services/Authorization/Claims.cs @@ -220,7 +220,7 @@ namespace Disco.Services.Authorization { "User.ShowFlagAssignments", new Tuple, Action, string, string, bool>(c => c.User.ShowFlagAssignments, (c, v) => c.User.ShowFlagAssignments = v, "Show Users Flag Assignments", "Can show flags associated with users", false) }, { "User.ShowJobs", new Tuple, Action, string, string, bool>(c => c.User.ShowJobs, (c, v) => c.User.ShowJobs = v, "Show Users Jobs", "Can show jobs associated with users", false) }, { "ComputerAccount", new Tuple, Action, string, string, bool>(c => c.ComputerAccount, (c, v) => c.ComputerAccount = v, "Computer Account", "Represents a computer account", true) }, - { "DiscoAdminAccount", new Tuple, Action, string, string, bool>(c => c.DiscoAdminAccount, (c, v) => c.DiscoAdminAccount = v, "Disco ICT Administrator Account", "Represents a Disco ICT Administrator account", true) } + { "DiscoAdminAccount", new Tuple, Action, string, string, bool>(c => c.DiscoAdminAccount, (c, v) => c.DiscoAdminAccount = v, "Disco Administrator Account", "Represents a Disco ICT Administrator account", true) } }; #endregion @@ -1917,7 +1917,7 @@ namespace Disco.Services.Authorization /// public const string ComputerAccount = "ComputerAccount"; - /// Disco ICT Administrator Account + /// Disco Administrator Account /// Represents a Disco ICT Administrator account /// public const string DiscoAdminAccount = "DiscoAdminAccount"; diff --git a/Disco.Services/Disco.Services.csproj b/Disco.Services/Disco.Services.csproj index 8971a704..7aef474c 100644 --- a/Disco.Services/Disco.Services.csproj +++ b/Disco.Services/Disco.Services.csproj @@ -11,7 +11,7 @@ Properties Disco.Services Disco.Services - v4.5.2 + v4.6.2 512 ..\ diff --git a/Disco.Services/Properties/Resources.Designer.cs b/Disco.Services/Properties/Resources.Designer.cs index 242bac51..279f0604 100644 --- a/Disco.Services/Properties/Resources.Designer.cs +++ b/Disco.Services/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace Disco.Services.Properties { // 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", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/Disco.Web.Extensions/App.config b/Disco.Web.Extensions/App.config index 0a57a3d2..9f709e05 100644 --- a/Disco.Web.Extensions/App.config +++ b/Disco.Web.Extensions/App.config @@ -1,53 +1,53 @@ - + -
+
- + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - \ No newline at end of file + diff --git a/Disco.Web.Extensions/Disco.Web.Extensions.csproj b/Disco.Web.Extensions/Disco.Web.Extensions.csproj index e9fcb067..95559bbf 100644 --- a/Disco.Web.Extensions/Disco.Web.Extensions.csproj +++ b/Disco.Web.Extensions/Disco.Web.Extensions.csproj @@ -10,7 +10,7 @@ Properties Disco.Web.Extensions Disco.Web.Extensions - v4.5.2 + v4.6.2 512 ..\ diff --git a/Disco.Web/App_Code/AjaxHelpers.generated.cs b/Disco.Web/App_Code/AjaxHelpers.generated.cs index ebd4986f..89fd049c 100644 --- a/Disco.Web/App_Code/AjaxHelpers.generated.cs +++ b/Disco.Web/App_Code/AjaxHelpers.generated.cs @@ -2,7 +2,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34014 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -46,161 +46,177 @@ namespace Disco.Web public class AjaxHelpers : System.Web.WebPages.HelperPage { +#line 5 "..\..\App_Code\AjaxHelpers.cshtml" public static System.Web.WebPages.HelperResult AjaxLoader(string id = null) { +#line default +#line hidden return new System.Web.WebPages.HelperResult(__razor_helper_writer => { - - #line 6 "..\..\App_Code\AjaxHelpers.cshtml" Html.GetPageHelper().BundleDeferred("~/ClientScripts/Modules/Disco-AjaxHelperIcons"); + #line default #line hidden - -WriteLiteralTo(@__razor_helper_writer, " "); -WriteLiteralTo(@__razor_helper_writer, " class=\"ajaxLoading\" title=\"Loading...\">"); - - - -WriteLiteralTo(@__razor_helper_writer, "\r\n"); - +WriteLiteralTo(__razor_helper_writer, " class=\"fa fa-check fa-lg hidden ajaxOk\" title=\"Ok\">\r\n"); #line 9 "..\..\App_Code\AjaxHelpers.cshtml" + +#line default +#line hidden +}); + +#line 9 "..\..\App_Code\AjaxHelpers.cshtml" +} #line default #line hidden -}); - -} - - +#line 10 "..\..\App_Code\AjaxHelpers.cshtml" public static System.Web.WebPages.HelperResult AjaxSave() { +#line default +#line hidden return new System.Web.WebPages.HelperResult(__razor_helper_writer => { - - #line 11 "..\..\App_Code\AjaxHelpers.cshtml" + #line default #line hidden +WriteLiteralTo(__razor_helper_writer, "