From c3fc6a89b4a7c241a8c90735da6c549dffd66cd1 Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Fri, 20 Mar 2015 08:12:39 -0400
Subject: [PATCH 1/5] Added tag build-2.1.0.619 for changeset d28e1fc01cb8


From 2c68edf657d3c4c7516ec0066ee94e78911493e7 Mon Sep 17 00:00:00 2001
From: me <devnull@localhost>
Date: Sun, 22 Mar 2015 21:18:23 +0400
Subject: [PATCH 2/5] wsp-10323 Fix build settings

---
 .../WebsitePanel.Providers.Virtualization.HyperV2012R2.csproj   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/WebsitePanel.Providers.Virtualization.HyperV2012R2.csproj b/WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/WebsitePanel.Providers.Virtualization.HyperV2012R2.csproj
index 635edce5..d89e8c59 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/WebsitePanel.Providers.Virtualization.HyperV2012R2.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/WebsitePanel.Providers.Virtualization.HyperV2012R2.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\WebsitePanel.Server\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

From 1c4039445b0900562aa41efc930fea8dcde2f56f Mon Sep 17 00:00:00 2001
From: dev_amdtel <devnull@localhost>
Date: Sun, 22 Mar 2015 20:49:38 +0300
Subject: [PATCH 3/5] wsp-10323 Fix build settings

---
 .../WebsitePanel.Providers.Virtualization.HyperV2012R2.csproj   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/WebsitePanel.Providers.Virtualization.HyperV2012R2.csproj b/WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/WebsitePanel.Providers.Virtualization.HyperV2012R2.csproj
index d89e8c59..65ec14ae 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/WebsitePanel.Providers.Virtualization.HyperV2012R2.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/WebsitePanel.Providers.Virtualization.HyperV2012R2.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\WebsitePanel.Server\bin\</OutputPath>
+    <OutputPath>..\WebsitePanel.Server\bin\HyperV2012R2\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

From 9b32591f2412e899f306da4d44e3d8d0f6a7596e Mon Sep 17 00:00:00 2001
From: dev_amdtel <devnull@localhost>
Date: Sun, 22 Mar 2015 21:14:05 +0300
Subject: [PATCH 4/5] renamed CRM resource group

---
 .../Servers/ResourceGroups.cs                                | 2 +-
 .../WebsitePanel_SharedResources.ascx.resx                   | 5 +++--
 .../App_LocalResources/OrganizationMenu.ascx.resx            | 2 +-
 .../App_LocalResources/UserOrganization.ascx.resx            | 4 ++--
 .../App_LocalResources/OrganizationHome.ascx.resx            | 4 ++--
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Servers/ResourceGroups.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Servers/ResourceGroups.cs
index 4f9b1d21..b7a6cca0 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Servers/ResourceGroups.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Servers/ResourceGroups.cs
@@ -47,7 +47,7 @@ namespace WebsitePanel.EnterpriseServer
 		public const string HostedSharePoint = "Hosted SharePoint";
 		public const string Exchange = "Exchange";
         public const string HostedOrganizations = "Hosted Organizations";
-        public const string HostedCRM = "Hosted CRM";
+        public const string HostedCRM = "Hosted CRM"; // CRM 4/2011
         public const string HostedCRM2013 = "Hosted CRM2013"; // CRM 2013/2015
         public const string VPS = "VPS";
         public const string BlackBerry = "BlackBerry";
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
index 396529e1..6aa175d2 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
@@ -3338,7 +3338,8 @@
     <value>Hosted Organizations</value>
   </data>
   <data name="ResourceGroup.Hosted CRM" xml:space="preserve">
-    <value>Hosted CRM</value>
+    <value>CRM 4/2011</value>
+    <comment> </comment>
   </data>
   <data name="ResourceGroup.BlackBerry" xml:space="preserve">
     <value>BlackBerry</value>
@@ -5444,7 +5445,7 @@
     <value>ESS licenses per organization</value>
   </data>
   <data name="ResourceGroup.Hosted CRM2013" xml:space="preserve">
-    <value>Hosted CRM 2013/2015</value>
+    <value>CRM 2013/2015</value>
   </data>
   <data name="HostedCRM.USER_QUOTA_HAS_BEEN_REACHED2013_0" xml:space="preserve">
     <value>CRM users quota (Professional license) has been reached.</value>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/OrganizationMenu.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/OrganizationMenu.ascx.resx
index 13b0668d..e00296b4 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/OrganizationMenu.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/OrganizationMenu.ascx.resx
@@ -133,7 +133,7 @@
     <value>Contacts</value>
   </data>
   <data name="Text.CRMGroup" xml:space="preserve">
-    <value>CRM</value>
+    <value>CRM 4/2011</value>
   </data>
   <data name="Text.CRMOrganization" xml:space="preserve">
     <value>CRM Organization</value>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserOrganization.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserOrganization.ascx.resx
index e8f5dcb6..9a815be7 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserOrganization.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserOrganization.ascx.resx
@@ -151,10 +151,10 @@
     <value>Contacts</value>
   </data>
   <data name="Text.CRM2013Group" xml:space="preserve">
-    <value>Hosted Organization - CRM 2013/2015</value>
+    <value>CRM 2013/2015</value>
   </data>
   <data name="Text.CRMGroup" xml:space="preserve">
-    <value>Hosted Organization - CRM</value>
+    <value>CRM 4/2011</value>
   </data>
   <data name="Text.CRMOrganization" xml:space="preserve">
     <value>CRM Organization</value>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/OrganizationHome.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/OrganizationHome.ascx.resx
index f71acc7e..7b71c51e 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/OrganizationHome.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/OrganizationHome.ascx.resx
@@ -181,7 +181,7 @@
     <value>BlackBerry</value>
   </data>
   <data name="locCRM.Text" xml:space="preserve">
-    <value>CRM</value>
+    <value>CRM 4/2011</value>
   </data>
   <data name="locExchangeStatistics.Text" xml:space="preserve">
     <value>Exchange</value>
@@ -227,7 +227,7 @@
   </data>
   <data name="locRemoteDesktop.Text" xml:space="preserve">
     <value>Remote Desktop</value>
-  </data>  
+  </data>
   <data name="lnkRdsServers.Text" xml:space="preserve">
     <value>RDS Servers</value>
   </data>

From 9c17eb9c7486d11273c3059a403edc249e076229 Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Sun, 22 Mar 2015 14:45:58 -0400
Subject: [PATCH 5/5] Added tag build-2.1.0.620 for changeset 1b976062ded2