lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-01-19 09:42:29 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
11,352 Commits 93 Branches 33 Tags
eababa3d13ac419f235f208658171e55ebbd68b9
Commit Graph

32 Commits

Author SHA1 Message Date
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
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
6bce539675 Farewell, CodePlex! (Press F to Pay Respects) 2019-02-19 20:42:13 +01: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
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
Benedek Farkas
cdcec3cd8b #7713: View compilation with MSBuild (#7732) 
Fixes #7713
 2017-06-29 21:10:51 +02:00
Sebastien Ros
eee341696d Merge branch '1.10.2' 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.Indexing/Services/IndexingTaskExecutor.cs
#	src/Orchard.Web/Modules/Orchard.Users/Views/Items/Content-User.Edit.cshtml
#	src/Orchard/Mvc/Routes/StandardExtensionRouteProvider.cs
 2017-04-03 11:54:43 -07:00
Benedek Farkas
185ad6b1eb Adding LangVersion 5 setting to each csproj's Debug and Release target (#7641) 
Fixes #7639
 2017-04-03 10:38:41 -07:00
Daniel Stolt
d3c82c2191 Merge branch '1.10.x' into dev 
# Conflicts:
#	src/Orchard.Web/Core/Orchard.Core.csproj
#	src/Orchard.Web/Modules/Orchard.Localization/Controllers/AdminController.cs
#	src/Orchard.Web/Modules/Orchard.Localization/Views/Parts/Localization.ContentTranslations.SummaryAdmin.cshtml
#	src/Orchard.Web/Modules/Orchard.Redis/OutputCache/RedisOutputCacheStorageProvider.cs
 2017-02-09 14:34:21 +01:00
Carl Woodhouse
8615422e27 Redis: Improving Redis extensions use of keys (#7532) (#5958 re-applied) 2017-01-24 15:25:08 +01:00
Jasmin Savard
6198a9d4fb Adding warning notification if Redis configuration string is not set 2016-05-26 12:51:59 -07:00
Arjan Noordende
e962410a72 AssemblyInfo build action Compile instead of Content with CodeGen update 
Fixes #5143
 2016-04-26 10:02:55 -07:00
Daniel Stolt
dec68d454c Updated code base to target .NET Framework 4.5.2. Fixes #5700. 2016-01-14 01:06:32 +01:00
Rob King
bc51f86582 Consolidate Iesi.Collections and commit binding redirects 2016-01-07 15:27:00 +00:00
Lombiq
7fa4783b1d Fixing leftover MVC references by changing them to also use packages 2016-01-06 01:04:40 +01:00
Rob King
74d8cf8e9a Line endings resolution 2015-12-15 11:55:23 +00:00
Rob King
faa2702310 Moved Redis to NuGet. Version change: None 2015-12-04 21:12:56 +00:00
Rob King
86fd4a0df5 Moved NHibernate to NuGet. Version change: None 2015-12-04 18:06:08 +00:00
Rob King
fe215587b1 Moved Newtonsoft.Json to NuGet. Version change: None 2015-12-04 17:32:50 +00:00
Sebastien Ros
6d58498b82 Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config
	src/Orchard.Web/Modules/Orchard.ImageEditor/Web.config
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
	src/Orchard/Localization/Text.cs
 2015-06-18 10:35:06 -07:00
Sebastien Ros
cd49d2ccf2 Updating ruleset location for all projects 2015-06-16 16:22:04 -07:00
Kees Damen
2cfcdfaa8b Fixed project references to Orchard.Core and Orchard.Framework 2015-04-16 16:23:12 +02:00
Sipke Schoorstra
9cf3cf5c15 #21060: Orchard.Redis - ITagCache. 
Work Item: 21060
 2015-02-21 17:12:26 +01:00
Piotr Szmyd
d7628aaf61 Moving extension methods to separate namespace. 2014-10-15 09:49:43 +02:00
Piotr Szmyd
219150bd20 Fixed solution file and corrected namespace in Orchard.Redis 2014-10-15 09:45:06 +02:00
Piotr Szmyd
b79f2e2db2 Implemented Redis-based cache provider. 2014-10-15 09:40:28 +02:00
Piotr Szmyd
044746d511 Lua scripts for efficient batch counting and removing keys. 2014-10-15 09:39:06 +02:00
Sebastien Ros
d0c7091964 Adding Orchard.Redis module 2014-09-30 16:25:49 -07:00