Commit Graph

294 Commits

Author SHA1 Message Date
Sipke Schoorstra
4418bcdc19 Fixed a bug in LayoutModelMapper.
If the root Canvas is manually instantiated, it will not have a valid ElementDescriptor.
2015-12-22 20:21:28 +01:00
Sipke Schoorstra
a492f89ea0 Further Layouts client-side scripting improvements.
- Pushed the editElement function further down from Content to Element, which means even less code for custom container elements.
- Fixed a bug where client-side element editor state would not be applied after editing that element.
- Pushed down the toObject function from Content to Element, which means less code is necessary for custom container elements.
-
2015-12-21 20:59:47 +01:00
Sipke Schoorstra
d1c0f98010 Updated Layouts to simplify custom container elements.
These changes simplifies the requirements for implementing custom container elements by minimizing the amount of code necessary to tie things together.
2015-12-21 19:48:59 +01:00
Sipke Schoorstra
68c94f4534 Fixed a potential issue with new Container elements.
Making the ContentModelMap the default mapper for all elements fixes a potential issue when a new Container element is introduced but no model map implementation exists for that container. Letting the ContentModelMap handle the mapping by default would yield best results rather than doing no mapping at all.
2015-12-20 16:33:34 +01:00
Sipke Schoorstra
9715ee88df Removed unnecessary Html model map.
The Html model mapping was originally needed to support inline editing of Html elements, but that capability has been removed.
2015-12-20 16:28:36 +01:00
sfmskywalker
72aa82c048 Merge branch '1.9.x' into dev
# Conflicts:
#	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutDesignerHost.js
2015-12-18 00:33:56 +01:00
Sipke Schoorstra
e72e6fcb1f Fixed layout editor javascript issue.
As per the comments in https://github.com/OrchardCMS/Orchard/pull/6159, the issue was that the layout designer host has a dependency on the layout editor object, but the former would be created before the latter.
This changeset moves the initialization code together in order to control the order in which what object is created first.
2015-12-15 22:35:29 +01:00
Lombiq
44841416cc Merge branch 'refs/heads/1.9.x' into dev
Conflicts:
	ClickToBuild.cmd
	Orchard.proj
	lib/msbuild/MSBuild.Community.Tasks.Targets
	lib/newtonsoft.json/Newtonsoft.Json.xml
	lib/windowsazure/Microsoft.WindowsAzure.Diagnostics.xml
	src/Orchard.Azure.Tests/Orchard.Azure.Tests.csproj
	src/Orchard.Azure/Orchard.Azure.Web/Config/Host.config
	src/Orchard.Azure/Orchard.Azure.Web/Config/HostComponents.config
	src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
	src/Orchard.Azure/Orchard.Azure.Web/Web.config
	src/Orchard.Azure/Orchard.Azure.sln
	src/Orchard.Core.Tests/Body/BodyPartTests.cs
	src/Orchard.Core.Tests/Common/Providers/CommonPartProviderTests.cs
	src/Orchard.Core.Tests/Orchard.Core.Tests.csproj
	src/Orchard.Profile/profiling-setup-commands.txt
	src/Orchard.Specs/Bindings/OrchardSiteFactory.cs
	src/Orchard.Specs/Blogs.feature
	src/Orchard.Specs/Blogs.feature.cs
	src/Orchard.Specs/Comments.feature
	src/Orchard.Specs/Comments.feature.cs
	src/Orchard.Specs/Hosting/Orchard.Web/Config/Host.config
	src/Orchard.Specs/Hosting/Orchard.Web/Web.config
	src/Orchard.Specs/Hosting/Simple.Web/Web.config
	src/Orchard.Specs/Lists.feature
	src/Orchard.Specs/Lists.feature.cs
	src/Orchard.Specs/Media.feature
	src/Orchard.Specs/Media.feature.cs
	src/Orchard.Specs/MultiTenancy.feature
	src/Orchard.Specs/MultiTenancy.feature.cs
	src/Orchard.Specs/Orchard.Specs.csproj
	src/Orchard.Specs/Pages.feature
	src/Orchard.Specs/Pages.feature.cs
	src/Orchard.Specs/PermissionModel.feature
	src/Orchard.Specs/PermissionModel.feature.cs
	src/Orchard.Specs/Setup.feature
	src/Orchard.Specs/Setup.feature.cs
	src/Orchard.Specs/Tags.feature
	src/Orchard.Specs/Tags.feature.cs
	src/Orchard.Specs/Users.feature
	src/Orchard.Specs/Users.feature.cs
	src/Orchard.Tests.Modules/Comments/Services/CommentServiceTests.cs
	src/Orchard.Tests.Modules/Conditions/Providers/UrlRuleConditionTest.cs
	src/Orchard.Tests.Modules/DatabaseEnabledTestsBase.cs
	src/Orchard.Tests.Modules/ImportExport/Services/ImportExportServiceTests.cs
	src/Orchard.Tests.Modules/Media/Services/MediaServiceTests.cs
	src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj
	src/Orchard.Tests.Modules/Recipes/RecipeHandlers/ModuleStepTest.cs
	src/Orchard.Tests.Modules/Recipes/RecipeHandlers/ThemeStepTest.cs
	src/Orchard.Tests.Modules/Recipes/Services/RecipeManagerTests.cs
	src/Orchard.Tests.Modules/Users/Controllers/AccountControllerTests.cs
	src/Orchard.Tests.Modules/Users/Services/MembershipServiceTests.cs
	src/Orchard.Tests.Modules/Widgets/WidgetsTests.cs
	src/Orchard.Tests/App.config
	src/Orchard.Tests/ContainerTestBase.cs
	src/Orchard.Tests/ContentManagement/ContentQueryTests.cs
	src/Orchard.Tests/ContentManagement/DefaultContentManagerTests.cs
	src/Orchard.Tests/ContentManagement/DynamicContentQueryTests.cs
	src/Orchard.Tests/ContentManagement/HqlExpressionTests.cs
	src/Orchard.Tests/DataMigration/SchemaBuilderTests.cs
	src/Orchard.Tests/DataMigration/Utilities/NullInterpreter.cs
	src/Orchard.Tests/DatabaseEnabledTestsBase.cs
	src/Orchard.Tests/DisplayManagement/DefaultDisplayManagerTests.cs
	src/Orchard.Tests/DisplayManagement/Descriptors/ShapeAttributeBindingStrategyTests.cs
	src/Orchard.Tests/Environment/DefaultOrchardHostTests.cs
	src/Orchard.Tests/Environment/Extensions/ExtensionLoaderCoordinatorTests.cs
	src/Orchard.Tests/Environment/Extensions/ExtensionManagerTests.cs
	src/Orchard.Tests/Environment/Loaders/DynamicExtensionLoaderTests.cs
	src/Orchard.Tests/Orchard.Framework.Tests.csproj
	src/Orchard.Tests/Stubs/StubReportsCoordinator.cs
	src/Orchard.Tests/Stubs/StubWorkContextAccessor.cs
	src/Orchard.Tests/Time/TimeZoneSelectorTests.cs
	src/Orchard.Web.Tests/Orchard.Web.Tests.csproj
	src/Orchard.Web/Config/Host.config
	src/Orchard.Web/Config/HostComponents.config
	src/Orchard.Web/Config/log4net.config
	src/Orchard.Web/Core/Common/DateEditor/DateEditorHandler.cs
	src/Orchard.Web/Core/Common/Drivers/BodyPartDriver.cs
	src/Orchard.Web/Core/Common/Drivers/IdentityPartDriver.cs
	src/Orchard.Web/Core/Common/Drivers/TextFieldDriver.cs
	src/Orchard.Web/Core/Common/Handlers/BodyPartHandler.cs
	src/Orchard.Web/Core/Common/Handlers/CommonPartHandler.cs
	src/Orchard.Web/Core/Common/Handlers/IdentityPartHandler.cs
	src/Orchard.Web/Core/Common/Migrations.cs
	src/Orchard.Web/Core/Common/Models/CommonPart.cs
	src/Orchard.Web/Core/Common/Models/CommonPartVersionRecord.cs
	src/Orchard.Web/Core/Common/Services/IdentifierResolverSelector.cs
	src/Orchard.Web/Core/Common/Utilities/LazyField.cs
	src/Orchard.Web/Core/Common/Views/CommonMetadataOwner.cshtml
	src/Orchard.Web/Core/Common/Views/Parts.Common.Metadata.SummaryAdmin.cshtml
	src/Orchard.Web/Core/Containers/Models/ContainerPart.cs
	src/Orchard.Web/Core/Containers/ViewModels/ContainerViewModel.cs
	src/Orchard.Web/Core/Containers/Views/EditorTemplates/ContainerWidget.cshtml
	src/Orchard.Web/Core/Contents/Controllers/ItemController.cs
	src/Orchard.Web/Core/Contents/Security/AuthorizationEventHandler.cs
	src/Orchard.Web/Core/Contents/Views/Admin/List.cshtml
	src/Orchard.Web/Core/Contents/Views/Content.Edit.cshtml
	src/Orchard.Web/Core/Dashboard/Views/Admin/Index.cshtml
	src/Orchard.Web/Core/Feeds/Rss/RssFeedBuilder.cs
	src/Orchard.Web/Core/Feeds/Services/FeedFilter.cs
	src/Orchard.Web/Core/Feeds/Services/FeedManager.cs
	src/Orchard.Web/Core/Feeds/StandardBuilders/CorePartsFeedItemBuilder.cs
	src/Orchard.Web/Core/Feeds/StandardQueries/ContainerFeedQuery.cs
	src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs
	src/Orchard.Web/Core/Navigation/Drivers/AdminMenuPartDriver.cs
	src/Orchard.Web/Core/Navigation/Drivers/MenuItemPartDriver.cs
	src/Orchard.Web/Core/Navigation/Drivers/MenuPartDriver.cs
	src/Orchard.Web/Core/Navigation/Handlers/AdminMenuPartHandler.cs
	src/Orchard.Web/Core/Navigation/Handlers/MenuHandler.cs
	src/Orchard.Web/Core/Navigation/Handlers/MenuPartHandler.cs
	src/Orchard.Web/Core/Navigation/Scripts/navigation-admin.js
	src/Orchard.Web/Core/Navigation/Services/AdminMenuNavigationProvider.cs
	src/Orchard.Web/Core/Navigation/Services/MainMenuService.cs
	src/Orchard.Web/Core/Navigation/Services/NavigationManager.cs
	src/Orchard.Web/Core/Navigation/Styles/navigation-admin.css
	src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml
	src/Orchard.Web/Core/Navigation/Views/MenuItem.Edit.cshtml
	src/Orchard.Web/Core/Orchard.Core.csproj
	src/Orchard.Web/Core/Scheduling/Services/ScheduledTaskExecutor.cs
	src/Orchard.Web/Core/Scheduling/Services/ScheduledTaskManager.cs
	src/Orchard.Web/Core/Settings/Drivers/SiteSettingsPartDriver.cs
	src/Orchard.Web/Core/Settings/Handlers/SiteSettingsPartHandler.cs
	src/Orchard.Web/Core/Settings/Migrations.cs
	src/Orchard.Web/Core/Settings/Services/SiteService.cs
	src/Orchard.Web/Core/Settings/State/ShellStateManager.cs
	src/Orchard.Web/Core/Shapes/CoreShapes.cs
	src/Orchard.Web/Core/Shapes/DateTimeShapes.cs
	src/Orchard.Web/Core/Shapes/ResourceManifest.cs
	src/Orchard.Web/Core/Shapes/Scripts/base.js
	src/Orchard.Web/Modules/Lucene/Lucene.csproj
	src/Orchard.Web/Modules/Markdown/Markdown.csproj
	src/Orchard.Web/Modules/Orchard.Alias/AdminMenu.cs
	src/Orchard.Web/Modules/Orchard.Alias/Controllers/AdminController.cs
	src/Orchard.Web/Modules/Orchard.Alias/IAliasService.cs
	src/Orchard.Web/Modules/Orchard.Alias/Implementation/AliasRoute.cs
	src/Orchard.Web/Modules/Orchard.Alias/Implementation/DefaultAliasService.cs
	src/Orchard.Web/Modules/Orchard.Alias/Implementation/Holder/AliasInfo.cs
	src/Orchard.Web/Modules/Orchard.Alias/Implementation/Holder/IAliasHolder.cs
	src/Orchard.Web/Modules/Orchard.Alias/Implementation/Map/AliasMap.cs
	src/Orchard.Web/Modules/Orchard.Alias/Implementation/Storage/AliasStorage.cs
	src/Orchard.Web/Modules/Orchard.Alias/Implementation/Utils.cs
	src/Orchard.Web/Modules/Orchard.Alias/Migrations.cs
	src/Orchard.Web/Modules/Orchard.Alias/Orchard.Alias.csproj
	src/Orchard.Web/Modules/Orchard.Alias/Records/AliasRecord.cs
	src/Orchard.Web/Modules/Orchard.Alias/Routes.cs
	src/Orchard.Web/Modules/Orchard.Alias/ViewModels/AdminIndexViewModel.cs
	src/Orchard.Web/Modules/Orchard.Alias/Views/Admin/Add.cshtml
	src/Orchard.Web/Modules/Orchard.Alias/Views/Admin/Delete.cshtml
	src/Orchard.Web/Modules/Orchard.Alias/Views/Admin/Edit.cshtml
	src/Orchard.Web/Modules/Orchard.Alias/Views/Admin/Index.cshtml
	src/Orchard.Web/Modules/Orchard.Alias/Web.config
	src/Orchard.Web/Modules/Orchard.AntiSpam/Drivers/ReCaptchaPartDriver.cs
	src/Orchard.Web/Modules/Orchard.AntiSpam/Handlers/AkismetSettingsPartHandler.cs
	src/Orchard.Web/Modules/Orchard.AntiSpam/Handlers/ReCaptchaSettingsPartHandler.cs
	src/Orchard.Web/Modules/Orchard.AntiSpam/Handlers/TypePadSettingsPartHandler.cs
	src/Orchard.Web/Modules/Orchard.AntiSpam/Module.txt
	src/Orchard.Web/Modules/Orchard.AntiSpam/Orchard.AntiSpam.csproj
	src/Orchard.Web/Modules/Orchard.AntiSpam/ViewModels/ReCaptchaPartEditViewModel.cs
	src/Orchard.Web/Modules/Orchard.AntiSpam/Views/EditorTemplates/Parts.ReCaptcha.Fields.cshtml
	src/Orchard.Web/Modules/Orchard.AntiSpam/Web.config
	src/Orchard.Web/Modules/Orchard.ArchiveLater/Handlers/ArchiveLaterPartHandler.cs
	src/Orchard.Web/Modules/Orchard.ArchiveLater/Handlers/UnpublishingTaskHandler.cs
	src/Orchard.Web/Modules/Orchard.ArchiveLater/Orchard.ArchiveLater.csproj
	src/Orchard.Web/Modules/Orchard.Autoroute/Drivers/AutoroutePartDriver.cs
	src/Orchard.Web/Modules/Orchard.Autoroute/Handlers/AutoroutePartHandler.cs
	src/Orchard.Web/Modules/Orchard.Autoroute/Migrations.cs
	src/Orchard.Web/Modules/Orchard.Autoroute/Models/AutoroutePart.cs
	src/Orchard.Web/Modules/Orchard.Autoroute/Models/AutoroutePartRecord.cs
	src/Orchard.Web/Modules/Orchard.Autoroute/Orchard.Autoroute.csproj
	src/Orchard.Web/Modules/Orchard.Autoroute/Providers/SlugTokens.cs
	src/Orchard.Web/Modules/Orchard.Autoroute/ResourceManifest.cs
	src/Orchard.Web/Modules/Orchard.Autoroute/Services/AliasResolverSelector.cs
	src/Orchard.Web/Modules/Orchard.Autoroute/Services/AutorouteService.cs
	src/Orchard.Web/Modules/Orchard.Autoroute/Services/DefaultSlugService.cs
	src/Orchard.Web/Modules/Orchard.Autoroute/Services/IAutorouteService.cs
	src/Orchard.Web/Modules/Orchard.Autoroute/Settings/AutorouteSettings.cs
	src/Orchard.Web/Modules/Orchard.Autoroute/Settings/AutorouteSettingsEvents.cs
	src/Orchard.Web/Modules/Orchard.Autoroute/Settings/RoutePattern.cs
	src/Orchard.Web/Modules/Orchard.Autoroute/Styles/orchard-autoroute-settings.css
	src/Orchard.Web/Modules/Orchard.Autoroute/ViewModels/AutoroutePartEditViewModel.cs
	src/Orchard.Web/Modules/Orchard.Autoroute/Views/DefinitionTemplates/AutorouteSettings.cshtml
	src/Orchard.Web/Modules/Orchard.Autoroute/Views/EditorTemplates/Parts.Autoroute.Edit.cshtml
	src/Orchard.Web/Modules/Orchard.Autoroute/Web.config
	src/Orchard.Web/Modules/Orchard.Azure/Constants.cs
	src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj
	src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/Configuration/AzureBlobShellSettingsManager.cs
	src/Orchard.Web/Modules/Orchard.Azure/Services/FileSystems/Media/AzureBlobStorageProvider.cs
	src/Orchard.Web/Modules/Orchard.Azure/Web.config
	src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs
	src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPostPartDriver.cs
	src/Orchard.Web/Modules/Orchard.Blogs/Drivers/RemoteBlogPublishingDriver.cs
	src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogArchivesPartHandler.cs
	src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogPartArchiveHandler.cs
	src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogPartHandler.cs
	src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogPostPartHandler.cs
	src/Orchard.Web/Modules/Orchard.Blogs/Handlers/RecentBlogPostsPartHandler.cs
	src/Orchard.Web/Modules/Orchard.Blogs/Migrations.cs
	src/Orchard.Web/Modules/Orchard.Blogs/Module.txt
	src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
	src/Orchard.Web/Modules/Orchard.Blogs/Routing/ArchiveConstraint.CS
	src/Orchard.Web/Modules/Orchard.Blogs/Routing/RsdConstraint.CS
	src/Orchard.Web/Modules/Orchard.Blogs/Security/BlogAuthorizationEventHandler.cs
	src/Orchard.Web/Modules/Orchard.Blogs/Services/BlogPostService.cs
	src/Orchard.Web/Modules/Orchard.Blogs/Services/BlogService.cs
	src/Orchard.Web/Modules/Orchard.Blogs/Services/XmlRpcHandler.cs
	src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/List.cshtml
	src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.BlogPost.ListAdmin.cshtml
	src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleRootWebConfig.txt
	src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs
	src/Orchard.Web/Modules/Orchard.CodeGeneration/Orchard.CodeGeneration.csproj
	src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentPartDriver.cs
	src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentsContainerPartDriver.cs
	src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentsPartDriver.cs
	src/Orchard.Web/Modules/Orchard.Comments/Feeds/CommentFeedItemBuilder.cs
	src/Orchard.Web/Modules/Orchard.Comments/Feeds/CommentedOnContainerFeedQuery.cs
	src/Orchard.Web/Modules/Orchard.Comments/Feeds/CommentedOnFeedQuery.cs
	src/Orchard.Web/Modules/Orchard.Comments/Handlers/CommentPartHandler.cs
	src/Orchard.Web/Modules/Orchard.Comments/Handlers/CommentSettingsPartHandler.cs
	src/Orchard.Web/Modules/Orchard.Comments/Handlers/CommentsPartHandler.cs
	src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj
	src/Orchard.Web/Modules/Orchard.Comments/Services/CommentService.cs
	src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.Comment.cshtml
	src/Orchard.Web/Modules/Orchard.Conditions/Providers/UrlCondition.cs
	src/Orchard.Web/Modules/Orchard.ContentPermissions/Drivers/ContentPermissionsPartDriver.cs
	src/Orchard.Web/Modules/Orchard.ContentPermissions/Orchard.ContentPermissions.csproj
	src/Orchard.Web/Modules/Orchard.ContentPermissions/Web.config
	src/Orchard.Web/Modules/Orchard.ContentPicker/Drivers/ContentMenuItemPartDriver.cs
	src/Orchard.Web/Modules/Orchard.ContentPicker/Handlers/ContentMenuItemPartHandler.cs
	src/Orchard.Web/Modules/Orchard.ContentPicker/Handlers/ContentPickerFieldHandler.cs
	src/Orchard.Web/Modules/Orchard.ContentPicker/Handlers/NavigationPartHandler.cs
	src/Orchard.Web/Modules/Orchard.ContentPicker/Orchard.ContentPicker.csproj
	src/Orchard.Web/Modules/Orchard.ContentPicker/Web.config
	src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj
	src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.sln
	src/Orchard.Web/Modules/Orchard.ContentTypes/Services/ContentDefinitionService.cs
	src/Orchard.Web/Modules/Orchard.CustomForms/Module.txt
	src/Orchard.Web/Modules/Orchard.CustomForms/Orchard.CustomForms.csproj
	src/Orchard.Web/Modules/Orchard.CustomForms/Security/AuthorizationEventHandler.cs
	src/Orchard.Web/Modules/Orchard.CustomForms/Web.config
	src/Orchard.Web/Modules/Orchard.DesignerTools/Module.txt
	src/Orchard.Web/Modules/Orchard.DesignerTools/Orchard.DesignerTools.csproj
	src/Orchard.Web/Modules/Orchard.DesignerTools/Services/UrlAlternatesFactory.cs
	src/Orchard.Web/Modules/Orchard.DesignerTools/Web.config
	src/Orchard.Web/Modules/Orchard.Email/Handlers/SmtpSettingsPartHandler.cs
	src/Orchard.Web/Modules/Orchard.Email/Models/SmtpSettingsPart.cs
	src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj
	src/Orchard.Web/Modules/Orchard.Email/Views/EditorTemplates/Parts/SmtpSettings.cshtml
	src/Orchard.Web/Modules/Orchard.Fields/Drivers/BooleanFieldDriver.cs
	src/Orchard.Web/Modules/Orchard.Fields/Drivers/DateTimeFieldDriver.cs
	src/Orchard.Web/Modules/Orchard.Fields/Drivers/EnumerationFieldDriver.cs
	src/Orchard.Web/Modules/Orchard.Fields/Drivers/InputFieldDriver.cs
	src/Orchard.Web/Modules/Orchard.Fields/Drivers/LinkFieldDriver.cs
	src/Orchard.Web/Modules/Orchard.Fields/Drivers/NumericFieldDriver.cs
	src/Orchard.Web/Modules/Orchard.Fields/Module.txt
	src/Orchard.Web/Modules/Orchard.Fields/Orchard.Fields.csproj
	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.ImageEditor/Orchard.ImageEditor.csproj
	src/Orchard.Web/Modules/Orchard.ImageEditor/Web.config
	src/Orchard.Web/Modules/Orchard.ImportExport/Commands/ImportExportCommands.cs
	src/Orchard.Web/Modules/Orchard.ImportExport/Controllers/AdminController.cs
	src/Orchard.Web/Modules/Orchard.ImportExport/Models/ExportOptions.cs
	src/Orchard.Web/Modules/Orchard.ImportExport/Module.txt
	src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj
	src/Orchard.Web/Modules/Orchard.ImportExport/Services/ICustomExportStep.cs
	src/Orchard.Web/Modules/Orchard.ImportExport/Services/IExportEventHandler.cs
	src/Orchard.Web/Modules/Orchard.ImportExport/Services/IImportExportService.cs
	src/Orchard.Web/Modules/Orchard.ImportExport/Services/ImportExportService.cs
	src/Orchard.Web/Modules/Orchard.ImportExport/ViewModels/ExportViewModel.cs
	src/Orchard.Web/Modules/Orchard.ImportExport/ViewModels/ImportViewModel.cs
	src/Orchard.Web/Modules/Orchard.ImportExport/Views/Admin/Export.cshtml
	src/Orchard.Web/Modules/Orchard.ImportExport/Views/Admin/Import.cshtml
	src/Orchard.Web/Modules/Orchard.ImportExport/Views/Admin/ImportResult.cshtml
	src/Orchard.Web/Modules/Orchard.Indexing/Commands/IndexingCommands.cs
	src/Orchard.Web/Modules/Orchard.Indexing/Migrations.cs
	src/Orchard.Web/Modules/Orchard.Indexing/Module.txt
	src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj
	src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexingBackgroundTask.cs
	src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexingTaskExecutor.cs
	src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexingTaskManager.cs
	src/Orchard.Web/Modules/Orchard.Indexing/Settings/EditorEvents.cs
	src/Orchard.Web/Modules/Orchard.Indexing/Views/Admin/Create.cshtml
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
	src/Orchard.Web/Modules/Orchard.Lists/Migrations.cs
	src/Orchard.Web/Modules/Orchard.Lists/Orchard.Lists.csproj
	src/Orchard.Web/Modules/Orchard.Lists/Web.config
	src/Orchard.Web/Modules/Orchard.Localization/Drivers/LocalizationPartDriver.cs
	src/Orchard.Web/Modules/Orchard.Localization/Handlers/LocalizationPartHandler.cs
	src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj
	src/Orchard.Web/Modules/Orchard.Media/Handlers/MediaSettingsPartHandler.cs
	src/Orchard.Web/Modules/Orchard.Media/Module.txt
	src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj
	src/Orchard.Web/Modules/Orchard.Media/Services/MediaService.cs
	src/Orchard.Web/Modules/Orchard.Media/Services/XmlRpcHandler.cs
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/ClientStorageController.cs
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Factories/ImageFactory.cs
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Handlers/MediaPartHandler.cs
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Handlers/WebSearchSettingsPartHandler.cs
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Module.txt
	src/Orchard.Web/Modules/Orchard.MediaLibrary/ResourceManifest.cs
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Services/MediaLibraryService.cs
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Admin/Import.cshtml
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Admin/Index.cshtml
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/ClientStorage/Index.cshtml
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/EditorTemplates/Parts/WebSearch.WebSearchSettings.cshtml
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Fields/MediaLibraryPicker.SummaryAdmin.cshtml
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Fields/MediaLibraryPicker.cshtml
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/WebSearch/Index.cshtml
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Web.config
	src/Orchard.Web/Modules/Orchard.MediaPicker/Handlers/MediaGalleryFieldHandler.cs
	src/Orchard.Web/Modules/Orchard.MediaPicker/Module.txt
	src/Orchard.Web/Modules/Orchard.MediaPicker/Orchard.MediaPicker.csproj
	src/Orchard.Web/Modules/Orchard.MediaProcessing/Handlers/ImageProfilePartHandler.cs
	src/Orchard.Web/Modules/Orchard.MediaProcessing/Orchard.MediaProcessing.csproj
	src/Orchard.Web/Modules/Orchard.MediaProcessing/Services/IImageProfileManager.cs
	src/Orchard.Web/Modules/Orchard.MediaProcessing/Services/ImageProfileManager.cs
	src/Orchard.Web/Modules/Orchard.MediaProcessing/Services/ImageProfileService.cs
	src/Orchard.Web/Modules/Orchard.MediaProcessing/Web.config
	src/Orchard.Web/Modules/Orchard.Migrations/Orchard.Migrations.csproj
	src/Orchard.Web/Modules/Orchard.Modules/Controllers/AdminController.cs
	src/Orchard.Web/Modules/Orchard.Modules/Module.txt
	src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj
	src/Orchard.Web/Modules/Orchard.Modules/Recipes/Executors/FeatureStep.cs
	src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.cshtml
	src/Orchard.Web/Modules/Orchard.Modules/styles/orchard-modules-admin.css
	src/Orchard.Web/Modules/Orchard.MultiTenancy/Commands/TenantCommand.cs
	src/Orchard.Web/Modules/Orchard.MultiTenancy/Controllers/AdminController.cs
	src/Orchard.Web/Modules/Orchard.MultiTenancy/Extensions/UrlHelperExtensions.cs
	src/Orchard.Web/Modules/Orchard.MultiTenancy/Module.txt
	src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj
	src/Orchard.Web/Modules/Orchard.MultiTenancy/Services/ITenantService.cs
	src/Orchard.Web/Modules/Orchard.MultiTenancy/Services/TenantService.cs
	src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Add.cshtml
	src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForDisabled.cshtml
	src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForRunning.cshtml
	src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Edit.cshtml
	src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Index.cshtml
	src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs
	src/Orchard.Web/Modules/Orchard.OutputCache/Handlers/CacheSettingsPartHandler.cs
	src/Orchard.Web/Modules/Orchard.OutputCache/Orchard.OutputCache.csproj
	src/Orchard.Web/Modules/Orchard.OutputCache/Services/DefaultCacheStorageProvider.cs
	src/Orchard.Web/Modules/Orchard.OutputCache/Web.config
	src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryUpdatesController.cs
	src/Orchard.Web/Modules/Orchard.Packaging/Controllers/PackagingServicesController.cs
	src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj
	src/Orchard.Web/Modules/Orchard.Pages/Commands/PageCommands.cs
	src/Orchard.Web/Modules/Orchard.Pages/Migrations.cs
	src/Orchard.Web/Modules/Orchard.Pages/Module.txt
	src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj
	src/Orchard.Web/Modules/Orchard.Projections/Controllers/LayoutController.cs
	src/Orchard.Web/Modules/Orchard.Projections/Drivers/ProjectionPartDriver.cs
	src/Orchard.Web/Modules/Orchard.Projections/Drivers/QueryPartDriver.cs
	src/Orchard.Web/Modules/Orchard.Projections/Migrations.cs
	src/Orchard.Web/Modules/Orchard.Projections/Orchard.Projections.csproj
	src/Orchard.Web/Modules/Orchard.Projections/Providers/Layouts/GridLayout.cs
	src/Orchard.Web/Modules/Orchard.Projections/Providers/Layouts/ListLayout.cs
	src/Orchard.Web/Modules/Orchard.Projections/Providers/Layouts/RawLayout.cs
	src/Orchard.Web/Modules/Orchard.Projections/Tests/Orchard.Projections.Tests.csproj
	src/Orchard.Web/Modules/Orchard.Projections/Views/Admin/Index.cshtml
	src/Orchard.Web/Modules/Orchard.Projections/Web.config
	src/Orchard.Web/Modules/Orchard.PublishLater/Drivers/PublishLaterPartDriver.cs
	src/Orchard.Web/Modules/Orchard.PublishLater/Handlers/PublishLaterPartHandler.cs
	src/Orchard.Web/Modules/Orchard.PublishLater/Handlers/PublishingTaskHandler.cs
	src/Orchard.Web/Modules/Orchard.PublishLater/Orchard.PublishLater.csproj
	src/Orchard.Web/Modules/Orchard.PublishLater/Services/PublishingTaskManager.cs
	src/Orchard.Web/Modules/Orchard.Recipes/Commands/RecipesCommands.cs
	src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj
	src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/CommandStep.cs
	src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/ModuleStep.cs
	src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/SettingsStep.cs
	src/Orchard.Web/Modules/Orchard.Recipes/RecipeHandlers/DataRecipeHandler.cs
	src/Orchard.Web/Modules/Orchard.Recipes/RecipeHandlers/MetaDataRecipeHandler.cs
	src/Orchard.Web/Modules/Orchard.Recipes/RecipeHandlers/MigrationRecipeHandler.cs
	src/Orchard.Web/Modules/Orchard.Recipes/Services/RecipeHarvester.cs
	src/Orchard.Web/Modules/Orchard.Recipes/Services/RecipeJournalManager.cs
	src/Orchard.Web/Modules/Orchard.Recipes/Services/RecipeManager.cs
	src/Orchard.Web/Modules/Orchard.Recipes/Services/RecipeParser.cs
	src/Orchard.Web/Modules/Orchard.Recipes/Services/RecipeScheduler.cs
	src/Orchard.Web/Modules/Orchard.Recipes/Services/RecipeStepExecutor.cs
	src/Orchard.Web/Modules/Orchard.Recipes/Services/RecipeStepQueue.cs
	src/Orchard.Web/Modules/Orchard.Roles/DefaultRoleUpdater.cs
	src/Orchard.Web/Modules/Orchard.Roles/Drivers/UserRolesPartDriver.cs
	src/Orchard.Web/Modules/Orchard.Roles/Handlers/UserRolesPartHandler.cs
	src/Orchard.Web/Modules/Orchard.Roles/Module.txt
	src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj
	src/Orchard.Web/Modules/Orchard.Roles/Services/RoleService.cs
	src/Orchard.Web/Modules/Orchard.Roles/Services/RolesBasedAuthorizationService.cs
	src/Orchard.Web/Modules/Orchard.Rules/Handlers/ScheduledActionTaskHandler.cs
	src/Orchard.Web/Modules/Orchard.Rules/Handlers/ScheduledActionTaskPartHandler.cs
	src/Orchard.Web/Modules/Orchard.Rules/ImportExport/RulesCustomExportStep.cs
	src/Orchard.Web/Modules/Orchard.Rules/ImportExport/RulesRecipeHandler.cs
	src/Orchard.Web/Modules/Orchard.Rules/Module.txt
	src/Orchard.Web/Modules/Orchard.Rules/Orchard.Rules.csproj
	src/Orchard.Web/Modules/Orchard.Rules/Recipes/Builders/RulesStep.cs
	src/Orchard.Web/Modules/Orchard.Rules/Web.config
	src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Orchard.Scripting.CSharp.csproj
	src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Web.config
	src/Orchard.Web/Modules/Orchard.Search/Controllers/AdminController.cs
	src/Orchard.Web/Modules/Orchard.Search/Controllers/ContentPickerController.cs
	src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs
	src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchFormPartDriver.cs
	src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchSettingsPartDriver.cs
	src/Orchard.Web/Modules/Orchard.Search/Handlers/SearchSettingsPartHandler.cs
	src/Orchard.Web/Modules/Orchard.Search/Models/SearchFormPart.cs
	src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
	src/Orchard.Web/Modules/Orchard.Search/Placement.info
	src/Orchard.Web/Modules/Orchard.Search/ResourceManifest.cs
	src/Orchard.Web/Modules/Orchard.Search/Routes.cs
	src/Orchard.Web/Modules/Orchard.Search/Styles/orchard-search-admin.css
	src/Orchard.Web/Modules/Orchard.Search/Styles/orchard-search-search.css
	src/Orchard.Web/Modules/Orchard.Search/ViewModels/SearchSettingsIndexViewModel.cs
	src/Orchard.Web/Modules/Orchard.Search/Views/EditorTemplates/Parts/Search.SiteSettings.cshtml
	src/Orchard.Web/Modules/Orchard.Search/Views/Parts/Search.SearchForm.cshtml
	src/Orchard.Web/Modules/Orchard.Setup/Commands/SetupCommand.cs
	src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs
	src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupDatabaseType.cs
	src/Orchard.Web/Modules/Orchard.Setup/Module.txt
	src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj
	src/Orchard.Web/Modules/Orchard.Setup/Recipes/blog.recipe.xml
	src/Orchard.Web/Modules/Orchard.Setup/Recipes/core.recipe.xml
	src/Orchard.Web/Modules/Orchard.Setup/Recipes/default.recipe.xml
	src/Orchard.Web/Modules/Orchard.Setup/Routes.cs
	src/Orchard.Web/Modules/Orchard.Setup/Scripts/setup.js
	src/Orchard.Web/Modules/Orchard.Setup/Services/SetupContext.cs
	src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
	src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs
	src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.cshtml
	src/Orchard.Web/Modules/Orchard.Tags/Drivers/TagsPartDriver.cs
	src/Orchard.Web/Modules/Orchard.Tags/Module.txt
	src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj
	src/Orchard.Web/Modules/Orchard.Tags/ResourceManifest.cs
	src/Orchard.Web/Modules/Orchard.Tags/Services/TagService.cs
	src/Orchard.Web/Modules/Orchard.TaskLease/Migrations.cs
	src/Orchard.Web/Modules/Orchard.TaskLease/Models/TaskLeaseRecord.cs
	src/Orchard.Web/Modules/Orchard.TaskLease/Module.txt
	src/Orchard.Web/Modules/Orchard.TaskLease/Orchard.TaskLease.csproj
	src/Orchard.Web/Modules/Orchard.TaskLease/Services/ITaskLeaseService.cs
	src/Orchard.Web/Modules/Orchard.TaskLease/Services/TaskLeaseService.cs
	src/Orchard.Web/Modules/Orchard.TaskLease/Tests/Orchard.TaskLease.Tests/Orchard.TaskLease.Tests.csproj
	src/Orchard.Web/Modules/Orchard.TaskLease/Web.config
	src/Orchard.Web/Modules/Orchard.Taxonomies/Controllers/AdminController.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Controllers/TermAdminController.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TaxonomyFieldDriver.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TaxonomyPartDriver.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Handlers/TaxonomyPartHandler.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Handlers/TermsPartHandler.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Helpers/PathExtensions.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Migrations.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Models/TermContentItem.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Models/TermPart.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Models/TermsPart.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Navigation/TaxonomyNavigationProvider.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Projections/TermsFilter.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Projections/TermsFilterForms.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Scripts/admin-taxonomy-tags.js
	src/Orchard.Web/Modules/Orchard.Taxonomies/Services/ITaxonomyService.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Services/TaxonomyService.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Shapes.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/StandardQueries/TermFeedQuery.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Styles/admin-taxonomy-tags.css
	src/Orchard.Web/Modules/Orchard.Taxonomies/ViewModels/TaxonomyAdminIndexViewModel.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/ViewModels/TaxonomyFieldViewModel.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/ViewModels/TermAdminIndexViewModel.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Views/Admin/Import.cshtml
	src/Orchard.Web/Modules/Orchard.Taxonomies/Views/Admin/Index.cshtml
	src/Orchard.Web/Modules/Orchard.Taxonomies/Views/DefinitionTemplates/TaxonomyFieldSettings.cshtml
	src/Orchard.Web/Modules/Orchard.Taxonomies/Views/EditorTemplates/Fields/TaxonomyField.Autocomplete.cshtml
	src/Orchard.Web/Modules/Orchard.Taxonomies/Views/EditorTemplates/Fields/TaxonomyField.cshtml
	src/Orchard.Web/Modules/Orchard.Taxonomies/Views/EditorTemplates/Parts/Navigation.Taxonomy.Edit.cshtml
	src/Orchard.Web/Modules/Orchard.Taxonomies/Views/Fields/TaxonomyField.cshtml
	src/Orchard.Web/Modules/Orchard.Taxonomies/Views/Taxonomy.cshtml
	src/Orchard.Web/Modules/Orchard.Taxonomies/Views/TaxonomyItem.cshtml
	src/Orchard.Web/Modules/Orchard.Taxonomies/Views/TermAdmin/Index.cshtml
	src/Orchard.Web/Modules/Orchard.Taxonomies/Views/TermAdmin/Merge.cshtml
	src/Orchard.Web/Modules/Orchard.Taxonomies/Views/TermAdmin/MoveTerm.cshtml
	src/Orchard.Web/Modules/Orchard.Taxonomies/Views/TermAdmin/RenderTermSelect.cshtml
	src/Orchard.Web/Modules/Orchard.Taxonomies/Views/TermAdmin/SelectTerm.cshtml
	src/Orchard.Web/Modules/Orchard.Themes/Controllers/AdminController.cs
	src/Orchard.Web/Modules/Orchard.Themes/Handlers/ThemeSiteSettingsPartHandler.cs
	src/Orchard.Web/Modules/Orchard.Themes/Module.txt
	src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj
	src/Orchard.Web/Modules/Orchard.Themes/Recipes/Executors/ThemeStep.cs
	src/Orchard.Web/Modules/Orchard.Themes/Services/IThemeService.cs
	src/Orchard.Web/Modules/Orchard.Themes/Services/SafeModeThemeSelector.cs
	src/Orchard.Web/Modules/Orchard.Themes/Services/SiteThemeSelector.cs
	src/Orchard.Web/Modules/Orchard.Themes/Services/ThemeService.cs
	src/Orchard.Web/Modules/Orchard.Tokens/Orchard.Tokens.csproj
	src/Orchard.Web/Modules/Orchard.Tokens/Styles/orchard-tokens-admin.css
	src/Orchard.Web/Modules/Orchard.Tokens/Tests/Orchard.Tokens.Tests.csproj
	src/Orchard.Web/Modules/Orchard.Tokens/Tests/StubWorkContextAccessor.cs
	src/Orchard.Web/Modules/Orchard.Tokens/Tests/TestTokenProvider.cs
	src/Orchard.Web/Modules/Orchard.Tokens/Views/TokenHint.cshtml
	src/Orchard.Web/Modules/Orchard.Tokens/Web.config
	src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs
	src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs
	src/Orchard.Web/Modules/Orchard.Users/Handlers/RegistrationSettingsPartHandler.cs
	src/Orchard.Web/Modules/Orchard.Users/Handlers/UserPartHandler.cs
	src/Orchard.Web/Modules/Orchard.Users/Migrations.cs
	src/Orchard.Web/Modules/Orchard.Users/Models/UserPart.cs
	src/Orchard.Web/Modules/Orchard.Users/Models/UserPartRecord.cs
	src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj
	src/Orchard.Web/Modules/Orchard.Users/Services/MembershipService.cs
	src/Orchard.Web/Modules/Orchard.Users/Services/UserResolverSelector.cs
	src/Orchard.Web/Modules/Orchard.Users/Services/UserService.cs
	src/Orchard.Web/Modules/Orchard.Users/ViewModels/UsersIndexViewModel.cs
	src/Orchard.Web/Modules/Orchard.Users/Views/Account/ChallengeEmailSent.cshtml
	src/Orchard.Web/Modules/Orchard.Users/Views/Account/RegistrationPending.cshtml
	src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Index.cshtml
	src/Orchard.Web/Modules/Orchard.Warmup/Handlers/WarmupSettingsPartHandler.cs
	src/Orchard.Web/Modules/Orchard.Warmup/Orchard.Warmup.csproj
	src/Orchard.Web/Modules/Orchard.Warmup/Web.config
	src/Orchard.Web/Modules/Orchard.Widgets/Drivers/LayerPartDriver.cs
	src/Orchard.Web/Modules/Orchard.Widgets/Drivers/WidgetPartDriver.cs
	src/Orchard.Web/Modules/Orchard.Widgets/Filters/WidgetFilter.cs
	src/Orchard.Web/Modules/Orchard.Widgets/Handlers/LayerPartHandler.cs
	src/Orchard.Web/Modules/Orchard.Widgets/Handlers/WidgetPartHandler.cs
	src/Orchard.Web/Modules/Orchard.Widgets/Models/WidgetPart.cs
	src/Orchard.Web/Modules/Orchard.Widgets/Module.txt
	src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj
	src/Orchard.Web/Modules/Orchard.Widgets/RuleEngine/AuthenticatedRuleProvider.cs
	src/Orchard.Web/Modules/Orchard.Widgets/RuleEngine/BuiltinRuleProvider.cs
	src/Orchard.Web/Modules/Orchard.Widgets/RuleEngine/ContentDisplayedRuleProvider.cs
	src/Orchard.Web/Modules/Orchard.Widgets/Services/IRuleManager.cs
	src/Orchard.Web/Modules/Orchard.Widgets/Services/IRuleProvider.cs
	src/Orchard.Web/Modules/Orchard.Widgets/Services/LayerResolverSelector.cs
	src/Orchard.Web/Modules/Orchard.Widgets/Services/RuleContext.cs
	src/Orchard.Web/Modules/Orchard.Widgets/Services/RuleManager.cs
	src/Orchard.Web/Modules/Orchard.Widgets/Services/WidgetsService.cs
	src/Orchard.Web/Modules/Orchard.Widgets/Shapes.cs
	src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts.Widgets.WidgetPart.cshtml
	src/Orchard.Web/Modules/Orchard.Widgets/Views/WidgetPlacement.Orphans.cshtml
	src/Orchard.Web/Modules/Orchard.Workflows/Controllers/AdminController.cs
	src/Orchard.Web/Modules/Orchard.Workflows/ImportExport/WorkflowsCustomExportStep.cs
	src/Orchard.Web/Modules/Orchard.Workflows/ImportExport/WorkflowsRecipeHandler.cs
	src/Orchard.Web/Modules/Orchard.Workflows/Module.txt
	src/Orchard.Web/Modules/Orchard.Workflows/Recipes/Builders/WorkflowsStep.cs
	src/Orchard.Web/Modules/Orchard.Workflows/Scripts/orchard-workflows-serialize.js
	src/Orchard.Web/Modules/Orchard.Workflows/Scripts/orchard-workflows.js
	src/Orchard.Web/Modules/Orchard.Workflows/Styles/orchard-workflows-admin.css
	src/Orchard.Web/Modules/Orchard.Workflows/Views/ActivityToolbox.cshtml
	src/Orchard.Web/Modules/Orchard.Workflows/Views/Admin/Index.cshtml
	src/Orchard.Web/Modules/Orchard.Workflows/Web.config
	src/Orchard.Web/Modules/Orchard.jQuery/Module.txt
	src/Orchard.Web/Modules/Orchard.jQuery/Orchard.jQuery.csproj
	src/Orchard.Web/Modules/SysCache/SysCache.csproj
	src/Orchard.Web/Modules/SysCache/Web.config
	src/Orchard.Web/Modules/TinyMce/Module.txt
	src/Orchard.Web/Modules/TinyMce/TinyMce.csproj
	src/Orchard.Web/Modules/Upgrade/Controllers/RouteController.cs
	src/Orchard.Web/Modules/Upgrade/Upgrade.csproj
	src/Orchard.Web/Modules/Upgrade/Web.config
	src/Orchard.Web/Orchard.Web.csproj
	src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js
	src/Orchard.Web/Themes/TheAdmin/Styles/site.css
	src/Orchard.Web/Themes/TheAdmin/Views/User.cshtml
	src/Orchard.Web/Themes/Themes.csproj
	src/Orchard.Web/Themes/Web.config
	src/Orchard.Web/Web.config
	src/Orchard.sln
	src/Orchard/Commands/Builtin/HelpCommand.cs
	src/Orchard/Commands/CommandBackgroundService.cs.rej
	src/Orchard/Commands/CommandHostAgent.cs
	src/Orchard/ContentManagement/Aspects/ICommonPart.cs
	src/Orchard/ContentManagement/DataMigrations/FrameworkDataMigration.cs
	src/Orchard/ContentManagement/DefaultContentManager.cs
	src/Orchard/ContentManagement/Drivers/ContentFieldDriver.cs
	src/Orchard/ContentManagement/Drivers/ContentPartDriver.cs
	src/Orchard/ContentManagement/Drivers/ContentShapeResult.cs
	src/Orchard/ContentManagement/Drivers/Coordinators/ContentFieldDriverCoordinator.cs
	src/Orchard/ContentManagement/Drivers/Coordinators/ContentPartDriverCoordinator.cs
	src/Orchard/ContentManagement/Drivers/IContentFieldDriver.cs
	src/Orchard/ContentManagement/Drivers/IContentPartDriver.cs
	src/Orchard/ContentManagement/Handlers/ContentHandler.cs
	src/Orchard/ContentManagement/Handlers/ContentHandlerBase.cs
	src/Orchard/ContentManagement/Handlers/IContentHandler.cs
	src/Orchard/ContentManagement/Handlers/IContentStorageFilter.cs
	src/Orchard/ContentManagement/Handlers/StorageFilter.cs
	src/Orchard/ContentManagement/Handlers/StorageFilterBase.cs
	src/Orchard/ContentManagement/Handlers/StorageVersionFilter.cs
	src/Orchard/ContentManagement/IContentManager.cs
	src/Orchard/ContentManagement/MetaData/Services/ContentDefinitionWriter.cs
	src/Orchard/ContentManagement/Utilities/LazyField.cs
	src/Orchard/Data/Migration/AutomaticDataMigrations.cs
	src/Orchard/Data/Migration/Interpreters/DefaultDataMigrationInterpreter.cs
	src/Orchard/Data/Migration/Interpreters/IDataMigrationInterpreter.cs
	src/Orchard/Data/Migration/Interpreters/MySqlCommandInterpreter.cs
	src/Orchard/Data/Migration/Schema/AlterTableCommand.cs
	src/Orchard/Data/Migration/Schema/SchemaBuilder.cs
	src/Orchard/Data/Migration/Schema/SchemaCommand.cs
	src/Orchard/DisplayManagement/Descriptors/ResourceBindingStrategy/StylesheetBindingStrategy.cs
	src/Orchard/DisplayManagement/Shapes/ShapeMetadata.cs
	src/Orchard/Environment/Configuration/ShellSettingsManager.cs
	src/Orchard/Environment/Configuration/TenantState.cs
	src/Orchard/Environment/DefaultOrchardHost.cs
	src/Orchard/Environment/DefaultOrchardShell.cs
	src/Orchard/Environment/Descriptor/IShellDescriptorManager.cs
	src/Orchard/Environment/Extensions/ExtensionMonitoringCoordinator.cs
	src/Orchard/Environment/Extensions/Folders/ExtensionHarvester.cs
	src/Orchard/Environment/Extensions/IExtensionManager.cs
	src/Orchard/Environment/Extensions/Loaders/DynamicExtensionLoader.cs
	src/Orchard/Environment/Extensions/Loaders/RawThemeExtensionLoader.cs
	src/Orchard/Environment/Extensions/Models/ExtensionDescriptor.cs
	src/Orchard/Environment/Features/FeatureManager.cs
	src/Orchard/Environment/Features/IFeatureManager.cs
	src/Orchard/Environment/IOrchardHost.cs
	src/Orchard/Environment/OrchardServices.cs
	src/Orchard/Environment/OrchardStarter.cs
	src/Orchard/Environment/ShellBuilders/CompositionStrategy.cs
	src/Orchard/Environment/ShellBuilders/ShellContainerFactory.cs
	src/Orchard/Environment/ShellBuilders/ShellContextFactory.cs
	src/Orchard/Environment/State/DefaultProcessingEngine.cs
	src/Orchard/Environment/ViewsBackgroundCompilation.cs
	src/Orchard/Environment/WorkContextAccessor.cs
	src/Orchard/Environment/WorkContextImplementation.cs
	src/Orchard/Events/DelegateHelper.cs
	src/Orchard/FileSystems/Dependencies/DynamicModuleVirtualPathProvider.cs
	src/Orchard/FileSystems/Media/FileSystemStorageProvider.cs
	src/Orchard/Localization/Services/DefaultLocalizedStringManager.cs
	src/Orchard/Localization/Text.cs
	src/Orchard/Logging/OrchardLog4netLogger.cs
	src/Orchard/Mvc/AntiForgery/AntiForgeryAuthorizationFilter.cs
	src/Orchard/Mvc/Html/ContentItemExtensions.cs
2015-12-13 23:46:19 +01:00
Lombiq
5406b17601 Converting all files stored as CRLF in git to be stored as LF
LF is the git default and all new files are stored as such. Old files from the hg to git conversion however were moved over as CRLF.
2015-12-13 22:21:02 +01:00
Sipke Schoorstra
1e963d4d50 Merge pull request #6159 from connorsmallman/Bug/6142/LayoutEditorJS
Wait for document ready before calling LayoutEditor constructor
2015-12-10 14:34:49 +01:00
Sipke Schoorstra
206f1396d5 Merge pull request #6144 from connorsmallman/Bug/6142/LayoutEditorJS
Fix for issue #6142
2015-12-10 14:28:59 +01:00
Lombiq
4ca2379ffb Merge branch '1.9.x' into dev
Conflicts:
	src/Orchard/Mvc/Html/HtmlHelperExtensions.cs
	src/Orchard/Mvc/MvcModule.cs
	src/Orchard/Mvc/Routes/RouteExtensions.cs
	src/Orchard/Mvc/ViewEngines/IViewEngineProvider.cs
	src/Orchard/Mvc/ViewEngines/Razor/RazorViewEngineProvider.cs
	src/Orchard/Mvc/ViewEngines/Razor/WebViewPage.cs
	src/Orchard/Mvc/ViewEngines/ThemeAwareness/ThemeAwareViewEngine.cs
	src/Orchard/Mvc/ViewPage.cs
	src/Orchard/Mvc/ViewUserControl.cs
	src/Orchard/Orchard.Framework.csproj
	src/Orchard/Recipes/Models/Recipe.cs
	src/Orchard/Recipes/Models/RecipeJournal.cs
	src/Orchard/Recipes/Models/RecipeStep.cs
	src/Orchard/Recipes/Services/IRecipeHarvester.cs
	src/Orchard/Recipes/Services/IRecipeJournal.cs
	src/Orchard/Recipes/Services/IRecipeParser.cs
	src/Orchard/Security/IMembershipService.cs
	src/Orchard/Security/Providers/FormsAuthenticationService.cs
	src/Orchard/Security/SecurityFilter.cs
	src/Orchard/Tasks/BackgroundService.cs
	src/Orchard/UI/Notify/NotifyFilter.cs
	src/Orchard/UI/Resources/MetaEntry.cs
	src/Orchard/Utility/Extensions/StringExtensions.cs
	src/Orchard/Validation/Argument.cs
	src/Orchard/Validation/JetBrains.Annotations.cs
	src/Orchard/WebApi/DefaultOrchardWebApiHttpHttpControllerActivator.cs
	src/Orchard/WorkContext.cs
	src/Tools/Orchard/HostContext/CommandHostContextProvider.cs
2015-12-09 00:38:35 +01:00
Sipke Schoorstra
3a7091467b Fixed duplicate field shape issue with Content Field elements.
Fixes #5974
2015-12-08 01:15:41 +01:00
Connor Smallman
43d8b1a803 Wait for document ready before calling LayoutEditor constructor 2015-12-07 15:16:20 +00:00
Sipke Schoorstra
f4f47322c0 Fixed a second binding issue with an overloaded method. 2015-12-03 23:59:18 +01:00
Sipke Schoorstra
8693b68ac7 Fixed a binding issue with FormsElementDriver.
This fixes the issue where form elements whose drivers inherit from FormsElementDriver would not persist their changes.

Fixes #6100, #6035
2015-12-03 22:47:29 +01:00
Lombiq
15d27043d7 Fixing that some files had line endings mixed up (both LF and CRLF) 2015-12-03 00:00:36 +01:00
Sipke Schoorstra
f7ba32a0c2 Merge pull request #6054 from OrchardCMS/feature/configurable-snippets
Added support for configurable snippet elements.
2015-11-24 23:20:01 +01:00
Sipke Schoorstra
37550593d4 Added support for reusing the same field in a single snippet file. 2015-11-24 23:19:06 +01:00
Sipke Schoorstra
a09c2045c5 Consolidated separate features into a single one. 2015-11-24 01:44:49 +01:00
Sipke Schoorstra
ddddb7407f Added Bootstrap and FontAwesome. 2015-11-21 14:21:29 +01:00
Sipke Schoorstra
8258bb3589 Moved AngularJS and Underscore to Resources. 2015-11-20 18:36:25 +01:00
Sipke Schoorstra
febdc19e81 Created initial version of Orchard.Resources module.
- Migrated all jQuery usages from Orchard.jQuery to Orchard.Resources.
- Deprecated Orchard.jQuery.
2015-11-20 00:21:39 +01:00
Sipke Schoorstra
e5bb771be1 Renamed WithDisplayName to DisplayedAs and removed test view from TheThemeMachine. 2015-11-19 17:56:42 +01:00
Sipke Schoorstra
f7e3f48df1 Added support for configurable snippet elements. 2015-11-19 17:39:52 +01:00
Sipke Schoorstra
5c18f49fa3 Layouts, Widgets and Conditions.
- Moved Rules engine code to new Orchard.Conditions module.
- Refactored Layouts and Widgets to use Conditions.
- Moved Widgets element harvester to the Widgets module as a separate feature.
2015-11-19 14:02:12 +01:00
Sipke Schoorstra
3b4b3c578a Fixed potential widget orphans when deleting layout content.
This fixes the scenario where you have a layout with a widget element pointing to a widget content item, and the layout content item is being deleted.
Doing so will now correctly invoke Remove on all elements within the layout content item being deleted.
2015-11-12 21:38:33 +01:00
Sipke Schoorstra
978408765b Fixed an issue with copy/paste. 2015-11-12 20:25:35 +01:00
Sipke Schoorstra
391459d273 Merge branch 'dev' into feature/widget-elements
Conflicts:
	src/Orchard.Web/Modules/Orchard.Layouts/Controllers/ElementController.cs
2015-11-12 19:38:31 +01:00
Sipke Schoorstra
278e22e1b2 Merge pull request #6026 from harmony7/5995-ElementControllerBehavior
Fixed behavior of Element Controller in an around editing and updating.
2015-11-12 19:35:54 +01:00
Sipke Schoorstra
92fba4d76d Updated ClientValidationRegistrationCoordinator with updated interface. 2015-11-12 19:10:03 +01:00
Sipke Schoorstra
6ff17439e8 Implemented Import/Export support for harvesters.
Also normalized the way drivers are invoked by moving code from the ElementManager to the ElementDriversCoordinator handler.
2015-11-11 15:48:38 +01:00
Sipke Schoorstra
61f86895db Merge branch 'dev' into feature/widget-elements
Conflicts:
	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Lib.js
	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/dialog.js
	src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor.css
	src/Orchard.Web/Modules/Orchard.Layouts/Styles/Lib.css
2015-11-11 13:12:18 +01:00
Katsuyuki Ohmuro
e9146f60c4 Fixed behavior of Element Controller in an around editing and updating.
Also removed unused file, unused methods, and unused parameters.
2015-11-11 17:38:42 +09:00
Sipke Schoorstra
bcf4813c3e Merge branch '1.9.x' into dev
Conflicts:
	README.md
	src/Orchard.Web/Modules/Orchard.Dashboards/Web.config
	src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj
	src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/Compare.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/EmailAddress.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/Mandatory.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/OptionRequired.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/RegularExpression.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/Required.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/StringLength.cs
2015-11-03 22:44:13 +01:00
Sipke Schoorstra
d63a9ed9d1 Updated ElementDisplay to use Invoke extension method.
The generic Invoke extension method has the advantage of catching any exceptions occurring in client code and logging them, preventing the rest of the Layouts from breaking down.
2015-11-03 20:38:57 +01:00
Katsuyuki Ohmuro
829f69198c With the Element editor dialog, use dialog frame's jQuery for form submission. 2015-10-29 21:40:47 +09:00
Sipke Schoorstra
5344ed2e2a Fixed order of exported content part elements.
This fixes an issue where the LayoutPart XML element would appear last in the content item XML element due to the fact that the <LayoutPart> element was being added only in the Exported event and not in the Exporting event.

To fix this, the <LayoutPart> element is no first added during the Exporting event, and later updated in the Exporting event.
2015-10-13 20:17:03 +02:00
Sipke Schoorstra
f8ae4cf626 Merge branch 'dev' into issue/5848/importexport 2015-10-10 12:49:56 +02:00
Sipke Schoorstra
df2ab76613 Added ImportCompleted event.
This event is invoked after all content items have been imported.
2015-10-09 23:52:35 +02:00
Daniel Stolt
f8409d5ce5 Updated the Gulp pipeline.
NOTE: You need to run "npm update" from the solution folder to download the updated version of the dependencies for the updated Gulpfile to work properly.
2015-10-09 22:41:21 +02:00
Sipke Schoorstra
547564eda8 Merge branch 'dev' into feature/widget-elements
Conflicts:
	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutEditor.js
	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.js
	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.min.js
2015-10-05 10:22:26 +02:00
Daniel Stolt
df216b6a18 Merge from Orchard/dev. 2015-10-04 01:57:19 +02:00
Daniel Stolt
42914c7896 Fixed a column resizing issue. 2015-10-03 19:32:50 +02:00
Daniel Stolt
bd96bf9895 Enabled focusing (and thereby pasting into) non-sealed templated containers. 2015-10-03 19:26:13 +02:00
Sipke Schoorstra
6a90cdc681 Merge branch 'dev' into feature/widget-elements 2015-10-03 00:35:43 +02:00
Sipke Schoorstra
7a047b6d1e Removed Element stereotype. 2015-10-03 00:34:42 +02:00
Sipke Schoorstra
8535644b99 Layout editor improvements.
- Implemented Removed element event.
- Fixed model validation in Element editor dialog.
- Extended support for placeable content.
2015-10-03 00:28:48 +02:00
Sebastien Ros
508d97ed7d Fixing merge 2015-10-01 09:14:21 -07:00
Sebastien Ros
d0b364c28e Merge branch '1.9.x' into dev
Conflicts:
	src/Orchard.Azure/Orchard.Azure.CloudService/ServiceConfiguration.Cloud.cscfg
	src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
	src/Orchard.Web/Core/Reports/Module.txt
	src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config
	src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/Configuration/AzureBlobShellSettingsManager.cs
	src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/Configuration/DefaultPlatformConfigurationAccessor.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/LayoutPartDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Elements/Column.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Module.txt
	src/Orchard.Web/Web.config
2015-09-30 15:57:34 -07:00