lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
10,324 Commits 94 Branches 33 Tags
89f0213a78ae5e7fc3afbc64aaceda427da4cd20
Commit Graph
10324 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Rob King 89f0213a78 Merge branch 'dev' of https://github.com/OrchardCMS/Orchard into replace-lib-with-nuget 
Conflicts:
	src/Orchard.Web/Core/Orchard.Core.csproj
	src/Orchard.Web/Modules/Orchard.Fields/Orchard.Fields.csproj
 2015-12-22 09:48:44 +00: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 8eef43f20d Fixed media library picker field script. 
This fixes an issue where the code selecting the 'Save' button would match any button with the 'button.save' class.
The issue became apparent when working with Image element on a layout. The Element Editor Dialog also has a 'Save' button with the 'button save' class, en became hidden when no image was selected.
 2015-12-20 16:37:57 +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
Lombiq c216480ca0 Adding the ability to specify tokenized default values for content fields, fixes #5934 
And also fixing build error. *Shame!*
 2015-12-19 20:49:13 +01:00
Lombiq 2835a0db29 Creating helpers for settings based metadata scenarios to be used in migrations, fixes #4693 2015-12-19 20:01:32 +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
Sébastien Ros da8898e946 Merge pull request #6178 from Jwheuvel/1.9.x 
All /lib dll files are now correctly taken into account when using git
 2015-12-17 12:32:38 -08:00
Sébastien Ros 2853197117 Merge pull request #6183 from mvarblow/issue-1978 
[Fixes #1978] Extending MarshalByRef object lease
 2015-12-17 12:32:04 -08:00
Sébastien Ros 9bba785d42 Merge pull request #5966 from jtkech/patch-2 
Experimental work on HttpContext, WorkContext and async code in background tasks
 2015-12-17 12:28:44 -08:00
Sébastien Ros 8a065d496d Merge pull request #6194 from jtkech/patch-6 
[Fixes #6193] TokenFilters Cohabitation
 2015-12-17 12:18:40 -08:00
Sébastien Ros cc1ceec277 Merge pull request #6195 from jtkech/patch-7 
Reverting query hints on layers
 2015-12-17 12:16:10 -08:00
jtkech 981c1cb056 Update HttpContextAccessor.cs 2015-12-17 07:08:12 +01:00
jtkech 3e9259ab68 Update DefaultLayerEvaluationService.cs 2015-12-17 03:22:26 +01:00
jtkech 36c5f1070f Update Tokenizer.cs 2015-12-17 00:23:12 +01:00
Rob King 6a2b56e714 Moved NuGet.Core to Orchard NuGet Feed 2015-12-16 16:45:28 +00:00
Piotr Szmyd 83900802b7 #6188: Using correct key when removing Redis cache entry. 2015-12-16 17:05:28 +01:00
Rob King 78ffff1785 Moved FluentPath to Orchard NuGet Feed 2015-12-16 12:28:31 +00:00
Rob King 74adc571aa Moved MSTranslitTools to Orchard NuGet Feed. 2015-12-16 10:35:30 +00: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
Matt Varblow 4362b00da1 Fixed indentation 2015-12-15 16:09:24 -05:00
Matt Varblow 67dd5abc31 Fixes #1978: Long-running Orchard commands crashed the command line due to expired leases on remote proxies for MarshalByRef parameters passed in cross-AppDomain calls. 2015-12-15 16:07:34 -05:00
Rob King 93417d41b5 Removed redundant MSBuild lib folder 2015-12-15 20:41:32 +00:00
Rob King dc63b7ce74 Removed redundant lib folders (no NuGet replacements) 2015-12-15 20:11:48 +00:00
Sébastien Ros 765f8f74a5 Merge pull request #6180 from wharri220/patch-2 
Prevent terms creationg when taxonomy doesn't exist
 2015-12-15 10:46:36 -08:00
Westley Harris 4fb1c18a72 Update TaxonomyField.cshtml 
Re-submit of #6160. Fixed a bug in the taxonomy field editor template that allows you to click on "create some terms" for a non-existent taxonomy. This situation occurs when you assign a taxonomy field to a content type but do not specify a taxonomy.
 2015-12-15 07:34:32 -05:00
Rob King 74d8cf8e9a Line endings resolution 2015-12-15 11:55:23 +00:00
Jwheuvel b1b34e444a All /lib dll files are now correctly taken into account when using git 
Changed the .gitignore so all /lib dependencies are included correctly.
 2015-12-15 09:34:57 +01:00
jtkech 5f65c5101d Merge branch 'dev' into patch-2 
Conflicts:
	src/Orchard.Tests/Environment/DefaultWorkContextAccessorTests.cs
	src/Orchard.Tests/Environment/ShellBuilders/DefaultShellContextFactoryTests.cs
	src/Orchard.Tests/Tasks/SweepGeneratorTests.cs
	src/Orchard/Environment/WorkContextAccessor.cs
	src/Orchard/Mvc/MvcModule.cs
 2015-12-15 06:12:42 +01:00
jtkech 9a091b7c01 Merge pull request #4 from OrchardCMS/dev 
Sync dev
 2015-12-15 05:29:21 +01:00
Zoltán Lehóczky 5bc2ddcabf Merge remote-tracking branch 'o/dev' into use-nuget-instead-of-lib-folder 
Conflicts:
	lib/mysql/COPYING
	lib/mysql/README
 2015-12-14 17:14:36 +01:00
Zoltán Lehóczky 8609b167e8 Merge branch 'dev' into use-nuget-instead-of-lib-folder 
Conflicts:
	lib/aspnetmvc/System.Web.Helpers.xml
	lib/aspnetmvc/System.Web.Mvc.xml
	lib/aspnetmvc/System.Web.Razor.xml
	lib/aspnetmvc/System.Web.WebPages.Deployment.xml
	lib/aspnetmvc/System.Web.WebPages.Razor.xml
	lib/aspnetmvc/System.Web.WebPages.xml
	lib/aspnetwebapi/System.Net.Http.Formatting.xml
	lib/aspnetwebapi/System.Web.Http.WebHost.xml
	lib/aspnetwebapi/System.Web.Http.xml
	lib/autofac/Autofac.Configuration.xml
	lib/autofac/Autofac.XML
	lib/autofac/License.txt
	lib/dlr/LICENSE.APACHE.html
	lib/dlr/LICENSE.CPL.txt
	lib/dlr/LICENSE.Ruby.txt
	lib/dlr/README.txt
	lib/dotnetzip/Ionic.Zip.xml
	lib/dotnetzip/License.txt
	lib/htmlagilitypack/HtmlAgilityPack.XML
	lib/imageresizer/license.txt
	lib/log4net/log4net.xml
	lib/lucene.net/Lucene.Net.xml
	lib/moq/Moq.xml
	lib/newtonsoft.json/Newtonsoft.Json.xml
	lib/newtonsoft.json/license.txt
	lib/nhibernate/Iesi.Collections.xml
	lib/nunit/NUnitFitTests.html
	lib/nunit/NUnitTests.config
	lib/nunit/NUnitTests.nunit
	lib/nunit/agent.conf
	lib/nunit/agent.log.conf
	lib/nunit/clr.bat
	lib/nunit/launcher.log.conf
	lib/nunit/license.txt
	lib/nunit/nunit-agent.exe.config
	lib/nunit/nunit-console-x86.exe.config
	lib/nunit/nunit-console.exe.config
	lib/nunit/nunit-x86.exe.config
	lib/nunit/nunit.exe.config
	lib/nunit/pnunit-agent.exe.config
	lib/nunit/pnunit-launcher.exe.config
	lib/nunit/runFile.exe.config
	lib/nunit/runpnunit.bat
	lib/nunit/test.conf
	lib/specflow/LICENSE.txt
	lib/specflow/TechTalk.SpecFlow.targets
	lib/specflow/TechTalk.SpecFlow.tasks
	lib/specflow/changelog.txt
	lib/windowsazure/Microsoft.ApplicationServer.Caching.AzureCommon.xml
	lib/windowsazure/Microsoft.ApplicationServer.Caching.Client.xml
	lib/windowsazure/Microsoft.ApplicationServer.Caching.Core.xml
	src/Orchard.Core.Tests/Orchard.Core.Tests.csproj
	src/Orchard.Profile/Orchard.Profile.csproj
	src/Orchard.Specs/App.Config
	src/Orchard.Specs/Orchard.Specs.csproj
	src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj
	src/Orchard.Tests/Orchard.Framework.Tests.csproj
	src/Orchard.Web.Tests/Orchard.Web.Tests.csproj
	src/Orchard.Web/Core/Orchard.Core.csproj
	src/Orchard.Web/Modules/Lucene/Lucene.csproj
	src/Orchard.Web/Modules/Markdown/Markdown.csproj
	src/Orchard.Web/Modules/Orchard.Alias/Orchard.Alias.csproj
	src/Orchard.Web/Modules/Orchard.AntiSpam/Orchard.AntiSpam.csproj
	src/Orchard.Web/Modules/Orchard.ArchiveLater/Orchard.ArchiveLater.csproj
	src/Orchard.Web/Modules/Orchard.Autoroute/Orchard.Autoroute.csproj
	src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj
	src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
	src/Orchard.Web/Modules/Orchard.CodeGeneration/Orchard.CodeGeneration.csproj
	src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj
	src/Orchard.Web/Modules/Orchard.ContentPermissions/Orchard.ContentPermissions.csproj
	src/Orchard.Web/Modules/Orchard.ContentPicker/Orchard.ContentPicker.csproj
	src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj
	src/Orchard.Web/Modules/Orchard.CustomForms/Orchard.CustomForms.csproj
	src/Orchard.Web/Modules/Orchard.DesignerTools/Orchard.DesignerTools.csproj
	src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj
	src/Orchard.Web/Modules/Orchard.Fields/Orchard.Fields.csproj
	src/Orchard.Web/Modules/Orchard.Forms/Orchard.Forms.csproj
	src/Orchard.Web/Modules/Orchard.ImageEditor/Orchard.ImageEditor.csproj
	src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj
	src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
	src/Orchard.Web/Modules/Orchard.Lists/Orchard.Lists.csproj
	src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj
	src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj
	src/Orchard.Web/Modules/Orchard.MediaPicker/Orchard.MediaPicker.csproj
	src/Orchard.Web/Modules/Orchard.MediaProcessing/Orchard.MediaProcessing.csproj
	src/Orchard.Web/Modules/Orchard.Migrations/Orchard.Migrations.csproj
	src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj
	src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj
	src/Orchard.Web/Modules/Orchard.OutputCache/Orchard.OutputCache.csproj
	src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj
	src/Orchard.Web/Modules/Orchard.Projections/Orchard.Projections.csproj
	src/Orchard.Web/Modules/Orchard.Projections/Tests/Orchard.Projections.Tests.csproj
	src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj
	src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj
	src/Orchard.Web/Modules/Orchard.Rules/Orchard.Rules.csproj
	src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Orchard.Scripting.CSharp.csproj
	src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Orchard.Scripting.Dlr.csproj
	src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
	src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj
	src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj
	src/Orchard.Web/Modules/Orchard.TaskLease/Orchard.TaskLease.csproj
	src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj
	src/Orchard.Web/Modules/Orchard.Tokens/Orchard.Tokens.csproj
	src/Orchard.Web/Modules/Orchard.Tokens/Tests/Orchard.Tokens.Tests.csproj
	src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj
	src/Orchard.Web/Modules/Orchard.Warmup/Orchard.Warmup.csproj
	src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj
	src/Orchard.Web/Modules/Orchard.jQuery/Orchard.jQuery.csproj
	src/Orchard.Web/Modules/SysCache/SysCache.csproj
	src/Orchard.Web/Modules/Upgrade/Upgrade.csproj
	src/Orchard.Web/Orchard.Web.csproj
	src/Orchard.sln
	src/Tools/Orchard.Tests/Orchard.Tests.csproj
 2015-12-14 16:51:32 +01:00
Lombiq 70ff08f4b7 Merge branch '1.9.x' into dev 2015-12-14 16:41:17 +01:00
Lombiq 6e3c8cbb9e Fixing line endings in further two extension-less text files 2015-12-14 01:42:32 +01:00
Lombiq df4f4234bd 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 23:50:20 +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 e92c1f6356 Normalizing some more line endings 2015-12-13 22:26:26 +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
Rob King 4522e47ddd Consolidated NHibernate version to match lib folder 2015-12-11 12:35:14 +00:00
jtkech e72b8c4bed Update SweepGeneratorTests.cs 2015-12-11 01:40:35 +01:00
jtkech e889288687 Update DefaultShellContextFactoryTests.cs 2015-12-11 01:39:35 +01:00
jtkech 095a22eb6e Update DefaultWorkContextAccessorTests.cs 2015-12-11 01:37:58 +01:00
jtkech d34eba4b99 Update HttpContextAccessor.cs 2015-12-11 01:33:19 +01:00
jtkech a7b4d8c6ca Update WorkContextAccessor.cs 2015-12-11 01:31:00 +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
Rob King b82d67a363 Merge branch 'dev' of https://github.com/gcsuk/Orchard into use-nuget-instead-of-lib-folder 
Conflicts:
	src/Orchard/Orchard.Framework.csproj
 2015-12-09 09:04:24 +00:00
Lombiq 6cc481e825 Normalizing some more line endings 2015-12-09 00:41:46 +01:00