Skip to content

Commit

Permalink
Merge pull request #7 from dss-web/ie10_fix
Browse files Browse the repository at this point in the history
IE10 fix
  • Loading branch information
evest committed Nov 19, 2015
2 parents e8fbb5c + 7092d75 commit 1c8400b
Show file tree
Hide file tree
Showing 20 changed files with 825 additions and 1,138 deletions.
2 changes: 2 additions & 0 deletions src/.nuget/NuGet.targets
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
<PackageSource Include="https://nuget.org/api/v2/" />
<PackageSource Include="https://my-nuget-source/nuget/" />
-->
<PackageSource Include="https://nuget.org/api/v2/" />
<PackageSource Include="http://nuget.episerver.com/feed/packages.svc/" />
</ItemGroup>

<PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\</OutputPath>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
Expand Down
2 changes: 1 addition & 1 deletion src/Newsletter.CommerceProvider/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="5.0.8" targetFramework="net45" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
<package id="structuremap.web-signed" version="3.1.6.186" targetFramework="net45" />
<package id="structuremap-signed" version="3.1.6.186" targetFramework="net45" />
<package id="structuremap.web-signed" version="3.1.6.186" targetFramework="net45" />
</packages>
184 changes: 91 additions & 93 deletions src/Newsletter.SendGrid/EPiCode.Newsletter.SendGrid.csproj
Original file line number Diff line number Diff line change
@@ -1,98 +1,96 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{DC95640C-908A-49B6-B460-2157586A5DA2}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>BVNetwork.EPiSendMail.SendGrid</RootNamespace>
<AssemblyName>BVNetwork.EPiSendMail.SendGrid</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="CsQuery, Version=1.3.3.249, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\CsQuery.1.3.4\lib\net40\CsQuery.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="PreMailer.Net, Version=1.2.7.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\PreMailer.Net.1.2.7\lib\net40\PreMailer.Net.dll</HintPath>
</Reference>
<Reference Include="SendGrid.SmtpApi">
<HintPath>..\packages\SendGrid.SmtpApi.1.2.1\lib\net40\SendGrid.SmtpApi.dll</HintPath>
</Reference>
<Reference Include="SendGridMail">
<HintPath>..\packages\Sendgrid.5.1.0\lib\SendGridMail.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Web" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Newsletter\AssemblyInfoVersion.cs">
<Link>AssemblyInfoVersion.cs</Link>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="MailSenderSendGrid.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Newsletter\EPiCode.Newsletter.csproj">
<Project>{e2ead191-5d74-4558-bca7-ca2686bb1759}</Project>
<Name>EPiCode.Newsletter</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="EPiCode.Newsletter.SendGrid.nuspec" />
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{DC95640C-908A-49B6-B460-2157586A5DA2}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>BVNetwork.EPiSendMail.SendGrid</RootNamespace>
<AssemblyName>BVNetwork.EPiSendMail.SendGrid</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="CsQuery, Version=1.3.3.249, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\CsQuery.1.3.4\lib\net40\CsQuery.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="PreMailer.Net, Version=1.2.7.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\PreMailer.Net.1.2.7\lib\net40\PreMailer.Net.dll</HintPath>
</Reference>
<Reference Include="SendGrid.SmtpApi">
<HintPath>..\packages\SendGrid.SmtpApi.1.2.1\lib\net40\SendGrid.SmtpApi.dll</HintPath>
</Reference>
<Reference Include="SendGridMail">
<HintPath>..\packages\Sendgrid.5.1.0\lib\SendGridMail.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Web" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Newsletter\AssemblyInfoVersion.cs">
<Link>AssemblyInfoVersion.cs</Link>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="MailSenderSendGrid.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Newsletter\EPiCode.Newsletter.csproj">
<Project>{e2ead191-5d74-4558-bca7-ca2686bb1759}</Project>
<Name>EPiCode.Newsletter</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="EPiCode.Newsletter.SendGrid.nuspec" />
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
</Target>

<!-- This holds the version of the package -->
<Import Project="$(SolutionDir)\packageVersion.targets" Condition="Exists('$(SolutionDir)\packageVersion.targets')" />
<!-- Pack -->
<Import Project="$(SolutionDir)\packageTools.targets" Condition="Exists('$(SolutionDir)\packageTools.targets')" />
<Target Name="CreateNugetPackage" AfterTargets="Build" Condition="'$(Configuration)' == 'Release' ">
<!-- Create the package -->
<Exec Command="$(NugetCommand)" />
</Target>

<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
</Target>
<!-- This holds the version of the package -->
<Import Project="$(SolutionDir)\packageVersion.targets" Condition="Exists('$(SolutionDir)\packageVersion.targets')" />
<!-- Pack -->
<Import Project="$(SolutionDir)\packageTools.targets" Condition="Exists('$(SolutionDir)\packageTools.targets')" />
<Target Name="CreateNugetPackage" AfterTargets="Build" Condition="'$(Configuration)' == 'Release' ">
<!-- Create the package -->
<Exec Command="$(NugetCommand)" />
</Target>
</Project>
32 changes: 32 additions & 0 deletions src/Newsletter/EPiCode.Newsletter.Core.nuspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>EPiCode.Newsletter.Core</id>
<version>$version$</version>
<authors>The EPiCode Community</authors>
<owners>BV Network AS</owners>
<projectUrl>https://github.com/BVNetwork/Newsletter</projectUrl>
<iconUrl>http://www.coderesort.com/favicon.ico</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Package contains assembly BVNetwork.EPiSendMail.dll.</description>
<summary>Sends pages as newsletters through the EPiServer UI.</summary>
<references>
<reference file="BVNetwork.EPiSendMail.dll" />
</references>

<dependencies>
<dependency id="PreMailer.Net" version="1.2.6" />
<dependency id="Microsoft.AspNet.WebApi" version="5.1.2" />
<dependency id="RestSharp" version="104.4.0" />
<dependency id="EPiServer.CMS.UI.Core" version="[9.0, 10.0)" />
<dependency id="EPiServer.Framework" version="[9.0, 10.0)" />
<dependency id="EPiServer.Logging.Log4Net" version="2.0.0" />
</dependencies>
</metadata>
<files>
<file src="bin\$configuration$\BVNetwork.EPiSendMail.dll"
target="lib\net45\BVNetwork.EPiSendMail.dll" />
<file src="bin\$configuration$\BVNetwork.EPiSendMail.dll"
target="lib\net451\BVNetwork.EPiSendMail.dll" />
</files>
</package>
37 changes: 20 additions & 17 deletions src/Newsletter/EPiCode.Newsletter.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,13 @@
<HintPath>..\packages\EPiServer.CMS.Core.9.0.0\lib\net45\EPiServer.XForms.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="log4net, Version=1.2.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
<Private>True</Private>
<HintPath>..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
Expand Down Expand Up @@ -218,47 +222,44 @@
<Private>True</Private>
</Reference>
<Reference Include="System.Net.Http.Formatting, Version=5.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.AspNet.WebApi.Client.5.1.2\lib\net45\System.Net.Http.Formatting.dll</HintPath>
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.1.2\lib\net45\System.Net.Http.Formatting.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Web">
<Name>System.Web</Name>
</Reference>
<Reference Include="System.Web.ApplicationServices" />
<Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll</HintPath>
<Private>True</Private>
<HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll</HintPath>
</Reference>
<Reference Include="System.Web.Http, Version=5.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.AspNet.WebApi.Core.5.1.2\lib\net45\System.Web.Http.dll</HintPath>
<HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.1.2\lib\net45\System.Web.Http.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Web.Http.WebHost, Version=5.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.AspNet.WebApi.WebHost.5.1.2\lib\net45\System.Web.Http.WebHost.dll</HintPath>
<HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.1.2\lib\net45\System.Web.Http.WebHost.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.Mvc.4.0.20710.0\lib\net40\System.Web.Mvc.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Private>False</Private>
<HintPath>..\packages\Microsoft.AspNet.Razor.2.0.20710.0\lib\net40\System.Web.Razor.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Private>False</Private>
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Private>False</Private>
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Private>False</Private>
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml">
Expand Down Expand Up @@ -692,6 +693,8 @@
<Content Include="lang\EPiCode.Newsletter.NO.xml" />
<EmbeddedResource Include="Tools\newsletter-validating-query-301.sql" />
<EmbeddedResource Include="Tools\newsletter-install-301.sql" />
<None Include="EPiCode.Newsletter.Core.nuspec" />
<None Include="packages.config" />
<None Include="Plugin\Newsletter.Master">
<SubType>ASPXCodeBehind</SubType>
</None>
Expand All @@ -701,7 +704,6 @@
<None Include="app.config" />
<None Include="EPiCode.Newsletter.nuspec" />
<None Include="module.config" />
<None Include="packages.config" />
<None Include="Views\Newsletter\Index.cshtml" />
<Content Include="Views\Web.config" />
</ItemGroup>
Expand Down Expand Up @@ -750,6 +752,7 @@
<ZipDirectory InputPath="$(TmpOutDir)\content" OutputFileName="$(OutDir)\$(ProjectName).zip" OverwriteExistingFile="true" />
<!-- Create the package -->
<Exec Command="$(NugetCommand)" />
<Exec Command="$(CoreNugetCommand)" />
<!-- Cleanup -->
<RemoveDir Directories="$(TmpOutDir)" />
</Target>
Expand Down
1 change: 0 additions & 1 deletion src/Newsletter/Plugin/Admin/NewsLetterInstall.aspx
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
type: 'POST'
})
.done(function (data) {
console.debug(data);
var html = $('#successTemplate').render(data.database);
$('#result').html(html);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
},
error: function (jqXHR, textStatus, errorThrown) {
console.debug(jqXHR, textStatus, errorThrown);
var data = {
warning: 'Failed to add recipients.',
message: errorThrown
Expand Down
1 change: 0 additions & 1 deletion src/Newsletter/Plugin/ItemProviders/RecipientProvider.ascx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
},
error: function (jqXHR, textStatus, errorThrown) {
console.debug(jqXHR, textStatus, errorThrown);
var data = {
warning: 'Failed to add recipients.',
message: errorThrown
Expand Down
1 change: 0 additions & 1 deletion src/Newsletter/Plugin/Jobs/JobEdit.ascx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
}
},
error: function (jqXHR, textStatus, errorThrown) {
console.debug(jqXHR, textStatus, errorThrown);
var data = {
warning: 'Failed to Send Newsletter',
message: errorThrown
Expand Down
Loading

0 comments on commit 1c8400b

Please sign in to comment.