lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-01-19 17:51:45 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
11,242 Commits 93 Branches 33 Tags
3649844b663a0152a2ee5a0b0c6f517e0aaf8710
Commit Graph

905 Commits

Author SHA1 Message Date
Jay Harris
3649844b66 Update Newtonsoft.Json, Microsoft.Owin, IdentityModel to latest (#8087) 2018-08-09 12:22:42 -07:00
Matteo Piovanelli
1f77745888 Concurrency fixes (#8054) 
Fixes #7720
Fixes #8019
Fixes #7708
Fixes #8025
Fixes #8028
Fixes #8040
Fixes #8052
 2018-05-17 12:17:44 -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
Carl Woodhouse
a992c1e74e Made shape placement parsing strategy extendable with providers (#7837) 2017-09-07 12:40:49 -07: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
Sebastien Ros
4a6d8a6530 Improving cache concurrency unit tests 2017-04-03 12:46:50 -07:00
Sebastien Ros
98e0b43c26 Updating version number 2017-04-03 12:21:56 -07: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
Sebastien Ros
17c7c77e3c Merge remote-tracking branch 'origin/1.10.x' into 1.10.2 2017-04-03 11:16:23 -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
514e4fa0d7 Implemented resource file hash-based cache busting. (#7564) 2017-03-07 21:49:06 +01:00
Lombiq
18b2c01768 Remove long obsoleted IRouteProvider.GetRoutes(), see #3177 2017-02-06 19:03:56 +01:00
Sebastien Ros
9b6c2315de Fixing unit tests 2017-01-24 11:40:20 -08:00
Sebastien Ros
68c10bce60 Improving IsLocalUrl 2017-01-24 08:50:12 -08:00
Chris Payne
34518b5ce2 Adds IDecorator functionality (#6233) 2016-12-15 12:54:22 -08:00
Lombiq
f89dfbf715 Extensions are not enabled any more if they can't actually be loaded, fixes #2437 2016-12-10 01:43:36 +01:00
Lombiq
72062399ed Merge branch '1.10.x' into dev 
# Conflicts:
#	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/HiddenFieldElementDriver.cs
#	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextFieldElementDriver.cs
#	src/Orchard/ContentManagement/IHqlCriterion.cs
 2016-11-24 23:47:27 +01:00
Marek Dzikiewicz
fab73d7157 LocalizationStreamParser should not fail on faulty PO files 
Closes #7387
 2016-11-14 10:56:47 -08:00
Sipke Schoorstra
83f02b26b6 Merge branch '1.10.x' into dev 2016-06-17 23:24:01 +02:00
Lombiq
3e2b5d5b82 Upgrading FluentNHibernate so it's sync with other assemblies to prevent exceptions when running tests. Fixes #6933. 2016-06-16 19:01:07 +02:00
Daniel Stolt
6a8a763f0d Merge branch '1.10.x' into dev. 2016-06-05 20:51:03 +02:00
Daniel Stolt
fbe5945ea6 Ignore DST in time zone conversion for time-only DateTime fields. Fixes #6731. 2016-06-05 20:45:10 +02:00
Sebastien Ros
c8a4def111 Merge branch '1.10.x' into dev 
# Conflicts:
#	src/Gulpfile.js
#	src/Orchard.Web/Core/Common/Views/EditorTemplates/Fields.Common.Text.Edit.cshtml
#	src/Orchard.Web/Modules/Orchard.ContentPicker/Module.txt
#	src/Orchard.Web/Modules/Orchard.CustomForms/Module.txt
#	src/Orchard.Web/Modules/Orchard.Fields/Module.txt
#	src/Orchard.Web/Modules/Orchard.Fields/Views/DefinitionTemplates/EnumerationFieldSettings.cshtml
#	src/Orchard.Web/Modules/Orchard.Fields/Views/DefinitionTemplates/NumericFieldSettings.cshtml
#	src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Link.Edit.cshtml
#	src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Numeric.Edit.cshtml
#	src/Orchard.Web/Modules/Orchard.Forms/Module.txt
#	src/Orchard.Web/Modules/Orchard.Projections/Module.txt
#	src/Orchard.Web/Modules/Orchard.TaskLease/Module.txt
#	src/Orchard.Web/Modules/Orchard.Tokens/Module.txt
#	src/Package.json
 2016-05-05 17:45:57 -07:00
Arjan Noordende
dcca575fc3 Implemented CdnSupportsSsl in Orchard UI Resources 
Fixes #6831
 2016-04-29 09:06:31 -07:00
Sebastien Ros
2b3451cd13 Updating version numbers to 1.10.1 2016-04-26 10:12:18 -07:00
Daniel Stolt
ef6c7b4d3f Merge remote-tracking branch 'origin/1.10.x' into dev 
# Conflicts:
#	Orchard.proj
 2016-04-14 19:06:06 +02:00
Sipke Schoorstra
06422f9e63 Removed unnecessary YamlService. 
Instead we can use the NuGet package directly.
 2016-04-12 21:53:12 +02:00
Sipke Schoorstra
c05b2546f1 Revert "Removed unnecessary YamlService." 
This reverts commit fef3fbfbe7.
 2016-04-12 21:46:19 +02:00
Sipke Schoorstra
fef3fbfbe7 Removed unnecessary YamlService. 
Instead we can use the NuGet package directly.
 2016-04-12 21:29:44 +02:00
Sebastien Ros
a4f2e040b2 Merge branch '1.10.x' into dev 2016-04-11 16:09:28 -07:00
Sipke Schoorstra
a5605b7fbd Added support for snippet manifests 
Fixes #6672
 2016-04-11 16:08:44 -07:00
Lombiq
a198decc70 Updating Azure Tests 2016-03-31 13:17:20 -07:00
Sebastien Ros
8f2e9caa8f Merge branch '1.10.x' into dev 2016-03-31 11:45:38 -07:00
Sebastien Ros
2bfd3448a2 Using Nuget version of NUnit 2016-03-31 11:43:10 -07:00
Szymon Seliga
694aeb5062 #6410 Added NotifyType.Success and replaced most usages of NotifyType.Information with it. Added appropriate styles in css files. 
Some minor fixes - wrong notification types.

Conflicts:
	src/Orchard.Web/Modules/Orchard.ImportExport/Controllers/AdminController.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Controllers/TermAdminController.cs
	src/Orchard.Web/Modules/Orchard.Themes/Controllers/AdminController.cs

Contained in branches: dev#gitext://gotobranch/dev
Contained in no tag
 2016-03-22 21:19:50 +01:00
Szymon Seliga
4cda6672f9 Revert "#6140 Added NotifyType.Success and replaced most usages of NotifyType.Information with it. Added appropriate styles in css files." 
This reverts commit dd37d8693c.
 2016-03-22 21:19:09 +01:00
Szymon Seliga
dd37d8693c #6140 Added NotifyType.Success and replaced most usages of NotifyType.Information with it. Added appropriate styles in css files. 
Some minor fixes - wrong notification types.

Conflicts:
	src/Orchard.Web/Modules/Orchard.ImportExport/Controllers/AdminController.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Controllers/TermAdminController.cs
	src/Orchard.Web/Modules/Orchard.Themes/Controllers/AdminController.cs
 2016-03-22 21:16:39 +01:00
Daniel Stolt
28425b0a53 Retargeted NuGet references to targetFramework="net452". Fixes #6406. 2016-02-20 01:13:13 +01:00
Daniel Stolt
7e35b7c80b Retargeted remaining projects to .NET Framework 4.5.2. 2016-02-20 01:13:13 +01:00
Daniel Stolt
3f6fc4899e Retargeted NuGet references to targetFramework="net452". Fixes #6406. 2016-02-19 22:49:15 +01:00
Daniel Stolt
20c804163f Retargeted remaining projects to .NET Framework 4.5.2. 2016-02-19 21:05:13 +01:00
Sebastien Ros
9916037d8e Updating version numbers 2016-02-01 10:13:05 -08:00
Sebastien Ros
b3b4b38229 Merge branch '1.9.3' into 1.10 
Conflicts:
	src/Orchard.Web/Modules/Orchard.ContentPicker/Module.txt
	src/Orchard.Web/Modules/Orchard.CustomForms/Module.txt
	src/Orchard.Web/Modules/Orchard.Fields/Module.txt
	src/Orchard.Web/Modules/Orchard.Forms/Module.txt
	src/Orchard.Web/Modules/Orchard.Projections/Module.txt
	src/Orchard.Web/Modules/Orchard.TaskLease/Module.txt
	src/Orchard.Web/Modules/Orchard.Tokens/Module.txt
	src/Orchard.Web/Web.config
 2016-02-01 10:12:06 -08:00
Sebastien Ros
c890f5b5c6 Updating version number 2016-02-01 10:07:18 -08:00
Sebastien Ros
2d4c87d1d7 Fixing unit tests 2016-01-14 09:39:51 -08: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