Merge: Git pull from Github

This commit is contained in:
Rick Falkvinge
2014-10-21 07:40:26 +02:00
7 changed files with 21 additions and 5 deletions
+1 -1
View File
@@ -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);
+1 -1
View File
@@ -80,7 +80,7 @@
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
<PropertyGroup>
<PostBuildEvent>if $(ConfigurationName) == Release C:\Windows\Microsoft.NET\Framework\v4.0.30319\aspnet_compiler.exe -u -fixednames -v / -p ../../Site5 ../../Site5-Deployment/
<PostBuildEvent>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</PostBuildEvent>
</PropertyGroup>
</Project>
@@ -124,6 +124,10 @@
<data name="Europe" xml:space="preserve">
<value>Europe</value>
</data>
<data name="Microstates" xml:space="preserve">
<value>Microstates</value>
<comment>Like Monaco, San Marino, Andorra, Vatican City, etc.</comment>
</data>
<data name="Nordics" xml:space="preserve">
<value>Nordics</value>
<comment>(Finland Denmark Norway Sweden Iceland)</comment>
+12 -1
View File
@@ -641,7 +641,7 @@
<value>Conscripts</value>
</data>
<data name="Title_Conscript_Ship" xml:space="preserve">
<value>I HAVE NO IDEA WHAT THIS SHOULD BE - TODO</value>
<value>Conscripthood</value>
</data>
<data name="Title_Employee_Corps" xml:space="preserve">
<value>Staff</value>
@@ -681,39 +681,50 @@
</data>
<data name="Title_Regular_Corps" xml:space="preserve">
<value>Corps</value>
<comment>"Regular" in the military soldier sense, not "regular customer"</comment>
</data>
<data name="Title_Regular_Female" xml:space="preserve">
<value>Regular</value>
<comment>"Regular" in the military soldier sense, not "regular customer"</comment>
</data>
<data name="Title_Regular_Generic" xml:space="preserve">
<value>Regular</value>
<comment>"Regular" in the military soldier sense, not "regular customer"</comment>
</data>
<data name="Title_Regular_Male" xml:space="preserve">
<value>Regular</value>
<comment>"Regular" in the military soldier sense, not "regular customer"</comment>
</data>
<data name="Title_Regular_Plural" xml:space="preserve">
<value>Regulars</value>
<comment>"Regular" in the military soldier sense, not "regular customer"</comment>
</data>
<data name="Title_Regular_Ship" xml:space="preserve">
<value>Regularhood</value>
<comment>"Regular" in the military soldier sense, not "regular customer"</comment>
</data>
<data name="Title_Sailor_Corps" xml:space="preserve">
<value>Crew</value>
</data>
<data name="Title_Sailor_Female" xml:space="preserve">
<value>Seaman</value>
<comment>("Seaman" is a Navy rank, not a genderized title)</comment>
</data>
<data name="Title_Sailor_Generic" xml:space="preserve">
<value>Seaman</value>
<comment>("Seaman" is a Navy rank, not a genderized title)</comment>
</data>
<data name="Title_Sailor_Male" xml:space="preserve">
<value>Seaman</value>
<comment>("Seaman" is a Navy rank, not a genderized title)</comment>
</data>
<data name="Title_Sailor_Plural" xml:space="preserve">
<value>Seamen</value>
<comment>("Seaman" is a Navy rank, not a genderized title)</comment>
</data>
<data name="Title_Sailor_Ship" xml:space="preserve">
<value>Seamanship</value>
<comment>("Seaman" is a Navy rank, not a genderized title)</comment>
</data>
<data name="Global_Create" xml:space="preserve">
<value>Create</value>
@@ -121,7 +121,7 @@
<value>Access to this page was denied</value>
</data>
<data name="AccessDenied_Info" xml:space="preserve">
<value>You tried to access a page you don't have permissions for. See the main pane for some reaons this may have happened.</value>
<value>You tried to access a page you don't have permissions for. See the main panel for some reaons this may have happened.</value>
</data>
<data name="AccessDenied_PageTitle" xml:space="preserve">
<value>Access Denied</value>
@@ -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)
{
+1 -1
View File
@@ -1 +1 @@
Black 3
Black 4