zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
vfedosevich 2015-03-23 03:04:05 -07:00
commit e8b5e9ec40
6 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Servers/ResourceGroups.cs
View file

@ -48,7 +48,7 @@ namespace WebsitePanel.EnterpriseServer
public const string SharepointServer = "Sharepoint Server";
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";

2
WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/WebsitePanel.Providers.Virtualization.HyperV2012R2.csproj
View file

@ -26,7 +26,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<OutputPath>..\WebsitePanel.Server\bin\HyperV2012R2\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>

5
WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
View file

@ -3344,7 +3344,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>
@ -5465,7 +5466,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>

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/OrganizationMenu.ascx.resx
View file

@ -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>

4
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserOrganization.ascx.resx
View file

@ -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>

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/OrganizationHome.ascx.resx
View file

@ -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>