Commit Graph

624 Commits

Author SHA1 Message Date
Benedek Farkas
9f65be8e26 Merge branch '1.10.x' into 1.10.x-to-dev 2025-10-10 19:11:39 +02:00
Benedek Farkas
78ee4efb4f #8850: Release 1.10.4 (#8851)
Some checks failed
Compile / Compile .NET solution (push) Has been cancelled
Compile / Compile Client-side Assets (push) Has been cancelled
SpecFlow Tests / Define Strategy Matrix (push) Has been cancelled
SpecFlow Tests / SpecFlow Tests (push) Has been cancelled
* Updating version numbers to 1.10.4

* Updating Advisory Dashboard Widget iframe URL

* Dashboards: Removing empty Scripts folder

* Dashboards: Updating the Advisory element's iframe URL

* Updating solution with GHA workflow files
2025-10-10 18:49:26 +02:00
Benedek Farkas
973114988e Blog editor: Hiding the UnpublishButton as it's not supported by the Controller 2025-09-20 22:56:44 +02:00
Benedek Farkas
8227579c2e Blog admin editor: Removing the duplicate Delete button, since the Core ContentsDriver now renders one 2025-09-20 22:56:10 +02:00
Benedek Farkas
673d782d82 Merge branch '1.10.x' into 1.10.x-to-dev
# Conflicts:
#	src/Orchard.Web/Core/Contents/Controllers/AdminController.cs
#	src/Orchard.Web/Core/Contents/Drivers/ContentsDriver.cs
#	src/Orchard.Web/Core/Contents/Placement.info
#	src/Orchard.Web/Modules/Orchard.Fields/Orchard.Fields.csproj
#	src/Orchard.Web/Themes/TheAdmin/Styles/site.css
#	src/Orchard/Orchard.Framework.csproj
2025-09-18 22:35:24 +02:00
Andrea Piovanelli
b14c29503b #8565: Delete and Unpublish buttons in backoffice content edit (#8566)
Some checks failed
Compile / Compile .NET solution (push) Has been cancelled
Compile / Compile Client-side Assets (push) Has been cancelled
* Added publish and delete buttons to backoffice content edit.

* Corrected condition for content unpublishing.
Managed unpublish and delete button for blogs and widgets.

* Some little code refactoring

* Added css classes for unpublish-button.
Condition for delete button visibility now checks for contentItem.Id > 0 instead of IsNew() function

* Removed UnpublishButton from Widget Editor.

* Removed Widget_DeleteButton to use the generic Content_DeleteButton shape and avoid its duplication or confusing management via Placement.info.

* Removed Widget_UnpublishButton shape

* Removed unpublish button show/hide logic from driver.
Added comments to clarify how new Unpublish and Delete actions work.

* EOL fix to Orchard.Widgets.csproj.

* Added unpublish button to edit widget (shown if widget is draftable only)

* Hide Content edit delete button at frontend

* ContentsDriver: removed AdminFilter check to display delete button and checked the content is published before showing the unpublish button.

* Applied some of the proposed formatting changes

* Several refactoring operations

* Autoformatting.

* Stylesheet refactoring and reorganization to properly position backoffice buttons

* Autoformatting

---------

Co-authored-by: Alessandro Agostini <alessandro.agostini@laser-group.com>
Co-authored-by: Matteo Piovanelli <matteo.piovanelli@laser-group.com>
2025-06-13 16:17:11 +02:00
Benedek Farkas
d2e91853e1 Merge branch '1.10.x' into 1.10.x-to-dev
# Conflicts:
#	src/Orchard.Specs/App.Config
#	src/Orchard.Web.Tests/app.config
#	src/Orchard.Web/Modules/Orchard.Projections/Services/ProjectionManager.cs
#	src/Orchard.Web/Orchard.Web.csproj
#	src/Orchard.Web/Web.config
#	src/Orchard.Web/packages.config
2025-01-17 19:39:55 +01:00
Benedek Farkas
32c5f1e821 #8822: Upgrading MailKit to 4.9.0 and consolidating all NuGet packages (#8823)
Some checks failed
Compile / Compile .NET solution (push) Has been cancelled
Compile / Compile Client-side Assets (push) Has been cancelled
* Upgrading MailKit to 4.8.0 and consolidating all NuGet packages

* Upgrading MailKit to 4.9.0 and consolidating dependency package versions
2025-01-17 19:22:19 +01:00
Benedek Farkas
8425b4ad76 #8811: Update vulnerable NuGet packages and consolidate them (#8812)
* Updating System.IdentityModel.Tokens.Jwt and its dependencies in Orchard.Azure.MediaServices

* Using System.IO.Compression instead of DotNetZip

* Upgrading Newtonsoft.Json from 12.0.3 (vulnerable) to 13.0.3

* Updating ModuleRootWebConfig.txt codegen template according to the new Newtonsoft.Json version
2024-12-06 09:49:45 +01:00
Benedek Farkas
53f3a19ece #8814: Upgrading NHibernate to 5.5.2 (#8815)
* Upgrading NHibernate to 5.5.2

* Adapting SchemaCommandGenerator to obsolete NHibernate code

* Adapting unit tests to NHibernate breaking change

https://github.com/nhibernate/nhibernate-core/issues/1106
https://github.com/nhibernate/nhibernate-core/issues/1095

* Updating ModuleRootWebConfig.txt codegen template according to the new Newtonsoft.Json and NHibernate version
2024-12-06 09:49:25 +01:00
Benedek Farkas
39ea4c7f79 Merge branch '1.10.x' into issue/8773
# Conflicts:
#	.gitignore
#	ClickToBuild.cmd
#	lib/nuget/nuget.exe
#	src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
#	src/Orchard.Azure/Orchard.Azure.Web/Web.config
#	src/Orchard.Web/Core/Orchard.Core.csproj
#	src/Orchard.Web/Modules/Lucene/Lucene.csproj
#	src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
#	src/Orchard.Web/Modules/Orchard.CustomForms/Orchard.CustomForms.csproj
#	src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj
#	src/Orchard.Web/Modules/Orchard.DynamicForms/packages.config
#	src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj
#	src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
#	src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj
#	src/Orchard.Web/Modules/TinyMce/TinyMce.csproj
2024-04-04 20:53:50 +02:00
Benedek Farkas
fb1aa73475 8776: Upgrade Microsoft.CodeDom.Providers.DotNetCompilerPlatform to latest version (#8777)
* Upgrading projects, code generation templates and Specflow app to use Microsoft.CodeDom.Providers.DotNetCompilerPlatform 4.1.0 (latest)

* Updating csprojs not to define LangVersion separately in Release and Debug mode, setting it to "default" instead of "latest"

* Restricting C# language version to 7.3

* Downgrading SmtpMessageChannel.cs to C# 7.3

* Setting MvcBuildViews = false in the remaining csprojs that reference DotNetCompilerPlatform, like the others

* Setting RoslynCopyToOutDir = false in each csproj that references DotNetCompilerPlatform

See https://github.com/aspnet/RoslynCodeDomProvider?tab=readme-ov-file#build-time-options
- We only need Orchard.Web to include the Roslyn tools in its bin folder, the other csprojs only need the DLL reference
- We could simply remove the targets import in these csprojs, but it will be re-added when the package is updated, so this is cleaner/easier

* We don't actually need <MvcBuildViews>false</MvcBuildViews> in csprojs

* Orchard.Web: Copying Roslyn files to the output folder using the provided target (CopyRoslynCompilerFilesToOutputDirectory) instead of our custom one

* Orchard.proj: Factoring out a part of the Compile target into the DevCompile target and removing BuildViews target

- For a simple local build (just to validate that the solution builds), we don't actually need that second build that copies files to the output folder.
- CI builds (Test, Spec, etc.) that operate on the build output folder are unaffected, because Compile calls DevCompile
- The BuildViews target is not really necessary, just call any other target (Compile, DevCompile, Spec, etc.) with "/p:MvcBuildViews=true"

* Removing incorrect comment about Razor IntelliSense

* Removing VBCodeProvider configuration from Web.config files

* Getting rid of Microsoft.CodeDom.Providers.DotNetCompilerPlatform.targets imports and associated configuration except in Orchard.Web.csproj

* Adding VB compiler configuration to src/Orchard.Web/Web.config, because it would be readded on rebuild by the imported target anyway
2024-04-04 16:35:29 +02:00
Matteo Piovanelli
151bb12ce6 Minor fixes for localizations (#8726)
* wip fixing Fields/TaxonomyFieldList.cshtml

* restored selector for expando label/handle

* cleanup

* fixed comparison to find parent blog

# Conflicts:
#	src/Orchard.Web/Modules/Orchard.Blogs/BlogsLocalizationExtensions/Handlers/BlogPostPartHandler.cs

* fixed initialization of localizedtaxonomyfields

* Checks culture equality based on strings instead of culture records

* If term is culture neutral it is added to the applied terms list without looking for its localization.

# Conflicts:
#	src/Orchard.Web/Modules/Orchard.Taxonomies/Controllers/LocalizedTaxonomyController.cs

* Added AdminLocalizedTaxonomyController to properly managed localized taxonomies back office calls.

# Conflicts:
#	src/Orchard.Web/Modules/Orchard.Taxonomies/Controllers/LocalizedTaxonomyController.cs
#	src/Orchard.Web/Modules/Orchard.Taxonomies/Views/EditorTemplates/Fields/TaxonomyFieldList.cshtml

* Added selectedValues parameter to controller call

---------

Co-authored-by: HermesSbicego-Laser <hermes.sbicego@laser-group.com>
Co-authored-by: Andrea Piovanelli <andrea.piovanelli@laser-group.com>
2024-04-02 08:56:47 +02:00
Benedek Farkas
0510505651 Merge branch '1.10.x' into issue/8684
# Conflicts:
#	src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
#	src/Orchard.Azure/Orchard.Azure.Web/Web.config
#	src/Orchard.Core.Tests/App.config
#	src/Orchard.Core.Tests/Orchard.Core.Tests.csproj
#	src/Orchard.Core.Tests/packages.config
#	src/Orchard.Profile/App.config
#	src/Orchard.Specs/App.Config
#	src/Orchard.Specs/Hosting/Orchard.Web/Web.config
#	src/Orchard.Specs/Orchard.Specs.csproj
#	src/Orchard.Specs/packages.config
#	src/Orchard.Tests.Modules/App.config
#	src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj
#	src/Orchard.Tests.Modules/packages.config
#	src/Orchard.Tests/App.config
#	src/Orchard.Tests/Orchard.Framework.Tests.csproj
#	src/Orchard.Tests/packages.config
#	src/Orchard.Web.Tests/app.config
#	src/Orchard.Web/Core/Common/Migrations.cs
#	src/Orchard.Web/Core/Common/Views/EditorTemplates/Fields.Common.Text.Edit.cshtml
#	src/Orchard.Web/Core/Navigation/Views/EditorTemplates/Parts.MenuWidget.Edit.cshtml
#	src/Orchard.Web/Core/Orchard.Core.csproj
#	src/Orchard.Web/Core/Settings/Descriptor/ShellDescriptorManager.cs
#	src/Orchard.Web/Core/Web.config
#	src/Orchard.Web/Modules/Lucene/Lucene.csproj
#	src/Orchard.Web/Modules/Lucene/Web.config
#	src/Orchard.Web/Modules/Lucene/packages.config
#	src/Orchard.Web/Modules/Markdown/Web.config
#	src/Orchard.Web/Modules/Orchard.Alias/Web.config
#	src/Orchard.Web/Modules/Orchard.AntiSpam/Orchard.AntiSpam.csproj
#	src/Orchard.Web/Modules/Orchard.AntiSpam/Web.config
#	src/Orchard.Web/Modules/Orchard.AntiSpam/packages.config
#	src/Orchard.Web/Modules/Orchard.ArchiveLater/Web.config
#	src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj
#	src/Orchard.Web/Modules/Orchard.AuditTrail/Web.config
#	src/Orchard.Web/Modules/Orchard.AuditTrail/packages.config
#	src/Orchard.Web/Modules/Orchard.Autoroute/Services/AutorouteService.cs
#	src/Orchard.Web/Modules/Orchard.Autoroute/Web.config
#	src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Controllers/MediaController.cs
#	src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj
#	src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config
#	src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config
#	src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj
#	src/Orchard.Web/Modules/Orchard.Azure/Web.config
#	src/Orchard.Web/Modules/Orchard.Azure/packages.config
#	src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
#	src/Orchard.Web/Modules/Orchard.Blogs/Web.config
#	src/Orchard.Web/Modules/Orchard.Caching/Orchard.Caching.csproj
#	src/Orchard.Web/Modules/Orchard.Caching/Web.config
#	src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleRootWebConfig.txt
#	src/Orchard.Web/Modules/Orchard.CodeGeneration/Web.config
#	src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj
#	src/Orchard.Web/Modules/Orchard.Comments/Web.config
#	src/Orchard.Web/Modules/Orchard.Conditions/Web.config
#	src/Orchard.Web/Modules/Orchard.ContentPermissions/Web.config
#	src/Orchard.Web/Modules/Orchard.ContentPicker/Orchard.ContentPicker.csproj
#	src/Orchard.Web/Modules/Orchard.ContentPicker/Web.config
#	src/Orchard.Web/Modules/Orchard.ContentPicker/packages.config
#	src/Orchard.Web/Modules/Orchard.ContentTypes/Web.config
#	src/Orchard.Web/Modules/Orchard.CustomForms/Web.config
#	src/Orchard.Web/Modules/Orchard.Dashboards/Web.config
#	src/Orchard.Web/Modules/Orchard.DesignerTools/Web.config
#	src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj
#	src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config
#	src/Orchard.Web/Modules/Orchard.DynamicForms/packages.config
#	src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj
#	src/Orchard.Web/Modules/Orchard.Email/Web.config
#	src/Orchard.Web/Modules/Orchard.Email/packages.config
#	src/Orchard.Web/Modules/Orchard.Fields/Web.config
#	src/Orchard.Web/Modules/Orchard.Forms/Orchard.Forms.csproj
#	src/Orchard.Web/Modules/Orchard.Forms/Web.config
#	src/Orchard.Web/Modules/Orchard.Forms/packages.config
#	src/Orchard.Web/Modules/Orchard.ImageEditor/Web.config
#	src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj
#	src/Orchard.Web/Modules/Orchard.ImportExport/Web.config
#	src/Orchard.Web/Modules/Orchard.ImportExport/packages.config
#	src/Orchard.Web/Modules/Orchard.Indexing/Web.config
#	src/Orchard.Web/Modules/Orchard.JobsQueue/Orchard.JobsQueue.csproj
#	src/Orchard.Web/Modules/Orchard.JobsQueue/Web.config
#	src/Orchard.Web/Modules/Orchard.JobsQueue/packages.config
#	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
#	src/Orchard.Web/Modules/Orchard.Layouts/Web.config
#	src/Orchard.Web/Modules/Orchard.Layouts/packages.config
#	src/Orchard.Web/Modules/Orchard.Lists/Web.config
#	src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj
#	src/Orchard.Web/Modules/Orchard.Localization/Web.config
#	src/Orchard.Web/Modules/Orchard.Media/Web.config
#	src/Orchard.Web/Modules/Orchard.MediaLibrary/Orchard.MediaLibrary.csproj
#	src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/MediaLibraryPicker.cshtml
#	src/Orchard.Web/Modules/Orchard.MediaLibrary/Web.config
#	src/Orchard.Web/Modules/Orchard.MediaLibrary/packages.config
#	src/Orchard.Web/Modules/Orchard.MediaPicker/Web.config
#	src/Orchard.Web/Modules/Orchard.MediaProcessing/Web.config
#	src/Orchard.Web/Modules/Orchard.MessageBus/Orchard.MessageBus.csproj
#	src/Orchard.Web/Modules/Orchard.MessageBus/Web.config
#	src/Orchard.Web/Modules/Orchard.MessageBus/packages.config
#	src/Orchard.Web/Modules/Orchard.Migrations/Web.config
#	src/Orchard.Web/Modules/Orchard.Modules/Web.config
#	src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj
#	src/Orchard.Web/Modules/Orchard.MultiTenancy/Web.config
#	src/Orchard.Web/Modules/Orchard.MultiTenancy/packages.config
#	src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs
#	src/Orchard.Web/Modules/Orchard.OutputCache/Web.config
#	src/Orchard.Web/Modules/Orchard.Packaging/Web.config
#	src/Orchard.Web/Modules/Orchard.Pages/Web.config
#	src/Orchard.Web/Modules/Orchard.Projections/Migrations.cs
#	src/Orchard.Web/Modules/Orchard.Projections/Orchard.Projections.csproj
#	src/Orchard.Web/Modules/Orchard.Projections/Settings/ProjectionPartEditorEvents.cs
#	src/Orchard.Web/Modules/Orchard.Projections/Tests/Orchard.Projections.Tests.csproj
#	src/Orchard.Web/Modules/Orchard.Projections/Tests/app.config
#	src/Orchard.Web/Modules/Orchard.Projections/Tests/packages.config
#	src/Orchard.Web/Modules/Orchard.Projections/Views/Property/Edit.cshtml
#	src/Orchard.Web/Modules/Orchard.Projections/Web.config
#	src/Orchard.Web/Modules/Orchard.Projections/packages.config
#	src/Orchard.Web/Modules/Orchard.PublishLater/Web.config
#	src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj
#	src/Orchard.Web/Modules/Orchard.Recipes/Web.config
#	src/Orchard.Web/Modules/Orchard.Redis/Orchard.Redis.csproj
#	src/Orchard.Web/Modules/Orchard.Redis/Web.config
#	src/Orchard.Web/Modules/Orchard.Redis/packages.config
#	src/Orchard.Web/Modules/Orchard.Resources/Web.config
#	src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj
#	src/Orchard.Web/Modules/Orchard.Roles/Web.config
#	src/Orchard.Web/Modules/Orchard.Roles/packages.config
#	src/Orchard.Web/Modules/Orchard.Rules/Web.config
#	src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Web.config
#	src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Web.config
#	src/Orchard.Web/Modules/Orchard.Scripting/Web.config
#	src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
#	src/Orchard.Web/Modules/Orchard.Search/Web.config
#	src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Web.config
#	src/Orchard.Web/Modules/Orchard.Setup/Web.config
#	src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj
#	src/Orchard.Web/Modules/Orchard.Tags/Web.config
#	src/Orchard.Web/Modules/Orchard.Tags/packages.config
#	src/Orchard.Web/Modules/Orchard.TaskLease/Web.config
#	src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj
#	src/Orchard.Web/Modules/Orchard.Taxonomies/Web.config
#	src/Orchard.Web/Modules/Orchard.Taxonomies/packages.config
#	src/Orchard.Web/Modules/Orchard.Templates/Web.config
#	src/Orchard.Web/Modules/Orchard.Themes/Web.config
#	src/Orchard.Web/Modules/Orchard.Tokens/Tests/app.config
#	src/Orchard.Web/Modules/Orchard.Tokens/Web.config
#	src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj
#	src/Orchard.Web/Modules/Orchard.Users/Services/UserService.cs
#	src/Orchard.Web/Modules/Orchard.Users/Web.config
#	src/Orchard.Web/Modules/Orchard.Warmup/Web.config
#	src/Orchard.Web/Modules/Orchard.Widgets/Views/WidgetPlacement.Zones.cshtml
#	src/Orchard.Web/Modules/Orchard.Widgets/Web.config
#	src/Orchard.Web/Modules/Orchard.Workflows/Orchard.Workflows.csproj
#	src/Orchard.Web/Modules/Orchard.Workflows/Web.config
#	src/Orchard.Web/Modules/Orchard.Workflows/packages.config
#	src/Orchard.Web/Modules/Orchard.jQuery/Web.config
#	src/Orchard.Web/Modules/SysCache/SysCache.csproj
#	src/Orchard.Web/Modules/SysCache/Web.config
#	src/Orchard.Web/Modules/SysCache/packages.config
#	src/Orchard.Web/Modules/TinyMce/TinyMce.csproj
#	src/Orchard.Web/Modules/TinyMce/Views/Body-Html.Editor.cshtml
#	src/Orchard.Web/Modules/TinyMce/Web.config
#	src/Orchard.Web/Modules/Upgrade/Upgrade.csproj
#	src/Orchard.Web/Modules/Upgrade/Web.config
#	src/Orchard.Web/Modules/Upgrade/packages.config
#	src/Orchard.Web/Orchard.Web.csproj
#	src/Orchard.Web/Themes/Web.config
#	src/Orchard.Web/Web.config
#	src/Orchard.Web/packages.config
#	src/Orchard/Orchard.Framework.csproj
#	src/Orchard/app.config
#	src/Orchard/packages.config
2023-05-16 12:39:17 +02:00
Andrea Piovanelli
c38e6814a9 Feature/blogposts search (#8570) 2022-07-08 16:51:07 +02:00
Hermes Sbicego
f2ec2a70cd Fix/newtonsoft.json 13.0.1 (#8596)
* Bump Newtonsoft.Json from 12.0.3 to 13.0.1 in /src/Orchard

Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) from 12.0.3 to 13.0.1.
- [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases)
- [Commits](https://github.com/JamesNK/Newtonsoft.Json/compare/12.0.3...13.0.1)

---
updated-dependencies:
- dependency-name: Newtonsoft.Json
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump Newtonsoft.Json from 12.0.3 to 13.0.1 in /src/Orchard.Azure.Tests

Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) from 12.0.3 to 13.0.1.
- [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases)
- [Commits](https://github.com/JamesNK/Newtonsoft.Json/compare/12.0.3...13.0.1)

---
updated-dependencies:
- dependency-name: Newtonsoft.Json
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* Updates Newtonsoft.Json from 12.0.3 to 13.0.1

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-07-05 09:30:08 +02:00
ElenaRepository
0973810c09 added the missing minification files (#8553)
Co-authored-by: elena.lampugnani <elena.lampugnani@laser-group.com>
2022-04-01 14:15:49 +02:00
Matteo Piovanelli
e9244980a4 Upgrade nhibernate (#8528)
* Upgraded NHibernate to version 5.3.10. Solution builds with no warnings.

* fixed most issues

* Added source code for NHibernate.Linq library from
http://sourceforge.net/projects/nhcontrib/files/NHibernate.Linq/1.0/NHibernate.Linq-1.0.0.GA-src.zip
With the modified DetachedCriteriaAdapter.cs for Orchard.
Started upgrading that library to NHibernate 5.3.10.

* Finished updating NHibernate.Linq to work with NHibernate 5.3.10.

* Removed NHibernate.Linq from lib folder

* Updated code generation templates to use the correct version of nhibernate
2022-01-21 08:47:00 +01:00
Matteo Piovanelli
91a82535a2 1.10.x into dev (#8521)
* Added tokenizable default value to ContentPickerFields (#8351)

* Fixes errors during Indexing (#8349)

* Added admin search permissions (#8346)

* Reuse Settings_ShellDescriptorRecord during an http request (#8355)

* Added a new index to CommonPartRecord (#8362)

* Attempted AutoroutePart improvement (#8360)

This should ease Database issues, because it short circuits some code paths
through aliases.

* Save MemberBindingRecords in memory (#8371)

Prevent fetching the same table from the database 5+ times per request by
loading it and saving it in a private property for a request.

* Cache list of configured layers (#8373)

On every page load on frontend we were querying for all existing layers to test
for the ones that are currently active. Since that information is not bound to
change often, we added a cache layer to prevent querying every time. The cache
is evicted whenever a Layer gets updated.

* Memorize query results in blog service (#8374)

The query for all published blogs is being called twice while building the admin menu,
so we are memorizing its results.

* Updated UI for projections (#8380)

Some textboxes were too small for the actual text users would generally write in them.
Those meant to hold HTML have been converted to textareas.

* Process ignored paths while being aware of RequestUrlPrefix (#8384)

* Process ignored paths while being aware of RequestUrlPrefix

* Fix: I had moved a Trim to the wrong place

* Fixed issue with empty/uninitialized null set of ignored urls

* tokens sort criteria (#8382)

* Tokenized state for sort criteria

* Tokenized state also in the other place where sort criteria are used

* Remove lock from the dictionary when the task has completed. (#8395)

Fixes #8391

* Update DistributedLockService.cs (#8398)

* fix for CPF when other scripts are also adding to sessionStorage (#8404)

* Fixes Boolean Conversion error (#8393)

* Fix/8392 remeber me model state exception (#8410)

@sebastienros this fixes the possible NRE that would happen for absent models from merged #8393 
(see your comment there https://github.com/OrchardCMS/Orchard/pull/8393#issuecomment-686630198)

* Removed changes to model bindings (#8412)

This is the same as reverting 1.10.x to commit 868ce12ad6

* New version of Boolean Binder Provider (#8413)

* New version of Boolean Binder Provider
* Use Convert.ToBoolean(string) rather than ValueProviderResult.ConvertTo(bool)

* Upgrade host resolution (#8387)

* Reverted changes to RunningShellTable and then changed the way shells are sorted,
so we can correctly give "priority" to tenants based on their prefix.

Added test adapter reference to Orchard.Framework.Tests so tests can be run in
the latest VS 2017.

Fixed a test that was failing to account for the order the shells were being
processed.

* Removed some stuff from csproj that vs had added

* Handle the case where a form sends more than one attempted value for a boolean (#8416)

* fix record mapping nhibernate (#8415)

* Allow downstream methods to set default value (#8419)

Moreover, this won't try to set a default value to the bool when it's not sent.
This will allow calls with missing required parameters to fail as they should.

* Fixed Media Library Picker Style  (#8433)

* Removed check preventing reassignment of loader delegates (#8436)

* Added an event activity for workflows that activates on the first Upd… (#8438)

* target framework 4.8 to all projects (#8444)

* Feature/8445 libraries update (#8446)

* Fixed conflict with style for layouts (#8456)

the .overlay is used for different things in MediaLibraryPickerField and Layouts, and as it was the styles would conflict. This should fix it.

* Feature/upgradable libraries (#8457)

* Updated Migration for CommonPartRecord and IdentityPartRecord (#8459)

This orders the operations differently than what is in dev for retrocompatibility in both environments.

* Prevents throwing exception when Href is null (#8461)

* added culture in widgets page (#8466)

* added culture in widgets page
Co-authored-by: elena.lampugnani <elena.lampugnani@laser-group.com>
Co-authored-by: Hermes Sbicego <hermes.sbicego@laser-group.com>

* Show disable action for deprecated features even if they are categorized as "Core" (#8468)

* Upgrades YamlDotNet from 9.1.3 to 11.1.1 because 9.1.3 is not more available as nuget package (#8472)

* Bypass cache for XSRF Tokens (#8470)

Fixes #8469

* flag exclude children for taxonomies (#8481)

* Remove cache by tag on Unpublished (#8483)

As it was, cached lists/projections would not be evicted when a ContentItem they contained was unpublished.

* Cloning doesn't overwrite identity (#8487)

Fixes #8486

* Update nhibernate (#8488)

* Update nHibernate to version 4.1.2.4000

# Conflicts:
#	src/Orchard.Web/Modules/Orchard.ContentPicker/packages.config
#	src/Orchard.Web/Modules/Orchard.ImportExport/packages.config
#	src/Orchard.Web/Modules/Orchard.MessageBus/packages.config
#	src/Orchard.Web/Modules/Orchard.MultiTenancy/packages.config
#	src/Orchard.Web/Modules/Orchard.Projections/packages.config
#	src/Orchard.Web/Modules/Orchard.Tags/packages.config
#	src/Orchard.Web/Modules/Upgrade/packages.config
#	src/Orchard.Web/Web.config

* Update AssemblyBindings for NHibernate

* Fixes disposed LifetimeScope issue (#8490)

* fixed scope in in recomputing the context to figure out whether an antiforgery token needs replacing

* Revert "Cloning doesn't overwrite identity (#8487)" (#8495)

This reverts commit af42947c9c.

* Remove whitespace when importing list of permissions (#8499)

Similarly to what's already being done when we import features.
this allows to go to a new line in the xml that we import, and even tabulate for readability and maintenance.

* Force enumeration of list of permissions. 

Without this, imported permissions (#8492) would always replace existing ones: i.e. if an existing permission is not in
the list being imported it would be removed for the role.

* Projection default settings (#8497)

* added settings in projection part
* read settings into driver
* commit files setting
* add logic of filter query
* added logic of filter query setting
* managed import/export
* fixed migration
* added message information
Co-authored-by: elena.lampugnani <elena.lampugnani@laser-group.com>

* HtmlDecode token (#8501)

Added HtmlDecode token management.
Needed for #8500

* Sets SSL redirection as permanent for SEO reasons (#8503)

Fixes #8502

* Added null checks (#8511)

The added null checks manage properly importing definitions that do not contain the properties.

* Fix/editmenulink (#8515)

* Removed useless spaces

* Corrections on ProjectionPart query link (it didn't update the link when changing the selected query).
Added edit link for menu in MenuWidget.

* Added menuId parameter to menu edit link

* Fixed various typos: (#8512)

* Added descriptor to audit trail context (#8517)

Co-authored-by: Hermes Sbicego <hermes.sbicego@laser-group.com>
Co-authored-by: Imran Azad <imranazad@users.noreply.github.com>
Co-authored-by: LorenzoFrediani-Laser <lorenzo.frediani@laser-group.com>
Co-authored-by: ElenaRepository <50620495+ElenaRepository@users.noreply.github.com>
Co-authored-by: Andrea Piovanelli <83577153+AndreaPiovanelliLaser@users.noreply.github.com>
2022-01-14 09:11:12 +01:00
Matteo Piovanelli
b37256fc94 Update nhibernate (#8488)
* Update nHibernate to version 4.1.2.4000

# Conflicts:
#	src/Orchard.Web/Modules/Orchard.ContentPicker/packages.config
#	src/Orchard.Web/Modules/Orchard.ImportExport/packages.config
#	src/Orchard.Web/Modules/Orchard.MessageBus/packages.config
#	src/Orchard.Web/Modules/Orchard.MultiTenancy/packages.config
#	src/Orchard.Web/Modules/Orchard.Projections/packages.config
#	src/Orchard.Web/Modules/Orchard.Tags/packages.config
#	src/Orchard.Web/Modules/Upgrade/packages.config
#	src/Orchard.Web/Web.config

* Update AssemblyBindings for NHibernate
2021-07-30 08:41:53 +02:00
Matteo Piovanelli
ca86ec9831 merge 1.10.x into dev 2021-02-19 10:31:26 +01:00
Hermes Sbicego
0c34ca3dd5 Feature/8445 libraries update (#8446) 2021-02-04 10:05:50 -08:00
Hermes Sbicego
700b029a34 target framework 4.8 to all projects (#8444) 2021-01-07 10:07:38 -08:00
Hermes Sbicego
87477518fa Fix wrong behaviours and exceptions when blog is unpublished. (#8389)
* Fix wrong behaviours and exceptions when blog is unpublished. More details there #8388.
2020-07-10 08:31:11 +02:00
Matteo Piovanelli
f581d235d2 Memorize query results in blog service (#8374)
The query for all published blogs is being called twice while building the admin menu,
so we are memorizing its results.
2020-05-14 10:29:59 -07:00
Zoltán Lehóczky
b960866531 Merge branch '1.10.x' into dev
# Conflicts:
#	src/Orchard.Web/Modules/Markdown/Markdown.csproj
#	src/Orchard.Web/Modules/Orchard.Projections/Handlers/FieldIndexPartHandler.cs
#	src/Orchard.Web/Modules/Orchard.Recipes/Views/Admin/Index.cshtml
#	src/Orchard.Web/Modules/Orchard.Taxonomies/Views/TermAdmin/Index.cshtml
#	src/Orchard.sln
2020-04-07 23:03:58 +02:00
ElenaRepository
d94d50f67d Correct archive when date changed (#8306) 2020-01-16 13:12:11 -08:00
ElenaRepository
fc9a08fd12 Fix/8302 manage pagination blogpostarchive (#8304) 2020-01-09 12:13:52 -08:00
Aaron Amm
608df75429 Upgrade to net 461 (#8296)
* Add New-TargetFramework PowerShell script to set .NET Framework

* Update all projects in the solution to .NET 4.6.1 that supports .NET Standard 2.0
2019-12-19 12:26:54 -08:00
Lombiq
3770e65bda Merge remote-tracking branch 'origin/1.10.x' into dev
# Conflicts:
#	src/Orchard.Web/Core/Contents/Views/Content.SummaryAdmin.cshtml
#	src/Orchard.Web/Core/Contents/Views/Parts.Contents.Clone.SummaryAdmin.cshtml
#	src/Orchard.Web/Core/Contents/Views/Parts.Contents.Publish.SummaryAdmin.cshtml
#	src/Orchard.Web/Modules/Orchard.AntiSpam/Views/Parts/SpamFilter.Metadata.Actions.cshtml
#	src/Orchard.Web/Modules/Orchard.Blogs/Views/Content-BlogPost.SummaryAdmin.cshtml
#	src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.cshtml
#	src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.Comment.SummaryAdmin.cshtml
#	src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.CommentForm.cshtml
#	src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj
#	src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.cshtml
#	src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.cshtml
#	src/Orchard.Web/Modules/Orchard.Widgets/Views/WidgetPlacement.Zones.cshtml
2019-08-19 16:47:31 +02:00
LorenzoFrediani-Laser
6c7390a073 Change returnurl from abosuleurl to relaviveurl (#8265) 2019-08-15 12:17:19 -07:00
Benedek Farkas
bbc86d38cd Merge branch '1.10.x' into dev
# Conflicts:
#	src/Orchard.Web/Core/Contents/Controllers/AdminController.cs
#	src/Orchard.Web/Modules/Orchard.MediaLibrary/Scripts/media-library.js
2019-08-13 17:38:13 +02:00
MarcoViglione-Laser
ec9673a1ca Modified CreateRouteValues when no blog Id is specified to avoid creation of orphaned posts (#8255) 2019-08-01 12:05:42 -07:00
Gábor Domonkos
eababa3d13 Update Newtonsoft.Json to 12.0 everywhere, fixes #7213 (#8202)
Lombiq Technologies: ORCH-205
2019-05-18 20:19:29 +02:00
Lombiq
becb386adf Fixing merge errors and upgrading Microsoft.CodeDom.Providers.DotNetCompilerPlatform to 2.0.1 where necessary 2019-02-20 21:18:30 +01:00
Lombiq
aced5c3e72 Merge branch '1.10.x' into dev
# Conflicts:
#	README.md
#	src/Orchard.Specs/Boolean.feature
#	src/Orchard.Specs/Boolean.feature.cs
#	src/Orchard.Specs/DateTime.feature
#	src/Orchard.Specs/DateTime.feature.cs
#	src/Orchard.Specs/Enumeration.feature
#	src/Orchard.Specs/Enumeration.feature.cs
#	src/Orchard.Specs/Hosting/Orchard.Web/Web.config
#	src/Orchard.Specs/Input.feature
#	src/Orchard.Specs/Link.feature
#	src/Orchard.Specs/Link.feature.cs
#	src/Orchard.Specs/Numeric.feature
#	src/Orchard.Specs/Numeric.feature.cs
#	src/Orchard.Specs/Text.feature
#	src/Orchard.Web/Core/Contents/Controllers/AdminController.cs
#	src/Orchard.Web/Core/Contents/Views/Parts.Contents.Clone.SummaryAdmin.cshtml
#	src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs
#	src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml
#	src/Orchard.Web/Core/Orchard.Core.csproj
#	src/Orchard.Web/Core/Web.config
#	src/Orchard.Web/Core/packages.config
#	src/Orchard.Web/Modules/Lucene/packages.config
#	src/Orchard.Web/Modules/Markdown/packages.config
#	src/Orchard.Web/Modules/Orchard.Alias/packages.config
#	src/Orchard.Web/Modules/Orchard.ArchiveLater/packages.config
#	src/Orchard.Web/Modules/Orchard.Autoroute/Handlers/AutoroutePartHandler.cs
#	src/Orchard.Web/Modules/Orchard.Autoroute/packages.config
#	src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj
#	src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config
#	src/Orchard.Web/Modules/Orchard.Blogs/packages.config
#	src/Orchard.Web/Modules/Orchard.Comments/packages.config
#	src/Orchard.Web/Modules/Orchard.ContentPermissions/packages.config
#	src/Orchard.Web/Modules/Orchard.ContentPicker/Module.txt
#	src/Orchard.Web/Modules/Orchard.ContentPicker/packages.config
#	src/Orchard.Web/Modules/Orchard.ContentTypes/packages.config
#	src/Orchard.Web/Modules/Orchard.CustomForms/Module.txt
#	src/Orchard.Web/Modules/Orchard.CustomForms/Orchard.CustomForms.csproj
#	src/Orchard.Web/Modules/Orchard.CustomForms/Web.config
#	src/Orchard.Web/Modules/Orchard.CustomForms/packages.config
#	src/Orchard.Web/Modules/Orchard.Dashboards/Orchard.Dashboards.csproj
#	src/Orchard.Web/Modules/Orchard.Dashboards/Web.config
#	src/Orchard.Web/Modules/Orchard.Dashboards/packages.config
#	src/Orchard.Web/Modules/Orchard.DesignerTools/packages.config
#	src/Orchard.Web/Modules/Orchard.Fields/Module.txt
#	src/Orchard.Web/Modules/Orchard.Fields/packages.config
#	src/Orchard.Web/Modules/Orchard.Forms/Module.txt
#	src/Orchard.Web/Modules/Orchard.ImageEditor/packages.config
#	src/Orchard.Web/Modules/Orchard.ImportExport/packages.config
#	src/Orchard.Web/Modules/Orchard.Indexing/packages.config
#	src/Orchard.Web/Modules/Orchard.Layouts/packages.config
#	src/Orchard.Web/Modules/Orchard.Lists/packages.config
#	src/Orchard.Web/Modules/Orchard.Localization/Module.txt
#	src/Orchard.Web/Modules/Orchard.Localization/Views/Parts/Localization.ContentTranslations.SummaryAdmin.cshtml
#	src/Orchard.Web/Modules/Orchard.Localization/packages.config
#	src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj
#	src/Orchard.Web/Modules/Orchard.Media/Web.config
#	src/Orchard.Web/Modules/Orchard.Media/packages.config
#	src/Orchard.Web/Modules/Orchard.MediaPicker/Orchard.MediaPicker.csproj
#	src/Orchard.Web/Modules/Orchard.MediaPicker/Web.config
#	src/Orchard.Web/Modules/Orchard.MediaPicker/packages.config
#	src/Orchard.Web/Modules/Orchard.MediaProcessing/packages.config
#	src/Orchard.Web/Modules/Orchard.Modules/packages.config
#	src/Orchard.Web/Modules/Orchard.MultiTenancy/packages.config
#	src/Orchard.Web/Modules/Orchard.OutputCache/Orchard.OutputCache.csproj
#	src/Orchard.Web/Modules/Orchard.OutputCache/packages.config
#	src/Orchard.Web/Modules/Orchard.Packaging/packages.config
#	src/Orchard.Web/Modules/Orchard.Projections/Module.txt
#	src/Orchard.Web/Modules/Orchard.Projections/packages.config
#	src/Orchard.Web/Modules/Orchard.PublishLater/packages.config
#	src/Orchard.Web/Modules/Orchard.Recipes/packages.config
#	src/Orchard.Web/Modules/Orchard.Resources/Orchard.Resources.csproj
#	src/Orchard.Web/Modules/Orchard.Resources/Web.config
#	src/Orchard.Web/Modules/Orchard.Resources/packages.config
#	src/Orchard.Web/Modules/Orchard.Roles/packages.config
#	src/Orchard.Web/Modules/Orchard.Rules/Orchard.Rules.csproj
#	src/Orchard.Web/Modules/Orchard.Rules/Web.config
#	src/Orchard.Web/Modules/Orchard.Rules/packages.config
#	src/Orchard.Web/Modules/Orchard.Scripting.CSharp/packages.config
#	src/Orchard.Web/Modules/Orchard.Search/packages.config
#	src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/packages.config
#	src/Orchard.Web/Modules/Orchard.Setup/packages.config
#	src/Orchard.Web/Modules/Orchard.Tags/packages.config
#	src/Orchard.Web/Modules/Orchard.TaskLease/Module.txt
#	src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj
#	src/Orchard.Web/Modules/Orchard.Templates/packages.config
#	src/Orchard.Web/Modules/Orchard.Themes/packages.config
#	src/Orchard.Web/Modules/Orchard.Tokens/Module.txt
#	src/Orchard.Web/Modules/Orchard.Tokens/packages.config
#	src/Orchard.Web/Modules/Orchard.Users/packages.config
#	src/Orchard.Web/Modules/Orchard.Warmup/packages.config
#	src/Orchard.Web/Modules/Orchard.Widgets/packages.config
#	src/Orchard.Web/Modules/Orchard.Workflows/packages.config
#	src/Orchard.Web/Modules/Orchard.jQuery/Orchard.jQuery.csproj
#	src/Orchard.Web/Modules/Orchard.jQuery/Web.config
#	src/Orchard.Web/Modules/Orchard.jQuery/packages.config
#	src/Orchard.Web/Modules/TinyMce/TinyMce.csproj
#	src/Orchard.Web/Modules/TinyMce/Views/Body-Html.Editor.cshtml
#	src/Orchard.Web/Modules/TinyMce/packages.config
#	src/Orchard.Web/Themes/Themes.csproj
#	src/Orchard.Web/Themes/Web.config
#	src/Orchard.Web/Themes/packages.config
#	src/Orchard.Web/Web.config
#	src/Orchard.Web/packages.config
#	src/Orchard/ContentManagement/DefaultContentManager.cs
#	src/Orchard/Orchard.Framework.csproj
#	src/Tools/MSBuild.Orchard.Tasks/TypeScriptFiles.cs
2019-02-20 20:05:18 +01:00
Lombiq
992e79de36 Bumping version number to 1.10.3 2019-02-19 21:00:04 +01:00
Lombiq
6bce539675 Farewell, CodePlex! (Press F to Pay Respects) 2019-02-19 20:42:13 +01:00
Lombiq
f31e6aa60d Upgrading DotNetCompilerPlatform package from 2.0.0 to 2.0.1
This update includes version 2.9.0 of the Roslyn package (improved C# 7.3 compilation)
2018-09-19 20:59:06 +02:00
Benedek Farkas
be802146bc Dynamic C# Compilation, Static and Dynamic Razor Compilation with Roslyn (1.10.x) (#7713) 2018-09-19 13:45:23 +02:00
Jay Harris
3649844b66 Update Newtonsoft.Json, Microsoft.Owin, IdentityModel to latest (#8087) 2018-08-09 12:22:42 -07:00
Lombiq
5a6b56cc72 Merge branch '1.10.x' into dev
# Conflicts:
#	src/Orchard.Azure.Tests/Orchard.Azure.Tests.csproj
#	src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
#	src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj
#	src/Orchard.Web/packages.config
2017-12-22 21:05:17 +01:00
Lombiq
daf8678cac Extension web.configs: Specifying DotNetCompilerPlatform DLL version and removing language version restriction (as it's meaningless) 2017-12-22 20:42:27 +01:00
Benedek Farkas
ed0c60c5fd 5408: Dropping static view compilation temporarily to be able support Dynamic Compilation with Roslyn (#7892) 2017-12-21 12:49:53 -08:00
Benedek Farkas
7599a25594 Merge branch '1.10.x' into dev
# Conflicts:
#	src/Orchard.Azure.Tests/Orchard.Azure.Tests.csproj
#	src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
#	src/Orchard.Core.Tests/Orchard.Core.Tests.csproj
#	src/Orchard.Profile/Orchard.Profile.csproj
#	src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj
#	src/Orchard.Tests/Orchard.Framework.Tests.csproj
#	src/Orchard.Web/Core/Navigation/Migrations.cs
#	src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/FolderController.cs
#	src/Orchard.Web/Modules/Orchard.MediaLibrary/Services/XmlRpcHandler.cs
#	src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj
#	src/Orchard.Web/Orchard.Web.csproj
#	src/Orchard.Web/Web.config
#	src/Orchard.Web/packages.config
#	src/Orchard/Mvc/MvcModule.cs
#	src/Orchard/Orchard.Framework.csproj
2017-11-10 00:54:02 +01:00
Benedek Farkas
2904d35d91 Enabling C# 6 for Dynamic Compilation and Razor IntelliSense
Fixes #5408
2017-11-09 12:04:12 -08:00
Julián Alazorza
8036e539b6 Display custom login errors (#7734)
Fixes #7588
2017-09-14 12:26:55 -07:00
Benedek Farkas
cdcec3cd8b #7713: View compilation with MSBuild (#7732)
Fixes #7713
2017-06-29 21:10:51 +02:00
Daniel Stolt
e7e40cdfbc Corrected expected form value for Blog.Publish action. Fixes #7698. 2017-05-19 17:45:25 +02:00
Sebastien Ros
bca5aee822 Merge branch 'refs/heads/1.10.x' into dev
# Conflicts:
#	src/Orchard.Web/Modules/Orchard.ContentPicker/Module.txt
#	src/Orchard.Web/Modules/Orchard.CustomForms/Module.txt
#	src/Orchard.Web/Modules/Orchard.Email/Services/SmtpMessageChannel.cs
#	src/Orchard.Web/Modules/Orchard.Fields/Module.txt
#	src/Orchard.Web/Modules/Orchard.Forms/Module.txt
#	src/Orchard.Web/Modules/Orchard.Localization/Module.txt
#	src/Orchard.Web/Modules/Orchard.Projections/Module.txt
#	src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.min.min.js
#	src/Orchard.Web/Modules/Orchard.TaskLease/Module.txt
#	src/Orchard.Web/Modules/Orchard.Tokens/Module.txt
2017-04-25 09:04:16 -07:00