Skip to content
This repository has been archived by the owner on Aug 17, 2021. It is now read-only.

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Viet Anh Nguyen committed Jul 31, 2020
2 parents 124daf4 + a0ff137 commit 8774440
Show file tree
Hide file tree
Showing 35 changed files with 1,133 additions and 1,154 deletions.
6 changes: 3 additions & 3 deletions Sources/AssemblyVersionAuto.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@


[assembly: AssemblyCopyright("Copyright ? 2020 Episerver")]
[assembly: AssemblyVersion("13.18.1.0")]
[assembly: AssemblyInformationalVersion("13.18.1")]
[assembly: AssemblyFileVersion("13.18.1.4041")]
[assembly: AssemblyVersion("13.22.0.0")]
[assembly: AssemblyInformationalVersion("13.22.0")]
[assembly: AssemblyFileVersion("13.22.0.4155")]
1 change: 0 additions & 1 deletion Sources/EPiServer.Reference.Commerce.Manager/App_Data/log/placeholder.txt
View file

This file was deleted.

2 changes: 1 addition & 1 deletion ...Server.Reference.Commerce.Manager/Apps/Order/Shipping/Tabs/ShippingMethodEditBaseTab.ascx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<asp:RequiredFieldValidator ID="rfName" runat="server" ErrorMessage="<%$ Resources:SharedStrings, Name_Required %>"
Font-Size="9pt" Font-Names="verdana" Display="Dynamic" ControlToValidate="tbName" />
<asp:RegularExpressionValidator runat="server" ID="revName" ControlToValidate="tbName" Display="Dynamic"
ValidationExpression="^[a-zA-Z0-9\s]*$" ErrorMessage="<%$ Resources:SharedStrings, Latin_Symbols_Only %>" />
ValidationExpression="^[a-zA-Z0-9_]*$" ErrorMessage="<%$ Resources:SharedStrings, Latin_Symbols_Only %>" />
<asp:RegularExpressionValidator ID="regexTextBox1" Text="<%$ Resources:SharedStrings, Name_MaxLength %>"
ControlToValidate="tbName" runat="server" ValidationExpression="^[\s\S]{0,100}$"
Font-Size="9pt" Font-Names="verdana" Display="Dynamic"/>
Expand Down
2 changes: 1 addition & 1 deletion Sources/EPiServer.Reference.Commerce.Manager/Apps/Shell/Pages/Login.aspx
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<%@ Page Language="C#" AutoEventWireup="true" Inherits="Mediachase.Commerce.Manager.Login" CodeBehind="Login.aspx.cs" %>
<%@ Page Language="C#" AutoEventWireup="true" Inherits="EPiServer.Reference.Commerce.Manager.Login" CodeBehind="Login.aspx.cs" %>

<%@ Import Namespace="Mediachase.Commerce.Shared" %>
<script runat="server">
Expand Down
2 changes: 1 addition & 1 deletion Sources/EPiServer.Reference.Commerce.Manager/Apps/Shell/Pages/Logout.aspx
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<%@ Page Language="C#" AutoEventWireup="true" Inherits="Mediachase.Commerce.Manager.Logout" Codebehind="Logout.aspx.cs" %>
<%@ Page Language="C#" AutoEventWireup="true" Inherits="EPiServer.Reference.Commerce.Manager.Logout" Codebehind="Logout.aspx.cs" %>
<%@ Import Namespace="Mediachase.Commerce.Shared" %>

<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
Expand Down
2 changes: 1 addition & 1 deletion Sources/EPiServer.Reference.Commerce.Manager/Configs/baf.config
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<BusinessFoundationSettings filterExpressionDefaultProvider="MetaDataProvider">
<Connection connectionStringName="EcfSqlConnection" />
<!--MetaUI configurations-->
Expand Down
2 changes: 1 addition & 1 deletion Sources/EPiServer.Reference.Commerce.Manager/Configs/ecf.order.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<OrderAddressClass name="OrderGroupAddressEx" />
</MetaClasses>
<Connections confConnectionStringName="EcfSqlConnection" transConnectionStringName="EcfSqlConnection" />
<Cache enabled="true" shippingCollectionTimeout="0:0:10" paymentCollectionTimeout="0:0:10" statusCollectionTimeout="0:0:10" countryCollectionTimeout="1:0:0" taxCollectionTimeout="1:0:0" jurisdictionCollectionTimeout="1:0:0" pickListCollectionTimeout="0:0:10" />
<Cache enabled="true" shippingCollectionTimeout="1.0:0:0" paymentCollectionTimeout="1.0:0:0" statusCollectionTimeout="0:0:10" countryCollectionTimeout="1:0:0" taxCollectionTimeout="1:0:0" jurisdictionCollectionTimeout="1:0:0" pickListCollectionTimeout="0:0:10" />
<Roles>
<add name="OrderSupervisorRole" value="Order Supervisor" />
<add name="OrderManagerRole" value="Order Manager" />
Expand Down
244 changes: 136 additions & 108 deletions Sources/EPiServer.Reference.Commerce.Manager/EPiServer.Reference.Commerce.Manager.csproj
View file

Large diffs are not rendered by default.

98 changes: 49 additions & 49 deletions Sources/EPiServer.Reference.Commerce.Manager/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,50 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AuthorizeNet" version="1.9.4" targetFramework="net462" />
<package id="Castle.Core" version="4.2.1" targetFramework="net462" />
<package id="Castle.Windsor" version="4.1.0" targetFramework="net462" />
<package id="EntityFramework" version="6.1.3" targetFramework="net462" />
<package id="EPiServer.CMS.AspNet" version="11.14.1" targetFramework="net462" />
<package id="EPiServer.CMS.Core" version="11.14.1" targetFramework="net462" />
<package id="EPiServer.CMS.UI.AspNetIdentity" version="11.23.3" targetFramework="net462" />
<package id="EPiServer.CMS.UI.Core" version="11.23.3" targetFramework="net462" />
<package id="EPiServer.Commerce.Core" version="13.18.1" targetFramework="net462" />
<package id="EPiServer.CommerceManager" version="13.18.1" targetFramework="net462" />
<package id="EPiServer.Framework" version="11.14.1" targetFramework="net462" />
<package id="EPiServer.Framework.AspNet" version="11.14.1" targetFramework="net462" />
<package id="EPiServer.Logging.Log4Net" version="2.2.2" targetFramework="net462" />
<package id="EPiServer.ServiceLocation.StructureMap" version="2.0.2" targetFramework="net462" />
<package id="log4net" version="2.0.8" targetFramework="net462" />
<package id="Lucene.Net" version="3.0.3" targetFramework="net462" />
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net462" />
<package id="Microsoft.AspNet.Identity.EntityFramework" version="2.2.1" targetFramework="net462" />
<package id="Microsoft.AspNet.Identity.Owin" version="2.2.1" targetFramework="net462" />
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net462" />
<package id="Microsoft.AspNet.Providers.Core" version="2.0.0" targetFramework="net462" />
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net462" />
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net462" />
<package id="Microsoft.Owin" version="3.1.0" targetFramework="net462" />
<package id="Microsoft.Owin.Host.SystemWeb" version="3.1.0" targetFramework="net462" />
<package id="Microsoft.Owin.Security" version="3.1.0" targetFramework="net462" />
<package id="Microsoft.Owin.Security.Cookies" version="3.1.0" targetFramework="net462" />
<package id="Microsoft.Owin.Security.OAuth" version="3.1.0" targetFramework="net462" />
<package id="Microsoft.ReportViewer.Common" version="10.0.40219.1" targetFramework="net462" />
<package id="Microsoft.ReportViewer.WebForms" version="10.0.40219.1" targetFramework="net462" />
<package id="Microsoft.Tpl.Dataflow" version="4.5.24" targetFramework="net462" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net462" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net462" />
<package id="Owin" version="1.0" targetFramework="net462" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net462" />
<package id="StructureMap" version="4.5.2" targetFramework="net462" />
<package id="structuremap.web" version="4.0.0.315" targetFramework="net462" />
<package id="System.ComponentModel.Annotations" version="4.4.0" targetFramework="net462" />
<package id="System.Data.SqlClient" version="4.4.0" targetFramework="net462" />
<package id="System.Reflection.Emit" version="4.3.0" targetFramework="net462" />
<package id="System.Reflection.Emit.Lightweight" version="4.3.0" targetFramework="net462" />
<package id="System.Security.AccessControl" version="4.4.0" targetFramework="net462" />
<package id="System.Security.Cryptography.Xml" version="4.4.2" targetFramework="net462" />
<package id="System.Security.Permissions" version="4.4.0" targetFramework="net462" />
<package id="System.Security.Principal.Windows" version="4.4.0" targetFramework="net462" />
<package id="System.Threading.AccessControl" version="4.4.0" targetFramework="net462" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
</packages>
<package id="AuthorizeNet" version="1.9.4" targetFramework="net461" />
<package id="Castle.Core" version="4.2.1" targetFramework="net461" />
<package id="Castle.Windsor" version="4.1.0" targetFramework="net461" />
<package id="EntityFramework" version="6.1.3" targetFramework="net461" />
<package id="EPiServer.CMS.AspNet" version="11.17.0" targetFramework="net461" />
<package id="EPiServer.CMS.Core" version="11.17.0" targetFramework="net461" />
<package id="EPiServer.CMS.UI.AspNetIdentity" version="11.25.0" targetFramework="net461" />
<package id="EPiServer.CMS.UI.Core" version="11.25.0" targetFramework="net461" />
<package id="EPiServer.Framework" version="11.17.0" targetFramework="net461" />
<package id="EPiServer.Framework.AspNet" version="11.17.0" targetFramework="net461" />
<package id="EPiServer.Logging.Log4Net" version="2.2.2" targetFramework="net461" />
<package id="EPiServer.ServiceLocation.StructureMap" version="2.0.2" targetFramework="net461" />
<package id="log4net" version="2.0.8" targetFramework="net461" />
<package id="Lucene.Net" version="3.0.3" targetFramework="net461" />
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net461" />
<package id="Microsoft.AspNet.Identity.EntityFramework" version="2.2.1" targetFramework="net461" />
<package id="Microsoft.AspNet.Identity.Owin" version="2.2.1" targetFramework="net461" />
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net461" />
<package id="Microsoft.AspNet.Providers.Core" version="2.0.0" targetFramework="net461" />
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net461" />
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net461" />
<package id="Microsoft.Owin" version="3.1.0" targetFramework="net461" />
<package id="Microsoft.Owin.Host.SystemWeb" version="3.1.0" targetFramework="net461" />
<package id="Microsoft.Owin.Security" version="3.1.0" targetFramework="net461" />
<package id="Microsoft.Owin.Security.Cookies" version="3.1.0" targetFramework="net461" />
<package id="Microsoft.Owin.Security.OAuth" version="3.1.0" targetFramework="net461" />
<package id="Microsoft.ReportViewer.Common" version="10.0.40219.1" targetFramework="net461" />
<package id="Microsoft.ReportViewer.WebForms" version="10.0.40219.1" targetFramework="net461" />
<package id="Microsoft.Tpl.Dataflow" version="4.5.24" targetFramework="net461" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net461" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
<package id="Owin" version="1.0" targetFramework="net461" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net461" />
<package id="StructureMap" version="4.5.2" targetFramework="net461" />
<package id="structuremap.web" version="4.0.0.315" targetFramework="net461" />
<package id="System.ComponentModel.Annotations" version="4.4.0" targetFramework="net461" />
<package id="System.Data.SqlClient" version="4.4.0" targetFramework="net461" />
<package id="System.Reflection.Emit" version="4.3.0" targetFramework="net461" />
<package id="System.Reflection.Emit.Lightweight" version="4.3.0" targetFramework="net461" />
<package id="System.Security.AccessControl" version="4.4.0" targetFramework="net461" />
<package id="System.Security.Cryptography.Xml" version="4.4.2" targetFramework="net461" />
<package id="System.Security.Permissions" version="4.4.0" targetFramework="net461" />
<package id="System.Security.Principal.Windows" version="4.4.0" targetFramework="net461" />
<package id="System.Threading.AccessControl" version="4.4.0" targetFramework="net461" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
<package id="EPiServer.Commerce.Core" version="13.22.0" targetFramework="net461"/>
<package id="EPiServer.CommerceManager" version="13.22.0" targetFramework="net461"/>
</packages>
Loading

0 comments on commit 8774440

Please sign in to comment.