Merge branch 'platform' of https://github.com/VirtoCommerce/vc-commun…

…ity.git
VirtoCommerce · Jun 9, 2016 · 6d789bb · 6d789bb
2 parents 7fdf4f4 + c563d79
commit 6d789bb
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 24 deletions.
diff --git a/VirtoCommerce.Platform.Client.Security/VirtoCommerce.Platform.Client.Security.nuspec b/VirtoCommerce.Platform.Client.Security/VirtoCommerce.Platform.Client.Security.nuspec
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<package >
+<package>
     <metadata>
         <id>$id$</id>
-        <version>2.11.0-rc1</version>
+        <version>2.11.0</version>
         <title>$title$</title>
         <authors>$author$</authors>
         <owners>$author$</owners>

diff --git a/VirtoCommerce.Platform.Client/VirtoCommerce.Platform.Client.nuspec b/VirtoCommerce.Platform.Client/VirtoCommerce.Platform.Client.nuspec
@@ -2,7 +2,7 @@
 <package>
     <metadata>
         <id>$id$</id>
-        <version>2.11.0-rc1</version>
+        <version>2.11.0</version>
         <title>$title$</title>
         <authors>$author$</authors>
         <owners>$author$</owners>

diff --git a/VirtoCommerce.Platform.Core.Web/VirtoCommerce.Platform.Core.Web.nuspec b/VirtoCommerce.Platform.Core.Web/VirtoCommerce.Platform.Core.Web.nuspec
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<package >
+<package>
     <metadata>
         <id>$id$</id>
-        <version>2.11.0-rc1</version>
+        <version>2.11.0</version>
         <title>$title$</title>
         <authors>$author$</authors>
         <owners>$author$</owners>

diff --git a/VirtoCommerce.Platform.Core/VirtoCommerce.Platform.Core.nuspec b/VirtoCommerce.Platform.Core/VirtoCommerce.Platform.Core.nuspec
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<package >
+<package>
     <metadata>
         <id>$id$</id>
-        <version>2.11.0-rc1</version>
+        <version>2.11.0</version>
         <title>$title$</title>
         <authors>$author$</authors>
         <owners>$author$</owners>

diff --git a/VirtoCommerce.Platform.Data.Azure/VirtoCommerce.Platform.Data.Azure.nuspec b/VirtoCommerce.Platform.Data.Azure/VirtoCommerce.Platform.Data.Azure.nuspec
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<package >
+<package>
     <metadata>
         <id>$id$</id>
-        <version>2.11.0-rc1</version>
+        <version>2.11.0</version>
         <title>$title$</title>
         <authors>$author$</authors>
         <owners>$author$</owners>

diff --git a/VirtoCommerce.Platform.Data.Notifications/VirtoCommerce.Platform.Data.Notifications.nuspec b/VirtoCommerce.Platform.Data.Notifications/VirtoCommerce.Platform.Data.Notifications.nuspec
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<package >
+<package>
     <metadata>
         <id>$id$</id>
-        <version>2.11.0-rc1</version>
+        <version>2.11.0</version>
         <title>$title$</title>
         <authors>$author$</authors>
         <owners>$author$</owners>

diff --git a/VirtoCommerce.Platform.Data.Security/VirtoCommerce.Platform.Data.Security.nuspec b/VirtoCommerce.Platform.Data.Security/VirtoCommerce.Platform.Data.Security.nuspec
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<package >
+<package>
     <metadata>
         <id>$id$</id>
-        <version>2.11.0-rc1</version>
+        <version>2.11.0</version>
         <title>$title$</title>
         <authors>$author$</authors>
         <owners>$author$</owners>

diff --git a/VirtoCommerce.Platform.Data.Serialization/VirtoCommerce.Platform.Data.Serialization.nuspec b/VirtoCommerce.Platform.Data.Serialization/VirtoCommerce.Platform.Data.Serialization.nuspec
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<package >
+<package>
     <metadata>
         <id>$id$</id>
-        <version>2.11.0-rc1</version>
+        <version>2.11.0</version>
         <title>$title$</title>
         <authors>$author$</authors>
         <owners>$author$</owners>

diff --git a/VirtoCommerce.Platform.Data/VirtoCommerce.Platform.Data.nuspec b/VirtoCommerce.Platform.Data/VirtoCommerce.Platform.Data.nuspec
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<package >
+<package>
     <metadata>
         <id>$id$</id>
-        <version>2.11.0-rc1</version>
+        <version>2.11.0</version>
         <title>$title$</title>
         <authors>$author$</authors>
         <owners>$author$</owners>

diff --git a/VirtoCommerce.Platform.Testing/VirtoCommerce.Platform.Testing.nuspec b/VirtoCommerce.Platform.Testing/VirtoCommerce.Platform.Testing.nuspec
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<package >
+<package>
     <metadata>
         <id>$id$</id>
-        <version>2.11.0-rc1</version>
+        <version>2.11.0</version>
         <title>$title$</title>
         <authors>$author$</authors>
         <owners>$author$</owners>

diff --git a/VirtoCommerce.Platform.Web/Scripts/app/modularity/blades/module-detail.tpl.html b/VirtoCommerce.Platform.Web/Scripts/app/modularity/blades/module-detail.tpl.html
@@ -17,7 +17,7 @@
 <div class="blade-content">
     <div class="blade-inner">
         <div class="inner-block">
-            <div ng-if="blade.mode === 'advanced'">
+            <div ng-if="blade.mode === 'advanced'" va-permission="platform:module:manage">
                 <div class="t __divider">{{ 'platform.blades.module-detail.labels.install-from-file' | translate }}</div>
                 <div class="form-group" ng-if="!blade.isLoading">
                     <label class="form-label">{{ 'platform.blades.module-detail.labels.select-module-file' | translate }}</label>

diff --git a/VirtoCommerce.Platform.Web/Web.config b/VirtoCommerce.Platform.Web/Web.config
@@ -25,10 +25,10 @@
     </nlog>
     <connectionStrings>
         <!-- Database Connection String -->
-		<add name="VirtoCommerce" connectionString="Data Source=(local);Initial Catalog=VirtoCommerce2;Persist Security Info=True;User ID=virto;Password=virto;MultipleActiveResultSets=True;Connect Timeout=420" providerName="System.Data.SqlClient" />
+        <add name="VirtoCommerce" connectionString="Data Source=(local);Initial Catalog=VirtoCommerce2;Persist Security Info=True;User ID=virto;Password=virto;MultipleActiveResultSets=True;Connect Timeout=420" providerName="System.Data.SqlClient" />
         <!-- Assets Connection String -->
         <!--<add name="AssetsConnectionString" connectionString="provider=AzureBlobStorage;DefaultEndpointsProtocol=https;AccountName=yourAccountName;AccountKey=yourAccountKey" />-->
-        <add name="AssetsConnectionString" connectionString="provider=LocalStorage;rootPath=~/App_Data/Assets;publicUrl=http://localhost/admin/assets" />       
+        <add name="AssetsConnectionString" connectionString="provider=LocalStorage;rootPath=~/App_Data/Assets;publicUrl=http://localhost/admin/assets" />
     </connectionStrings>
     <appSettings>
         <add key="vs:EnableBrowserLink" value="false" />
@@ -61,8 +61,8 @@
     <system.web>
         <compilation targetFramework="4.5.1" debug="true" />
         <!-- 50MB in kilobytes, default is 4096 or 4MB-->
-		<!-- fcnMode="Disabled" it will prevent your AppDomain restarting when a subdirectory is modified / added / deleted. Need for correct modularity working.-->
-		<httpRuntime targetFramework="4.5.1" maxRequestLength="512000"  fcnMode="Disabled"/>
+        <!-- fcnMode="Disabled" it will prevent your AppDomain restarting when a subdirectory is modified / added / deleted. Need for correct modularity working.-->
+        <httpRuntime targetFramework="4.5.1" maxRequestLength="512000"  fcnMode="Disabled"/>
         <customErrors mode="Off" />
         <pages>
             <namespaces>