lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 21:01:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
11,315 Commits 73 Branches 31 Tags 239 MiB
aced5c3e72
Commit Graph

201 Commits

Author SHA1 Message Date
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
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
185ad6b1eb Adding LangVersion 5 setting to each csproj's Debug and Release target (#7641) 
Fixes #7639
 2017-04-03 10:38:41 -07: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
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
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
74d8cf8e9a Line endings resolution 2015-12-15 11:55:23 +00:00
Rob King
3f72249654 Moved System.Web.Mvc to NuGet. Version change: None 2015-12-07 20:46:05 +00:00
Rob King
ff7c7148ac Moved WebApi to NuGet. Version change: None 2015-12-06 00:13:39 +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
Rob King
21b9cc7d11 Moved Moq to NuGet. Version change: 4.0.812 >>> 4.0.10827 2015-12-04 16:46:21 +00:00
Rob King
ae5cb595ef Moved Log4Net to NuGet. Version change: None - Package 2.0.3 contains DLL version 1.2.13 2015-12-04 16:33:23 +00:00
Rob King
fbf27540ea Moved IronRuby to NuGet. Version change: None 2015-12-04 12:45:37 +00:00
Rob King
9d20813f8f Moved Castle to NuGet. Version change: None 2015-12-04 12:32:41 +00:00
Rob King
929b6bb2c0 Moved Autofac to NuGet. Version change: None 2015-12-04 11:36:33 +00:00
Rob King
6df007561d Moved NUnit to NuGet. Version change: 2.5.2.9222 >>> 2.5.10.11092 2015-12-04 11:27:42 +00:00
Lombiq
680a9eb85b Fixing that some files had line endings mixed up (both LF and CRLF) 2015-12-03 00:10:12 +01:00
Sipke Schoorstra
c6a87f5228 Refactor renamed IMachineNameProvider. 2015-09-15 22:58:21 +01:00
Sipke Schoorstra
7ba273b4c4 Removed copy of SetupService from ImportExport. 
Refactored ISetupService and SetupContext to work with an actual Recipe object so that client code can control what recipe to use.
 2015-09-07 17:29:30 +01:00
Sebastien Ros
1c3e253edb Remove broken tests 2015-09-03 15:37:27 -07:00
Sebastien Ros
9ea87837c3 Refactoring locking strategy 
Adding support for tenants
Removed ThreadId field
Removed Count field
Optimized db access by using Monitor for the local machine/tenant checks
Removed Machine/Thread scopes
 2015-09-03 15:03:42 -07:00
Sipke Schoorstra
553a0e260a Merge branch 'dev' into feature/distributed-locking 
Conflicts:
	src/Orchard/Orchard.Framework.csproj
 2015-09-02 10:20:57 +01:00
Sipke Schoorstra
6c712a9840 Fixed bugs, refactored and polished distributed lock service. 
- Added machine and thread scoped locking.
- Added support for blocking acquisitions.
- Added thread synchronization when creating and committing nested transactions for lock record creation and updates.
 2015-08-21 15:22:32 +01:00
Sipke Schoorstra
61f1c3ae00 Simplified distributed locking implementation and did the following: 
- Added Support for re-entry
- Made TryAcquireLock method thread-safe.
- Changed the way locks are released by decreasing their ref count. A lock is expired if: a) ref count == 0 or b) ExpiredUtc lies in the past. It is no longer necessary to delete a lock record (but would be fine, maybe as a background task).
 2015-08-19 23:05:39 +01:00
Sipke Schoorstra
591a06e944 Merge branch 'dev' of https://github.com/OrchardCMS/Orchard into feature/auto-enable-dependencies 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Layouts/Module.txt
	src/Orchard/Environment/Extensions/IExtensionManager.cs
	src/Orchard/Orchard.Framework.csproj
 2015-08-12 15:24:36 +01:00
Sipke Schoorstra
77b8df516a Improved locking code. 
- Moved DatabaseLock into Framework and making it the default lock provider.
- Removed unnecessary thread synchronization code.
- Allowing multiple lock acquisitions from the same machine (simulating a "lease").
- Updated unit tests.
 2015-08-11 16:43:48 +01:00
Sipke Schoorstra
11f6ecc4d4 Added unit test for CompositionStrategy. 2015-08-11 12:56:18 +01:00
Sipke Schoorstra
97fcfd4e24 Added tests for DistributedService. 2015-08-10 16:27:04 +01:00
Sipke Schoorstra
16cd4e89c4 Added tests for DatabaseLock. 2015-08-10 15:24:18 +01:00
Sipke Schoorstra
98666530b4 #4097: Changed Import to accommodate expected behavior as defined as part of the issue. 
This formalizes what we decided should happen when importing recipes in combination with various possible statuses a content item can have and how the import affects this.
 2015-08-05 17:11:04 +01:00
Sebastien Ros
5fd02aacd9 Merge branch '1.9.x' into dev 
Conflicts:
	README.md
 2015-07-30 15:51:28 -07:00
Sebastien Ros
cc82bfcca0 Fixing duplicate session creation 2015-07-30 15:49:13 -07:00
Daniel Stolt
e054a833af Removed Orchard.Reports. 2015-07-09 11:43:04 +01:00
Sebastien Ros
1d6cb27d01 Merge branch '1.9.x' into dev 
Conflicts:
	README.md
	src/Orchard.Web/Modules/Orchard.DynamicForms/Controllers/FormController.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/CheckboxElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/EmailFieldElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/EnumerationElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/HiddenFieldElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/RadioButtonElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextAreaElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextFieldElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/HeadingElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/HtmlElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/MarkdownElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/TextElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Filters/TokensFilter.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
	src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Html.cshtml
	src/Orchard/Orchard.Framework.csproj
 2015-06-30 11:35:41 -07:00
Marek Dzikiewicz
6636527006 Add unit tests for #4154 and #5402 2015-06-23 11:44:46 +02: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
20c5b494cd By default, html-encode translation parameters 
Also ensure that any existing parameter is not double-encoded by
removing .Text when used as a translation parameter.
 2015-06-16 16:50:45 -07:00