Files
Orchard/src/Orchard.Web/Modules/Orchard.ContentPicker/Orchard.ContentPicker.csproj

252 lines
12 KiB
XML
Raw Normal View History

2015-12-15 11:55:23 +00:00
<?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')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{F301EF7D-F19C-4D83-AA94-CB64F29C037D}</ProjectGuid>
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Orchard.ContentPicker</RootNamespace>
<AssemblyName>Orchard.ContentPicker</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
2015-12-15 11:55:23 +00:00
<MvcBuildViews>false</MvcBuildViews>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>4.0</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<TargetFrameworkProfile />
<UseIISExpress>false</UseIISExpress>
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
</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>
<CodeAnalysisRuleSet>..\..\..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
<LangVersion>5</LangVersion>
2015-12-15 11:55:23 +00:00
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
<LangVersion>5</LangVersion>
2015-12-15 11:55:23 +00:00
</PropertyGroup>
<ItemGroup>
<Reference Include="Iesi.Collections, Version=4.0.0.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll</HintPath>
2015-12-15 11:55:23 +00:00
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.CSharp" />
<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>
</Reference>
<Reference Include="NHibernate, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Web.ApplicationServices" />
<Reference Include="System.Web.DynamicData" />
<Reference Include="System.Web.Entity" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Web" />
2015-12-15 11:55:23 +00:00
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Xml" />
<Reference Include="System.Configuration" />
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup>
Implements ContentPicker localization options discussed in #7352 (#7391) * Squashed commit of the following: commit bd1e2bf3d386a1d6f12a5d062639929a17ba6c46 Author: matteo.piovanelli <matteo.piovanelli@laser-group.com> Date: Thu Nov 10 12:02:09 2016 +0100 Added notifications about what the localization methods for ContentPickerField will do or have done. commit 04eb7074dcfef2c8beb65f0322821dc654902cfb Author: matteo.piovanelli <matteo.piovanelli@laser-group.com> Date: Wed Nov 9 17:48:59 2016 +0100 Added the TryTranslate option and its suboptions commit fad9fa87f3f3a8c555d088e8971dd04a337cf4dc Author: matteo.piovanelli <matteo.piovanelli@laser-group.com> Date: Wed Nov 9 15:31:44 2016 +0100 Added a new feature to the ContentPicker module. So far, it stops saving/publication when the items in the ContentPickerField are the "wrong" culture commit b90629dc3e2fe5092d247ef24bb5c49f2c9ba066 Merge: 578b21b c486355 Author: matteo.piovanelli <matteo.piovanelli@laser-group.com> Date: Tue Nov 8 09:37:30 2016 +0100 Merge remote-tracking branch 'remotes/OrchardCMS.Orchard/1.10.x' into Laser/1.10.x commit 578b21b75ec4ad0ac7ee0808fd254ea3ee4dfa8d Merge: 395976f 3c53ffb Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Nov 4 13:45:51 2016 +0100 Merge branch 'feature/6688_RequestTokens_Chaintext' into Laser/1.10.x commit 3c53ffb09a923c5eccf571f4f8be68c76de10d1f Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Nov 4 13:43:38 2016 +0100 - replaced Regex.Replace with String.Trim(char[]) as suggested - ran Orchard.Tokens.Tests: 66/66 passed commit 395976fa60828e574563416d8e060ba23c628672 Merge: 708ed79 a15557e Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Oct 28 16:34:50 2016 +0200 Merge branch 'Laser/1.10.x' of https://github.com/LaserSrl/Orchard into Laser/1.10.x commit 708ed79ccb5a6b1075bd0c22c2f58d92d5032ee1 Merge: 5fe0b69 68acf26 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Oct 28 16:32:52 2016 +0200 Merge branch '1.10.x' of https://github.com/LaserSrl/Orchard into Laser/1.10.x commit 5fe0b69c6bc904a29debc93f8a175a6bf23d899d Merge: 0daad70 e3a7059 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Oct 28 16:32:31 2016 +0200 Merge branch 'feature/6196_SupportForAttachments' into Laser/1.10.x commit e3a7059edf212b6bffcafe2076f3da45487d0260 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Oct 28 15:22:48 2016 +0200 - Addition of an existing png (OrchardLogo.png) as attachment within "Test Smtp Settings" Section, in order to demonstrate functionality of support for attachments in email commit f095dea5e5ecbf7a7f62bf03895d4a78f430c90b Merge: 7b09747 68acf26 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Oct 28 12:37:55 2016 +0200 Merge remote-tracking branch 'remotes/OrchardCMS.Orchard/1.10.x' into feature/6688_RequestTokens_Chaintext commit a15557e5f3f23b59d3a1b1aa1b520942a3127bd4 Merge: 0daad70 ce8a61e Author: matteo.piovanelli <matteo.piovanelli@laser-group.com> Date: Thu Oct 27 17:10:53 2016 +0200 Merge branch 'issues/7346_WidgetsViewQueryString' into Laser/1.10.x commit 0daad702192b6286714f29212dc8fee50e76542f Merge: 927d18b 7b09747 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Thu Oct 27 09:07:58 2016 +0200 Merge remote-tracking branch 'remotes/Laser.Orchard/feature/6688_RequestTokens_Chaintext' into 1.10.x commit 7b09747fc9eaea71f653365e81d00cf2d82e964d Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Thu Oct 27 09:05:17 2016 +0200 inserted a better explanation on how to use the chains commit 927d18b1c2b81cf69e5b33ce46c503f5e6b183e2 Merge: f8cbc63 17ebdd2 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Wed Oct 26 19:00:44 2016 +0200 Merge remote-tracking branch 'remotes/Laser.Orchard/feature/6688_RequestTokens_Chaintext' into 1.10.x commit 17ebdd2bfc53c7028aa71d36443b11942ac2a320 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Wed Oct 26 18:57:48 2016 +0200 - typo commit f8cbc63fc03fda1bc47209a1849a1e287d698c4f Merge: 9f42664 1b511b2 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Wed Oct 26 18:53:11 2016 +0200 Merge branch 'feature/6688_RequestTokens_Chaintext' into 1.10.x commit 1b511b2692d1890b658b13f9dfd32f5caca3da09 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Wed Oct 26 18:50:35 2016 +0200 - Implement what described in #6688 Supported Syntaxes for Request and Form tokens are: 1. QueryString:(param1) or Form:(param1) 2. QueryString:param1 or Form:param1 3. QueryString:(param1).SomeOtherTextToken or Form:(param1).SomeOtherTextToken If you want to Chain TextTokens you have to use the 3rd syntax the element (here param1) has been surrounded with brackets in order to preserve backward compatibility. commit ce8a61ed86f66a50c67adce24c6d84440cc61787 Author: matteo.piovanelli <matteo.piovanelli@laser-group.com> Date: Wed Oct 26 11:46:24 2016 +0200 Fixes #7346 commit 9f4266401a9c06bc8426c73055a6b5257c7b15bb Merge: 60aa1cc f6cfe32 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Tue Oct 25 09:20:57 2016 +0200 Merge branch '1.10.x' of https://github.com/LaserSrl/Orchard into 1.10.x commit 60aa1cc2f4f45a06de6a4416eeb9f0726697d11e Merge: c1b1c4d 7a16cf5 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Tue Oct 25 09:20:28 2016 +0200 Merge branch '1.10.x' of https://github.com/OrchardCMS/Orchard into 1.10.x commit c1b1c4dc06b6c941f5f7eced5a81ed30bd5d66fa Merge: bf2201c e50bd60 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Tue Oct 25 09:19:54 2016 +0200 Merge remote-tracking branch 'remotes/Laser.Orchard/feature/6196_SupportForAttachments' into 1.10.x commit e50bd607b7f8e4047bf2a2c58fd31cf626aa198e Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Tue Oct 25 09:18:24 2016 +0200 - Formatted Code (Rebracer) commit f6cfe324b1a393b1b4b192577ed5211f91f8285c Merge: 7a16cf5 bf2201c Author: matteo.piovanelli <matteo.piovanelli@laser-group.com> Date: Mon Oct 24 09:24:57 2016 +0200 Merge remote-tracking branch 'remotes/Laser.Orchard/1.10.x' into 1.10.x Ho fatto pull della 1.10 remota di Orchard commit bf2201c2a9a05fcdc9467eca8023a7209c0b6298 Merge: 67af300 580b79c Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Oct 21 18:40:21 2016 +0200 Merge branch 'feature/6196_SupportForAttachments' into 1.10.x # Conflicts: # src/Orchard.Web/Modules/Orchard.Email/Services/SmtpMessageChannel.cs commit 580b79c24db2da9b7d97039b4fd6db03412fb5c6 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Oct 21 11:46:08 2016 +0200 - Added attachments logic commit 67af300783983bd823f059bfaf91b7975157ab81 Merge: d4d4a32 a4c816b Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Oct 21 11:56:13 2016 +0200 Merge branch 'feature/6196_SupportForAttachments' into 1.10.x commit a4c816b29180dde88964e9d55207efd73de4d561 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Oct 21 11:55:38 2016 +0200 - missing Attachments Key fix commit d4d4a322bc432198068c6c96ad8b4768ca8af7d0 Merge: 297e586 2bb81ee Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Oct 21 11:46:40 2016 +0200 Merge branch 'feature/6196_SupportForAttachments' into 1.10.x commit 2bb81eef31b092c8f78b19d9e8f21300d32cf3ba Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Oct 21 11:46:08 2016 +0200 - Added attachments logic commit 297e586a19853f709e66691ad390adfced23807a Merge: 54a1bdf 548b5d7 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Oct 21 09:39:11 2016 +0200 Merge branch 'feature/5790_partecipate_in_cache_key_generation' into 1.10.x commit 548b5d7d8fd95982cc04adc42272152ec327d1c0 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Oct 21 09:37:07 2016 +0200 - Method renamed - try catch removed commit 54a1bdf03aba22032c4cfbd7e56a3f924d426f2e Merge: b7ee130 794b9b0 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Wed Oct 19 17:51:29 2016 +0200 Merge remote-tracking branch 'remotes/Laser.Orchard/feature/5790_partecipate_in_cache_key_generation' into 1.10.x commit 794b9b025227339f6cf840c58b54ea5d4cd1eb0e Merge: 1dcee8a 350cbbd Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Wed Oct 19 17:44:35 2016 +0200 Merge branch 'feature/5790_partecipate_in_cache_key_generation' of https://github.com/LaserSrl/Orchard into feature/5790_partecipate_in_cache_key_generation commit 1dcee8aae85741975c6589664acbfd80f92514f8 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Wed Oct 19 16:30:12 2016 +0200 - typo chaching > caching - added EventHandler in order to partecipate in cachekey generation commit 350cbbd183414a41cf0886967c918d9482e47fea Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Wed Oct 19 17:40:58 2016 +0200 - typo chaching > caching commit b7ee130847b44df2c5fde8469e73ddc061f5ed19 Merge: c9e14f9 58e59e2 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Wed Oct 19 16:32:13 2016 +0200 Merge remote-tracking branch 'remotes/Laser.Orchard/feature/5790_partecipate_in_cache_key_generation' into 1.10.x commit 58e59e2fca8d9d672d45dee661e11b9a7616dc19 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Wed Oct 19 16:30:12 2016 +0200 - added EventHandler in order to partecipate in cachekey generation commit c9e14f9b82c05f96bb6cef494099103aacf7758b Author: matteo.piovanelli <matteo.piovanelli@laser-group.com> Date: Mon Oct 17 12:54:53 2016 +0200 Modified the OutputCache Module based on the enhancement proposed in Issue 5811, by adding a VaryByRequestCookies property to the CacheSettingsPart to enable the generation of the Cache Key based on cookies * Changed the view as reccomended by @sebastienros in his comments * Added culture information to the contentpickerfield editor view * Fixed a bug in the handler (!= instead of ==) * showing displaytext in warnings and notifications rather than content item's id * Cleanup. I ContentPickerFieldLocalizationDriver Editor methods are executed correctly on validation errors, so they load the additional javascript correctly
2016-11-17 21:47:58 +01:00
<Compile Include="Drivers\ContentPickerFieldLocalizationDriver.cs" />
<Compile Include="Handlers\ContentPickerFieldLocalizationExtensionHandler.cs" />
<Compile Include="Settings\ContentPickerFieldLocalizationEditorEvents.cs" />
<Compile Include="Settings\ContentPickerFieldLocalizationSettings.cs" />
2015-12-15 11:55:23 +00:00
<Compile Include="ViewModels\NavigationPartViewModel.cs" />
<Content Include="Scripts\ContentPicker.js" />
<Content Include="Scripts\SelectableContentTab.js" />
<Content Include="Styles\content-picker-admin.css" />
<Content Include="Styles\ContentPicker.css" />
<Content Include="Styles\Images\move.gif" />
<Content Include="Web.config" />
<Content Include="Scripts\Web.config" />
<Content Include="Styles\Web.config" />
<Compile Include="Drivers\ContentMenuItemPartDriver.cs" />
<Compile Include="Drivers\NavigationPartDriver.cs" />
<Compile Include="Handlers\ContentMenuItemPartHandler.cs" />
<Compile Include="Handlers\NavigationPartHandler.cs" />
<Compile Include="Migrations.cs" />
<Compile Include="Models\ContentMenuItemPart.cs" />
<Compile Include="Models\ContentMenuItemPartRecord.cs" />
<Compile Include="Models\NavigationPart.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Content Include="Module.txt" />
</ItemGroup>
<ItemGroup>
<Folder Include="Views\Admin\" />
</ItemGroup>
<ItemGroup>
<Compile Include="Controllers\AdminController.cs" />
<Compile Include="Drivers\ContentPickerFieldDriver.cs" />
<Compile Include="Fields\ContentPickerField.cs" />
<Compile Include="Handlers\ContentPickerFieldHandler.cs" />
<Compile Include="ResourceManifest.cs" />
<Compile Include="Security\ContentMenuItemAuthorizationEventHandler.cs" />
<Compile Include="Services\ContentPickerNavigationProvider.cs" />
<Compile Include="Services\ContentPickerShapes.cs" />
<Compile Include="Settings\ContentPickerFieldEditorEvents.cs" />
<Compile Include="Settings\ContentPickerFieldSettings.cs" />
<Compile Include="Tokens\FieldTokens.cs" />
<Compile Include="ViewModels\ContentMenuItemEditViewModel.cs" />
<Compile Include="ViewModels\ContentPickerFieldViewModel.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\ContentPicker.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\RecentContentTab.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\ContentPicker.SummaryAdmin.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\DefinitionTemplates\ContentPickerFieldSettings.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\EditorTemplates\Fields\ContentPicker.Edit.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\Fields\ContentPicker.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\Fields\ContentPicker.SummaryAdmin.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Placement.info">
<SubType>Designer</SubType>
</Content>
</ItemGroup>
<ItemGroup>
<Content Include="Views\MenuItemLink-ContentMenuItem.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\EditorTemplates\Parts.ContentMenuItem.Edit.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\EditorTemplates\Parts.Navigation.Edit.cshtml" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
<Project>{2d1d92bb-4555-4cbe-8d0e-63563d6ce4c6}</Project>
<Name>Orchard.Framework</Name>
<Private>$(MvcBuildViews)</Private>
2015-12-15 11:55:23 +00:00
</ProjectReference>
<ProjectReference Include="..\..\Core\Orchard.Core.csproj">
<Project>{9916839c-39fc-4ceb-a5af-89ca7e87119f}</Project>
<Name>Orchard.Core</Name>
<Private>$(MvcBuildViews)</Private>
2015-12-15 11:55:23 +00:00
</ProjectReference>
Implements ContentPicker localization options discussed in #7352 (#7391) * Squashed commit of the following: commit bd1e2bf3d386a1d6f12a5d062639929a17ba6c46 Author: matteo.piovanelli <matteo.piovanelli@laser-group.com> Date: Thu Nov 10 12:02:09 2016 +0100 Added notifications about what the localization methods for ContentPickerField will do or have done. commit 04eb7074dcfef2c8beb65f0322821dc654902cfb Author: matteo.piovanelli <matteo.piovanelli@laser-group.com> Date: Wed Nov 9 17:48:59 2016 +0100 Added the TryTranslate option and its suboptions commit fad9fa87f3f3a8c555d088e8971dd04a337cf4dc Author: matteo.piovanelli <matteo.piovanelli@laser-group.com> Date: Wed Nov 9 15:31:44 2016 +0100 Added a new feature to the ContentPicker module. So far, it stops saving/publication when the items in the ContentPickerField are the "wrong" culture commit b90629dc3e2fe5092d247ef24bb5c49f2c9ba066 Merge: 578b21b c486355 Author: matteo.piovanelli <matteo.piovanelli@laser-group.com> Date: Tue Nov 8 09:37:30 2016 +0100 Merge remote-tracking branch 'remotes/OrchardCMS.Orchard/1.10.x' into Laser/1.10.x commit 578b21b75ec4ad0ac7ee0808fd254ea3ee4dfa8d Merge: 395976f 3c53ffb Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Nov 4 13:45:51 2016 +0100 Merge branch 'feature/6688_RequestTokens_Chaintext' into Laser/1.10.x commit 3c53ffb09a923c5eccf571f4f8be68c76de10d1f Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Nov 4 13:43:38 2016 +0100 - replaced Regex.Replace with String.Trim(char[]) as suggested - ran Orchard.Tokens.Tests: 66/66 passed commit 395976fa60828e574563416d8e060ba23c628672 Merge: 708ed79 a15557e Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Oct 28 16:34:50 2016 +0200 Merge branch 'Laser/1.10.x' of https://github.com/LaserSrl/Orchard into Laser/1.10.x commit 708ed79ccb5a6b1075bd0c22c2f58d92d5032ee1 Merge: 5fe0b69 68acf26 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Oct 28 16:32:52 2016 +0200 Merge branch '1.10.x' of https://github.com/LaserSrl/Orchard into Laser/1.10.x commit 5fe0b69c6bc904a29debc93f8a175a6bf23d899d Merge: 0daad70 e3a7059 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Oct 28 16:32:31 2016 +0200 Merge branch 'feature/6196_SupportForAttachments' into Laser/1.10.x commit e3a7059edf212b6bffcafe2076f3da45487d0260 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Oct 28 15:22:48 2016 +0200 - Addition of an existing png (OrchardLogo.png) as attachment within "Test Smtp Settings" Section, in order to demonstrate functionality of support for attachments in email commit f095dea5e5ecbf7a7f62bf03895d4a78f430c90b Merge: 7b09747 68acf26 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Oct 28 12:37:55 2016 +0200 Merge remote-tracking branch 'remotes/OrchardCMS.Orchard/1.10.x' into feature/6688_RequestTokens_Chaintext commit a15557e5f3f23b59d3a1b1aa1b520942a3127bd4 Merge: 0daad70 ce8a61e Author: matteo.piovanelli <matteo.piovanelli@laser-group.com> Date: Thu Oct 27 17:10:53 2016 +0200 Merge branch 'issues/7346_WidgetsViewQueryString' into Laser/1.10.x commit 0daad702192b6286714f29212dc8fee50e76542f Merge: 927d18b 7b09747 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Thu Oct 27 09:07:58 2016 +0200 Merge remote-tracking branch 'remotes/Laser.Orchard/feature/6688_RequestTokens_Chaintext' into 1.10.x commit 7b09747fc9eaea71f653365e81d00cf2d82e964d Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Thu Oct 27 09:05:17 2016 +0200 inserted a better explanation on how to use the chains commit 927d18b1c2b81cf69e5b33ce46c503f5e6b183e2 Merge: f8cbc63 17ebdd2 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Wed Oct 26 19:00:44 2016 +0200 Merge remote-tracking branch 'remotes/Laser.Orchard/feature/6688_RequestTokens_Chaintext' into 1.10.x commit 17ebdd2bfc53c7028aa71d36443b11942ac2a320 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Wed Oct 26 18:57:48 2016 +0200 - typo commit f8cbc63fc03fda1bc47209a1849a1e287d698c4f Merge: 9f42664 1b511b2 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Wed Oct 26 18:53:11 2016 +0200 Merge branch 'feature/6688_RequestTokens_Chaintext' into 1.10.x commit 1b511b2692d1890b658b13f9dfd32f5caca3da09 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Wed Oct 26 18:50:35 2016 +0200 - Implement what described in #6688 Supported Syntaxes for Request and Form tokens are: 1. QueryString:(param1) or Form:(param1) 2. QueryString:param1 or Form:param1 3. QueryString:(param1).SomeOtherTextToken or Form:(param1).SomeOtherTextToken If you want to Chain TextTokens you have to use the 3rd syntax the element (here param1) has been surrounded with brackets in order to preserve backward compatibility. commit ce8a61ed86f66a50c67adce24c6d84440cc61787 Author: matteo.piovanelli <matteo.piovanelli@laser-group.com> Date: Wed Oct 26 11:46:24 2016 +0200 Fixes #7346 commit 9f4266401a9c06bc8426c73055a6b5257c7b15bb Merge: 60aa1cc f6cfe32 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Tue Oct 25 09:20:57 2016 +0200 Merge branch '1.10.x' of https://github.com/LaserSrl/Orchard into 1.10.x commit 60aa1cc2f4f45a06de6a4416eeb9f0726697d11e Merge: c1b1c4d 7a16cf5 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Tue Oct 25 09:20:28 2016 +0200 Merge branch '1.10.x' of https://github.com/OrchardCMS/Orchard into 1.10.x commit c1b1c4dc06b6c941f5f7eced5a81ed30bd5d66fa Merge: bf2201c e50bd60 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Tue Oct 25 09:19:54 2016 +0200 Merge remote-tracking branch 'remotes/Laser.Orchard/feature/6196_SupportForAttachments' into 1.10.x commit e50bd607b7f8e4047bf2a2c58fd31cf626aa198e Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Tue Oct 25 09:18:24 2016 +0200 - Formatted Code (Rebracer) commit f6cfe324b1a393b1b4b192577ed5211f91f8285c Merge: 7a16cf5 bf2201c Author: matteo.piovanelli <matteo.piovanelli@laser-group.com> Date: Mon Oct 24 09:24:57 2016 +0200 Merge remote-tracking branch 'remotes/Laser.Orchard/1.10.x' into 1.10.x Ho fatto pull della 1.10 remota di Orchard commit bf2201c2a9a05fcdc9467eca8023a7209c0b6298 Merge: 67af300 580b79c Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Oct 21 18:40:21 2016 +0200 Merge branch 'feature/6196_SupportForAttachments' into 1.10.x # Conflicts: # src/Orchard.Web/Modules/Orchard.Email/Services/SmtpMessageChannel.cs commit 580b79c24db2da9b7d97039b4fd6db03412fb5c6 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Oct 21 11:46:08 2016 +0200 - Added attachments logic commit 67af300783983bd823f059bfaf91b7975157ab81 Merge: d4d4a32 a4c816b Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Oct 21 11:56:13 2016 +0200 Merge branch 'feature/6196_SupportForAttachments' into 1.10.x commit a4c816b29180dde88964e9d55207efd73de4d561 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Oct 21 11:55:38 2016 +0200 - missing Attachments Key fix commit d4d4a322bc432198068c6c96ad8b4768ca8af7d0 Merge: 297e586 2bb81ee Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Oct 21 11:46:40 2016 +0200 Merge branch 'feature/6196_SupportForAttachments' into 1.10.x commit 2bb81eef31b092c8f78b19d9e8f21300d32cf3ba Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Oct 21 11:46:08 2016 +0200 - Added attachments logic commit 297e586a19853f709e66691ad390adfced23807a Merge: 54a1bdf 548b5d7 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Oct 21 09:39:11 2016 +0200 Merge branch 'feature/5790_partecipate_in_cache_key_generation' into 1.10.x commit 548b5d7d8fd95982cc04adc42272152ec327d1c0 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Oct 21 09:37:07 2016 +0200 - Method renamed - try catch removed commit 54a1bdf03aba22032c4cfbd7e56a3f924d426f2e Merge: b7ee130 794b9b0 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Wed Oct 19 17:51:29 2016 +0200 Merge remote-tracking branch 'remotes/Laser.Orchard/feature/5790_partecipate_in_cache_key_generation' into 1.10.x commit 794b9b025227339f6cf840c58b54ea5d4cd1eb0e Merge: 1dcee8a 350cbbd Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Wed Oct 19 17:44:35 2016 +0200 Merge branch 'feature/5790_partecipate_in_cache_key_generation' of https://github.com/LaserSrl/Orchard into feature/5790_partecipate_in_cache_key_generation commit 1dcee8aae85741975c6589664acbfd80f92514f8 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Wed Oct 19 16:30:12 2016 +0200 - typo chaching > caching - added EventHandler in order to partecipate in cachekey generation commit 350cbbd183414a41cf0886967c918d9482e47fea Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Wed Oct 19 17:40:58 2016 +0200 - typo chaching > caching commit b7ee130847b44df2c5fde8469e73ddc061f5ed19 Merge: c9e14f9 58e59e2 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Wed Oct 19 16:32:13 2016 +0200 Merge remote-tracking branch 'remotes/Laser.Orchard/feature/5790_partecipate_in_cache_key_generation' into 1.10.x commit 58e59e2fca8d9d672d45dee661e11b9a7616dc19 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Wed Oct 19 16:30:12 2016 +0200 - added EventHandler in order to partecipate in cachekey generation commit c9e14f9b82c05f96bb6cef494099103aacf7758b Author: matteo.piovanelli <matteo.piovanelli@laser-group.com> Date: Mon Oct 17 12:54:53 2016 +0200 Modified the OutputCache Module based on the enhancement proposed in Issue 5811, by adding a VaryByRequestCookies property to the CacheSettingsPart to enable the generation of the Cache Key based on cookies * Changed the view as reccomended by @sebastienros in his comments * Added culture information to the contentpickerfield editor view * Fixed a bug in the handler (!= instead of ==) * showing displaytext in warnings and notifications rather than content item's id * Cleanup. I ContentPickerFieldLocalizationDriver Editor methods are executed correctly on validation errors, so they load the additional javascript correctly
2016-11-17 21:47:58 +01:00
<ProjectReference Include="..\Orchard.Localization\Orchard.Localization.csproj">
<Project>{fbc8b571-ed50-49d8-8d9d-64ab7454a0d6}</Project>
<Name>Orchard.Localization</Name>
</ProjectReference>
2015-12-15 11:55:23 +00:00
</ItemGroup>
<ItemGroup>
<Content Include="Views\ContentPicker.Edit.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="packages.config" />
</ItemGroup>
Implements ContentPicker localization options discussed in #7352 (#7391) * Squashed commit of the following: commit bd1e2bf3d386a1d6f12a5d062639929a17ba6c46 Author: matteo.piovanelli <matteo.piovanelli@laser-group.com> Date: Thu Nov 10 12:02:09 2016 +0100 Added notifications about what the localization methods for ContentPickerField will do or have done. commit 04eb7074dcfef2c8beb65f0322821dc654902cfb Author: matteo.piovanelli <matteo.piovanelli@laser-group.com> Date: Wed Nov 9 17:48:59 2016 +0100 Added the TryTranslate option and its suboptions commit fad9fa87f3f3a8c555d088e8971dd04a337cf4dc Author: matteo.piovanelli <matteo.piovanelli@laser-group.com> Date: Wed Nov 9 15:31:44 2016 +0100 Added a new feature to the ContentPicker module. So far, it stops saving/publication when the items in the ContentPickerField are the "wrong" culture commit b90629dc3e2fe5092d247ef24bb5c49f2c9ba066 Merge: 578b21b c486355 Author: matteo.piovanelli <matteo.piovanelli@laser-group.com> Date: Tue Nov 8 09:37:30 2016 +0100 Merge remote-tracking branch 'remotes/OrchardCMS.Orchard/1.10.x' into Laser/1.10.x commit 578b21b75ec4ad0ac7ee0808fd254ea3ee4dfa8d Merge: 395976f 3c53ffb Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Nov 4 13:45:51 2016 +0100 Merge branch 'feature/6688_RequestTokens_Chaintext' into Laser/1.10.x commit 3c53ffb09a923c5eccf571f4f8be68c76de10d1f Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Nov 4 13:43:38 2016 +0100 - replaced Regex.Replace with String.Trim(char[]) as suggested - ran Orchard.Tokens.Tests: 66/66 passed commit 395976fa60828e574563416d8e060ba23c628672 Merge: 708ed79 a15557e Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Oct 28 16:34:50 2016 +0200 Merge branch 'Laser/1.10.x' of https://github.com/LaserSrl/Orchard into Laser/1.10.x commit 708ed79ccb5a6b1075bd0c22c2f58d92d5032ee1 Merge: 5fe0b69 68acf26 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Oct 28 16:32:52 2016 +0200 Merge branch '1.10.x' of https://github.com/LaserSrl/Orchard into Laser/1.10.x commit 5fe0b69c6bc904a29debc93f8a175a6bf23d899d Merge: 0daad70 e3a7059 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Oct 28 16:32:31 2016 +0200 Merge branch 'feature/6196_SupportForAttachments' into Laser/1.10.x commit e3a7059edf212b6bffcafe2076f3da45487d0260 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Oct 28 15:22:48 2016 +0200 - Addition of an existing png (OrchardLogo.png) as attachment within "Test Smtp Settings" Section, in order to demonstrate functionality of support for attachments in email commit f095dea5e5ecbf7a7f62bf03895d4a78f430c90b Merge: 7b09747 68acf26 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Oct 28 12:37:55 2016 +0200 Merge remote-tracking branch 'remotes/OrchardCMS.Orchard/1.10.x' into feature/6688_RequestTokens_Chaintext commit a15557e5f3f23b59d3a1b1aa1b520942a3127bd4 Merge: 0daad70 ce8a61e Author: matteo.piovanelli <matteo.piovanelli@laser-group.com> Date: Thu Oct 27 17:10:53 2016 +0200 Merge branch 'issues/7346_WidgetsViewQueryString' into Laser/1.10.x commit 0daad702192b6286714f29212dc8fee50e76542f Merge: 927d18b 7b09747 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Thu Oct 27 09:07:58 2016 +0200 Merge remote-tracking branch 'remotes/Laser.Orchard/feature/6688_RequestTokens_Chaintext' into 1.10.x commit 7b09747fc9eaea71f653365e81d00cf2d82e964d Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Thu Oct 27 09:05:17 2016 +0200 inserted a better explanation on how to use the chains commit 927d18b1c2b81cf69e5b33ce46c503f5e6b183e2 Merge: f8cbc63 17ebdd2 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Wed Oct 26 19:00:44 2016 +0200 Merge remote-tracking branch 'remotes/Laser.Orchard/feature/6688_RequestTokens_Chaintext' into 1.10.x commit 17ebdd2bfc53c7028aa71d36443b11942ac2a320 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Wed Oct 26 18:57:48 2016 +0200 - typo commit f8cbc63fc03fda1bc47209a1849a1e287d698c4f Merge: 9f42664 1b511b2 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Wed Oct 26 18:53:11 2016 +0200 Merge branch 'feature/6688_RequestTokens_Chaintext' into 1.10.x commit 1b511b2692d1890b658b13f9dfd32f5caca3da09 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Wed Oct 26 18:50:35 2016 +0200 - Implement what described in #6688 Supported Syntaxes for Request and Form tokens are: 1. QueryString:(param1) or Form:(param1) 2. QueryString:param1 or Form:param1 3. QueryString:(param1).SomeOtherTextToken or Form:(param1).SomeOtherTextToken If you want to Chain TextTokens you have to use the 3rd syntax the element (here param1) has been surrounded with brackets in order to preserve backward compatibility. commit ce8a61ed86f66a50c67adce24c6d84440cc61787 Author: matteo.piovanelli <matteo.piovanelli@laser-group.com> Date: Wed Oct 26 11:46:24 2016 +0200 Fixes #7346 commit 9f4266401a9c06bc8426c73055a6b5257c7b15bb Merge: 60aa1cc f6cfe32 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Tue Oct 25 09:20:57 2016 +0200 Merge branch '1.10.x' of https://github.com/LaserSrl/Orchard into 1.10.x commit 60aa1cc2f4f45a06de6a4416eeb9f0726697d11e Merge: c1b1c4d 7a16cf5 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Tue Oct 25 09:20:28 2016 +0200 Merge branch '1.10.x' of https://github.com/OrchardCMS/Orchard into 1.10.x commit c1b1c4dc06b6c941f5f7eced5a81ed30bd5d66fa Merge: bf2201c e50bd60 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Tue Oct 25 09:19:54 2016 +0200 Merge remote-tracking branch 'remotes/Laser.Orchard/feature/6196_SupportForAttachments' into 1.10.x commit e50bd607b7f8e4047bf2a2c58fd31cf626aa198e Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Tue Oct 25 09:18:24 2016 +0200 - Formatted Code (Rebracer) commit f6cfe324b1a393b1b4b192577ed5211f91f8285c Merge: 7a16cf5 bf2201c Author: matteo.piovanelli <matteo.piovanelli@laser-group.com> Date: Mon Oct 24 09:24:57 2016 +0200 Merge remote-tracking branch 'remotes/Laser.Orchard/1.10.x' into 1.10.x Ho fatto pull della 1.10 remota di Orchard commit bf2201c2a9a05fcdc9467eca8023a7209c0b6298 Merge: 67af300 580b79c Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Oct 21 18:40:21 2016 +0200 Merge branch 'feature/6196_SupportForAttachments' into 1.10.x # Conflicts: # src/Orchard.Web/Modules/Orchard.Email/Services/SmtpMessageChannel.cs commit 580b79c24db2da9b7d97039b4fd6db03412fb5c6 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Oct 21 11:46:08 2016 +0200 - Added attachments logic commit 67af300783983bd823f059bfaf91b7975157ab81 Merge: d4d4a32 a4c816b Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Oct 21 11:56:13 2016 +0200 Merge branch 'feature/6196_SupportForAttachments' into 1.10.x commit a4c816b29180dde88964e9d55207efd73de4d561 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Oct 21 11:55:38 2016 +0200 - missing Attachments Key fix commit d4d4a322bc432198068c6c96ad8b4768ca8af7d0 Merge: 297e586 2bb81ee Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Oct 21 11:46:40 2016 +0200 Merge branch 'feature/6196_SupportForAttachments' into 1.10.x commit 2bb81eef31b092c8f78b19d9e8f21300d32cf3ba Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Oct 21 11:46:08 2016 +0200 - Added attachments logic commit 297e586a19853f709e66691ad390adfced23807a Merge: 54a1bdf 548b5d7 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Oct 21 09:39:11 2016 +0200 Merge branch 'feature/5790_partecipate_in_cache_key_generation' into 1.10.x commit 548b5d7d8fd95982cc04adc42272152ec327d1c0 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Fri Oct 21 09:37:07 2016 +0200 - Method renamed - try catch removed commit 54a1bdf03aba22032c4cfbd7e56a3f924d426f2e Merge: b7ee130 794b9b0 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Wed Oct 19 17:51:29 2016 +0200 Merge remote-tracking branch 'remotes/Laser.Orchard/feature/5790_partecipate_in_cache_key_generation' into 1.10.x commit 794b9b025227339f6cf840c58b54ea5d4cd1eb0e Merge: 1dcee8a 350cbbd Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Wed Oct 19 17:44:35 2016 +0200 Merge branch 'feature/5790_partecipate_in_cache_key_generation' of https://github.com/LaserSrl/Orchard into feature/5790_partecipate_in_cache_key_generation commit 1dcee8aae85741975c6589664acbfd80f92514f8 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Wed Oct 19 16:30:12 2016 +0200 - typo chaching > caching - added EventHandler in order to partecipate in cachekey generation commit 350cbbd183414a41cf0886967c918d9482e47fea Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Wed Oct 19 17:40:58 2016 +0200 - typo chaching > caching commit b7ee130847b44df2c5fde8469e73ddc061f5ed19 Merge: c9e14f9 58e59e2 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Wed Oct 19 16:32:13 2016 +0200 Merge remote-tracking branch 'remotes/Laser.Orchard/feature/5790_partecipate_in_cache_key_generation' into 1.10.x commit 58e59e2fca8d9d672d45dee661e11b9a7616dc19 Author: HermesSbicego-Laser <hermes.sbicego@laser-group.com> Date: Wed Oct 19 16:30:12 2016 +0200 - added EventHandler in order to partecipate in cachekey generation commit c9e14f9b82c05f96bb6cef494099103aacf7758b Author: matteo.piovanelli <matteo.piovanelli@laser-group.com> Date: Mon Oct 17 12:54:53 2016 +0200 Modified the OutputCache Module based on the enhancement proposed in Issue 5811, by adding a VaryByRequestCookies property to the CacheSettingsPart to enable the generation of the Cache Key based on cookies * Changed the view as reccomended by @sebastienros in his comments * Added culture information to the contentpickerfield editor view * Fixed a bug in the handler (!= instead of ==) * showing displaytext in warnings and notifications rather than content item's id * Cleanup. I ContentPickerFieldLocalizationDriver Editor methods are executed correctly on validation errors, so they load the additional javascript correctly
2016-11-17 21:47:58 +01:00
<ItemGroup>
<Content Include="Views\DefinitionTemplates\ContentPickerFieldLocalizationSettings.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\EditorTemplates\Fields\ContentPickerLocalization.Edit.cshtml" />
</ItemGroup>
2015-12-15 11:55:23 +00:00
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target> -->
<Target Name="AfterBuild" DependsOnTargets="AfterBuildCompiler">
<PropertyGroup>
<AreasManifestDir>$(ProjectDir)\..\Manifests</AreasManifestDir>
</PropertyGroup>
<!-- If this is an area child project, uncomment the following line:
<CreateAreaManifest AreaName="$(AssemblyName)" AreaType="Child" AreaPath="$(ProjectDir)" ManifestPath="$(AreasManifestDir)" ContentFiles="@(Content)" />
-->
<!-- If this is an area parent project, uncomment the following lines:
<CreateAreaManifest AreaName="$(AssemblyName)" AreaType="Parent" AreaPath="$(ProjectDir)" ManifestPath="$(AreasManifestDir)" ContentFiles="@(Content)" />
<CopyAreaManifests ManifestPath="$(AreasManifestDir)" CrossCopy="false" RenameViews="true" />
-->
</Target>
<Target Name="AfterBuildCompiler" Condition="'$(MvcBuildViews)'=='true'">
<AspNetCompiler VirtualPath="temp" PhysicalPath="$(ProjectDir)" />
2015-12-15 11:55:23 +00:00
</Target>
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
<UseIIS>False</UseIIS>
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>45979</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>
</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>True</UseCustomServer>
<CustomServerUrl>http://orchard.codeplex.com</CustomServerUrl>
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
</WebProjectProperties>
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
</Project>