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

Commit 8774440

Browse files
author
Viet Anh Nguyen
committed
Merge branch 'develop'
2 parents 124daf4 + a0ff137 commit 8774440

File tree

35 files changed

+1133
-1154
lines changed

35 files changed

+1133
-1154
lines changed

‎Sources/AssemblyVersionAuto.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33

44

55
[assembly: AssemblyCopyright("Copyright ? 2020 Episerver")]
6-
[assembly: AssemblyVersion("13.18.1.0")]
7-
[assembly: AssemblyInformationalVersion("13.18.1")]
8-
[assembly: AssemblyFileVersion("13.18.1.4041")]
6+
[assembly: AssemblyVersion("13.22.0.0")]
7+
[assembly: AssemblyInformationalVersion("13.22.0")]
8+
[assembly: AssemblyFileVersion("13.22.0.4155")]

‎Sources/EPiServer.Reference.Commerce.Manager/App_Data/log/placeholder.txt‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Sources/EPiServer.Reference.Commerce.Manager/Apps/Order/Shipping/Tabs/ShippingMethodEditBaseTab.ascx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<asp:RequiredFieldValidator ID="rfName" runat="server" ErrorMessage="<%$ Resources:SharedStrings, Name_Required %>"
2323
Font-Size="9pt" Font-Names="verdana" Display="Dynamic" ControlToValidate="tbName" />
2424
<asp:RegularExpressionValidator runat="server" ID="revName" ControlToValidate="tbName" Display="Dynamic"
25-
ValidationExpression="^[a-zA-Z0-9\s]*$" ErrorMessage="<%$ Resources:SharedStrings, Latin_Symbols_Only %>" />
25+
ValidationExpression="^[a-zA-Z0-9_]*$" ErrorMessage="<%$ Resources:SharedStrings, Latin_Symbols_Only %>" />
2626
<asp:RegularExpressionValidator ID="regexTextBox1" Text="<%$ Resources:SharedStrings, Name_MaxLength %>"
2727
ControlToValidate="tbName" runat="server" ValidationExpression="^[\s\S]{0,100}$"
2828
Font-Size="9pt" Font-Names="verdana" Display="Dynamic"/>

‎Sources/EPiServer.Reference.Commerce.Manager/Apps/Shell/Pages/Login.aspx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<%@ Page Language="C#" AutoEventWireup="true" Inherits="Mediachase.Commerce.Manager.Login" CodeBehind="Login.aspx.cs" %>
1+
<%@ Page Language="C#" AutoEventWireup="true" Inherits="EPiServer.Reference.Commerce.Manager.Login" CodeBehind="Login.aspx.cs" %>
22

33
<%@ Import Namespace="Mediachase.Commerce.Shared" %>
44
<script runat="server">

‎Sources/EPiServer.Reference.Commerce.Manager/Apps/Shell/Pages/Logout.aspx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<%@ Page Language="C#" AutoEventWireup="true" Inherits="Mediachase.Commerce.Manager.Logout" Codebehind="Logout.aspx.cs" %>
1+
<%@ Page Language="C#" AutoEventWireup="true" Inherits="EPiServer.Reference.Commerce.Manager.Logout" Codebehind="Logout.aspx.cs" %>
22
<%@ Import Namespace="Mediachase.Commerce.Shared" %>
33

44
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

‎Sources/EPiServer.Reference.Commerce.Manager/Configs/baf.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<BusinessFoundationSettings filterExpressionDefaultProvider="MetaDataProvider">
33
<Connection connectionStringName="EcfSqlConnection" />
44
<!--MetaUI configurations-->

‎Sources/EPiServer.Reference.Commerce.Manager/Configs/ecf.order.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<OrderAddressClass name="OrderGroupAddressEx" />
2121
</MetaClasses>
2222
<Connections confConnectionStringName="EcfSqlConnection" transConnectionStringName="EcfSqlConnection" />
23-
<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" />
23+
<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" />
2424
<Roles>
2525
<add name="OrderSupervisorRole" value="Order Supervisor" />
2626
<add name="OrderManagerRole" value="Order Manager" />

‎Sources/EPiServer.Reference.Commerce.Manager/EPiServer.Reference.Commerce.Manager.csproj‎

Lines changed: 136 additions & 108 deletions
Large diffs are not rendered by default.

‎Sources/EPiServer.Reference.Commerce.Manager/packages.config‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AuthorizeNet" version="1.9.4" targetFramework="net462" />
4-
<package id="Castle.Core" version="4.2.1" targetFramework="net462" />
5-
<package id="Castle.Windsor" version="4.1.0" targetFramework="net462" />
6-
<package id="EntityFramework" version="6.1.3" targetFramework="net462" />
7-
<package id="EPiServer.CMS.AspNet" version="11.14.1" targetFramework="net462" />
8-
<package id="EPiServer.CMS.Core" version="11.14.1" targetFramework="net462" />
9-
<package id="EPiServer.CMS.UI.AspNetIdentity" version="11.23.3" targetFramework="net462" />
10-
<package id="EPiServer.CMS.UI.Core" version="11.23.3" targetFramework="net462" />
11-
<package id="EPiServer.Commerce.Core" version="13.18.1" targetFramework="net462" />
12-
<package id="EPiServer.CommerceManager" version="13.18.1" targetFramework="net462" />
13-
<package id="EPiServer.Framework" version="11.14.1" targetFramework="net462" />
14-
<package id="EPiServer.Framework.AspNet" version="11.14.1" targetFramework="net462" />
15-
<package id="EPiServer.Logging.Log4Net" version="2.2.2" targetFramework="net462" />
16-
<package id="EPiServer.ServiceLocation.StructureMap" version="2.0.2" targetFramework="net462" />
17-
<package id="log4net" version="2.0.8" targetFramework="net462" />
18-
<package id="Lucene.Net" version="3.0.3" targetFramework="net462" />
19-
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net462" />
20-
<package id="Microsoft.AspNet.Identity.EntityFramework" version="2.2.1" targetFramework="net462" />
21-
<package id="Microsoft.AspNet.Identity.Owin" version="2.2.1" targetFramework="net462" />
22-
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net462" />
23-
<package id="Microsoft.AspNet.Providers.Core" version="2.0.0" targetFramework="net462" />
24-
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net462" />
25-
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net462" />
26-
<package id="Microsoft.Owin" version="3.1.0" targetFramework="net462" />
27-
<package id="Microsoft.Owin.Host.SystemWeb" version="3.1.0" targetFramework="net462" />
28-
<package id="Microsoft.Owin.Security" version="3.1.0" targetFramework="net462" />
29-
<package id="Microsoft.Owin.Security.Cookies" version="3.1.0" targetFramework="net462" />
30-
<package id="Microsoft.Owin.Security.OAuth" version="3.1.0" targetFramework="net462" />
31-
<package id="Microsoft.ReportViewer.Common" version="10.0.40219.1" targetFramework="net462" />
32-
<package id="Microsoft.ReportViewer.WebForms" version="10.0.40219.1" targetFramework="net462" />
33-
<package id="Microsoft.Tpl.Dataflow" version="4.5.24" targetFramework="net462" />
34-
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net462" />
35-
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net462" />
36-
<package id="Owin" version="1.0" targetFramework="net462" />
37-
<package id="SharpZipLib" version="0.86.0" targetFramework="net462" />
38-
<package id="StructureMap" version="4.5.2" targetFramework="net462" />
39-
<package id="structuremap.web" version="4.0.0.315" targetFramework="net462" />
40-
<package id="System.ComponentModel.Annotations" version="4.4.0" targetFramework="net462" />
41-
<package id="System.Data.SqlClient" version="4.4.0" targetFramework="net462" />
42-
<package id="System.Reflection.Emit" version="4.3.0" targetFramework="net462" />
43-
<package id="System.Reflection.Emit.Lightweight" version="4.3.0" targetFramework="net462" />
44-
<package id="System.Security.AccessControl" version="4.4.0" targetFramework="net462" />
45-
<package id="System.Security.Cryptography.Xml" version="4.4.2" targetFramework="net462" />
46-
<package id="System.Security.Permissions" version="4.4.0" targetFramework="net462" />
47-
<package id="System.Security.Principal.Windows" version="4.4.0" targetFramework="net462" />
48-
<package id="System.Threading.AccessControl" version="4.4.0" targetFramework="net462" />
49-
<package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
50-
</packages>
3+
<package id="AuthorizeNet" version="1.9.4" targetFramework="net461" />
4+
<package id="Castle.Core" version="4.2.1" targetFramework="net461" />
5+
<package id="Castle.Windsor" version="4.1.0" targetFramework="net461" />
6+
<package id="EntityFramework" version="6.1.3" targetFramework="net461" />
7+
<package id="EPiServer.CMS.AspNet" version="11.17.0" targetFramework="net461" />
8+
<package id="EPiServer.CMS.Core" version="11.17.0" targetFramework="net461" />
9+
<package id="EPiServer.CMS.UI.AspNetIdentity" version="11.25.0" targetFramework="net461" />
10+
<package id="EPiServer.CMS.UI.Core" version="11.25.0" targetFramework="net461" />
11+
<package id="EPiServer.Framework" version="11.17.0" targetFramework="net461" />
12+
<package id="EPiServer.Framework.AspNet" version="11.17.0" targetFramework="net461" />
13+
<package id="EPiServer.Logging.Log4Net" version="2.2.2" targetFramework="net461" />
14+
<package id="EPiServer.ServiceLocation.StructureMap" version="2.0.2" targetFramework="net461" />
15+
<package id="log4net" version="2.0.8" targetFramework="net461" />
16+
<package id="Lucene.Net" version="3.0.3" targetFramework="net461" />
17+
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net461" />
18+
<package id="Microsoft.AspNet.Identity.EntityFramework" version="2.2.1" targetFramework="net461" />
19+
<package id="Microsoft.AspNet.Identity.Owin" version="2.2.1" targetFramework="net461" />
20+
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net461" />
21+
<package id="Microsoft.AspNet.Providers.Core" version="2.0.0" targetFramework="net461" />
22+
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net461" />
23+
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net461" />
24+
<package id="Microsoft.Owin" version="3.1.0" targetFramework="net461" />
25+
<package id="Microsoft.Owin.Host.SystemWeb" version="3.1.0" targetFramework="net461" />
26+
<package id="Microsoft.Owin.Security" version="3.1.0" targetFramework="net461" />
27+
<package id="Microsoft.Owin.Security.Cookies" version="3.1.0" targetFramework="net461" />
28+
<package id="Microsoft.Owin.Security.OAuth" version="3.1.0" targetFramework="net461" />
29+
<package id="Microsoft.ReportViewer.Common" version="10.0.40219.1" targetFramework="net461" />
30+
<package id="Microsoft.ReportViewer.WebForms" version="10.0.40219.1" targetFramework="net461" />
31+
<package id="Microsoft.Tpl.Dataflow" version="4.5.24" targetFramework="net461" />
32+
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net461" />
33+
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
34+
<package id="Owin" version="1.0" targetFramework="net461" />
35+
<package id="SharpZipLib" version="0.86.0" targetFramework="net461" />
36+
<package id="StructureMap" version="4.5.2" targetFramework="net461" />
37+
<package id="structuremap.web" version="4.0.0.315" targetFramework="net461" />
38+
<package id="System.ComponentModel.Annotations" version="4.4.0" targetFramework="net461" />
39+
<package id="System.Data.SqlClient" version="4.4.0" targetFramework="net461" />
40+
<package id="System.Reflection.Emit" version="4.3.0" targetFramework="net461" />
41+
<package id="System.Reflection.Emit.Lightweight" version="4.3.0" targetFramework="net461" />
42+
<package id="System.Security.AccessControl" version="4.4.0" targetFramework="net461" />
43+
<package id="System.Security.Cryptography.Xml" version="4.4.2" targetFramework="net461" />
44+
<package id="System.Security.Permissions" version="4.4.0" targetFramework="net461" />
45+
<package id="System.Security.Principal.Windows" version="4.4.0" targetFramework="net461" />
46+
<package id="System.Threading.AccessControl" version="4.4.0" targetFramework="net461" />
47+
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
48+
<package id="EPiServer.Commerce.Core" version="13.22.0" targetFramework="net461"/>
49+
<package id="EPiServer.CommerceManager" version="13.22.0" targetFramework="net461"/>
50+
</packages>

0 commit comments

Comments
 (0)