Skip to content

SMTP without authentication, workaround touch API, use store theme settings for mail styling #1503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Sep 24, 2018
+14 −13
Merged

SMTP without authentication, workaround touch API, use store theme settings for mail styling #1503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
02a27cd
Allow SMTP connection without authentication
Sep 13, 2018
e959911
Workaround for touch enabled devices and mouse interaction
Sep 13, 2018
9a13c00
Use current store theme settings for e-mail styling
Sep 13, 2018
c3926ad
Fix build.bat to reference existing solution file
Sep 13, 2018
7c74d97
Allow SMTP connection without authentication
muratcakir Sep 14, 2018
53bc18e
Changes to offcanvas closer;
Sep 15, 2018
27b13d1
Merge branch '3.x' of https://github.com/rhinterndorfer/SmartStoreNET…
Sep 15, 2018
2eccf6a
Merge remote-tracking branch 'upstream/3.x' into 3.x
Sep 17, 2018
b1770bf
Remove closer; Change tap event on canvas-blocker to click;
Sep 17, 2018
62dca24
Revert "Use current store theme settings for e-mail styling"
Sep 21, 2018
ea8b3a1
Merge branch '3.x' of https://github.com/smartstoreag/SmartStoreNET i…
Sep 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ echo "Unable to detect suitable MsBuild version (15.0). Build may not succeed."
cd /d %~dp0

echo "Restoring NuGet packages"
lib\nuget\nuget.exe restore "src\SmartStoreNET.Full-sym.sln"
lib\nuget\nuget.exe restore "src\SmartStoreNET.sln"

call "!MsBuildPath!" SmartStoreNET.proj /p:SlnName=SmartStoreNET /m /p:DebugSymbols=false /p:DebugType=None /maxcpucount %*
3 changes: 2 additions & 1 deletion src/Libraries/SmartStore.Core/Email/SmtpContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ public SmtpClient ToSmtpClient()
}
else
{
smtpClient.Credentials = new NetworkCredential(this.Username, this.Password);
if (!String.IsNullOrEmpty(this.Username))
smtpClient.Credentials = new NetworkCredential(this.Username, this.Password);
}

return smtpClient;
Expand Down
2 changes: 1 addition & 1 deletion src/Presentation/SmartStore.Web/Scripts/smartstore.offcanvas.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
});

if (this.options.autohide) {
$('body, .canvas-blocker').on('tap', $.proxy(this.autohide, this));
$('body, .canvas-blocker').on('click', $.proxy(this.autohide, this));
}

if (this.options.toggle) {
Expand Down
16 changes: 8 additions & 8 deletions src/Presentation/SmartStore.Web/Views/Catalog/Partials/OffCanvasMenu.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@

<div class="offcanvas-menu-header offcanvas-tabs">
<ul class="nav nav-tabs nav-tabs-line row no-gutters" role="tablist">
@if (ViewBag.ShowCategories == true)
{
<li class="nav-item col">
<a id="category-tab" class="nav-link" data-toggle="tab" href="#ocm-categories" role="tab" data-initialized="false">
<span class="title">@T("Offcanvas.Menu.Categories")</span>
</a>
</li>
}
@if (ViewBag.ShowCategories == true)
{
<li class="nav-item col">
<a id="category-tab" class="nav-link" data-toggle="tab" href="#ocm-categories" role="tab" data-initialized="false">
<span class="title">@T("Offcanvas.Menu.Categories")</span>
</a>
</li>
}
@if (ViewBag.ShowManufacturers == true)
{
<li class="nav-item col">
Expand Down
4 changes: 2 additions & 2 deletions src/Presentation/SmartStore.Web/Views/ShoppingCart/Partials/OffCanvasCart.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<div class="offcanvas-cart-header offcanvas-tabs">
<ul class="nav nav-tabs nav-tabs-line row no-gutters" role="tablist">
@if (Model.ShoppingCartEnabled)
@if (Model.ShoppingCartEnabled)
{
<li class="nav-item col">
<a id="cart-tab" class="nav-link" data-toggle="tab" href="#occ-cart" role="tab" data-url="@Url.Action("OffCanvasShoppingCart", "ShoppingCart")">
Expand All @@ -28,7 +28,7 @@
</li>
}

@if (Model.CompareProductsEnabled)
@if (Model.CompareProductsEnabled)
{
<li class="nav-item col">
<a id="compare-tab" class="nav-link" data-toggle="tab" href="#occ-compare" role="tab" data-url="@Url.Action("OffCanvasCompare", "Catalog")">
Expand Down