diff --git a/Database/Database-OutboundCommRecipients.cs b/Database/Database-OutboundCommRecipients.cs index 5108da64..0ce8e88e 100644 --- a/Database/Database-OutboundCommRecipients.cs +++ b/Database/Database-OutboundCommRecipients.cs @@ -179,7 +179,7 @@ namespace Swarmops.Database DbCommand command = GetDbCommand("SetOutboundCommRecipientFailed", connection); command.CommandType = CommandType.StoredProcedure; - AddParameterWithName(command, "outboundCommId", outboundCommRecipientId); + AddParameterWithName(command, "outboundCommRecipientId", outboundCommRecipientId); AddParameterWithName(command, "dateTime", DateTime.UtcNow); AddParameterWithName(command, "failReason", failReason); diff --git a/Interface/Interface.csproj b/Interface/Interface.csproj index c23409fb..bbd87fef 100644 --- a/Interface/Interface.csproj +++ b/Interface/Interface.csproj @@ -80,7 +80,7 @@ - if $(ConfigurationName) == Release C:\Windows\Microsoft.NET\Framework\v4.0.30319\aspnet_compiler.exe -u -fixednames -v / -p ../../Site5 ../../Site5-Deployment/ + if $(ConfigurationName) == Release C:\Windows\Microsoft.NET\Framework\v4.0.30319\aspnet_compiler.exe -c -u -fixednames -v / -p ../../Site5 ../../Site5-Deployment/ if $(ConfigurationName) == Release "C:\Program Files (x86)\Microsoft SDKs\Windows\v8.0a\bin\NETFX 4.0 Tools\aspnet_merge.exe" ../../Site5-Deployment -o Swarmops.Site.dll \ No newline at end of file diff --git a/Site5/App_GlobalResources/GeographyNames.resx b/Site5/App_GlobalResources/GeographyNames.resx index 07d49408..790aba2e 100644 --- a/Site5/App_GlobalResources/GeographyNames.resx +++ b/Site5/App_GlobalResources/GeographyNames.resx @@ -124,6 +124,10 @@ Europe + + Microstates + Like Monaco, San Marino, Andorra, Vatican City, etc. + Nordics (Finland Denmark Norway Sweden Iceland) diff --git a/Site5/App_GlobalResources/Global.resx b/Site5/App_GlobalResources/Global.resx index 84808658..81fb3036 100644 --- a/Site5/App_GlobalResources/Global.resx +++ b/Site5/App_GlobalResources/Global.resx @@ -641,7 +641,7 @@ Conscripts - I HAVE NO IDEA WHAT THIS SHOULD BE - TODO + Conscripthood Staff @@ -681,39 +681,50 @@ Corps + "Regular" in the military soldier sense, not "regular customer" Regular + "Regular" in the military soldier sense, not "regular customer" Regular + "Regular" in the military soldier sense, not "regular customer" Regular + "Regular" in the military soldier sense, not "regular customer" Regulars + "Regular" in the military soldier sense, not "regular customer" Regularhood + "Regular" in the military soldier sense, not "regular customer" Crew Seaman + ("Seaman" is a Navy rank, not a genderized title) Seaman + ("Seaman" is a Navy rank, not a genderized title) Seaman + ("Seaman" is a Navy rank, not a genderized title) Seamen + ("Seaman" is a Navy rank, not a genderized title) Seamanship + ("Seaman" is a Navy rank, not a genderized title) Create diff --git a/Site5/App_GlobalResources/Pages.Security.resx b/Site5/App_GlobalResources/Pages.Security.resx index 560bb3e8..2d8e98ba 100644 --- a/Site5/App_GlobalResources/Pages.Security.resx +++ b/Site5/App_GlobalResources/Pages.Security.resx @@ -121,7 +121,7 @@ Access to this page was denied - You tried to access a page you don't have permissions for. See the main pane for some reaons this may have happened. + You tried to access a page you don't have permissions for. See the main panel for some reaons this may have happened. Access Denied diff --git a/Site5/Pages/v5/Admin/CreateOrganization.aspx.cs b/Site5/Pages/v5/Admin/CreateOrganization.aspx.cs index c0983ce5..d0a94bfc 100644 --- a/Site5/Pages/v5/Admin/CreateOrganization.aspx.cs +++ b/Site5/Pages/v5/Admin/CreateOrganization.aspx.cs @@ -15,6 +15,7 @@ namespace Swarmops.Frontend.Pages.v5.Admin this.PageTitle = Resources.Pages.Admin.CreateOrganization_PageTitle; this.PageIcon = "iconshock-organization-add"; this.InfoBoxLiteral = Resources.Pages.Admin.CreateOrganization_Info; + this.DbVersionRequired = 2; // for FinancialAccounts.Active field in Create function if (!Page.IsPostBack) { diff --git a/Site5/SprintName.txt b/Site5/SprintName.txt index 78eff60f..5f7f0182 100644 --- a/Site5/SprintName.txt +++ b/Site5/SprintName.txt @@ -1 +1 @@ -Black 3 \ No newline at end of file +Black 4 \ No newline at end of file