From cc90591db75e1719cae3af34f5408e8dc729220e Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Tue, 14 Oct 2014 15:49:00 +0200 Subject: [PATCH 1/7] Added 'rebuild-all' switch to aspnet_compiler (troubleshooting) --- Interface/Interface.csproj | 2 +- Site5/SprintName.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/SprintName.txt b/Site5/SprintName.txt index 78eff60f..b667c9a5 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 From 78668516db57f1f562f92855544d704efcab5826 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Tue, 14 Oct 2014 16:10:10 +0200 Subject: [PATCH 2/7] A little on titles --- Site5/App_GlobalResources/Global.resx | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) 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 From 00160314d7ea9fb9af94b34fb5dc35e974525a25 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Tue, 14 Oct 2014 16:11:14 +0200 Subject: [PATCH 3/7] Spelling fix in resources --- Site5/App_GlobalResources/Pages.Security.resx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 91c688248c2305fcd8c69db95186e578537232d7 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Tue, 14 Oct 2014 17:07:35 +0200 Subject: [PATCH 4/7] Removed UTF8 BOM from SprintName.txt --- Site5/SprintName.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Site5/SprintName.txt b/Site5/SprintName.txt index b667c9a5..5f7f0182 100644 --- a/Site5/SprintName.txt +++ b/Site5/SprintName.txt @@ -1 +1 @@ -Black 4 \ No newline at end of file +Black 4 \ No newline at end of file From cc0665ceb143a6c551db32819b04b6ee5ef79e37 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Tue, 14 Oct 2014 17:07:52 +0200 Subject: [PATCH 5/7] Added DbVersionRequired to CreateOrg --- Site5/Pages/v5/Admin/CreateOrganization.aspx.cs | 1 + 1 file changed, 1 insertion(+) 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) { From 4b7a1a62b34a20cb0d16285bd60145332e355924 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Mon, 20 Oct 2014 10:41:12 +0200 Subject: [PATCH 6/7] More Geography Names --- Site5/App_GlobalResources/GeographyNames.resx | 4 ++++ 1 file changed, 4 insertions(+) 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) From 8632645dc5fd5906aabd0a0524566c2fddf13e5c Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Mon, 20 Oct 2014 10:49:35 +0200 Subject: [PATCH 7/7] Bad bad BAD bugfix in Database layer --- Database/Database-OutboundCommRecipients.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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);