mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2026-02-09 09:16:41 +08:00
aced5c3e72
# Conflicts: # README.md # src/Orchard.Specs/Boolean.feature # src/Orchard.Specs/Boolean.feature.cs # src/Orchard.Specs/DateTime.feature # src/Orchard.Specs/DateTime.feature.cs # src/Orchard.Specs/Enumeration.feature # src/Orchard.Specs/Enumeration.feature.cs # src/Orchard.Specs/Hosting/Orchard.Web/Web.config # src/Orchard.Specs/Input.feature # src/Orchard.Specs/Link.feature # src/Orchard.Specs/Link.feature.cs # src/Orchard.Specs/Numeric.feature # src/Orchard.Specs/Numeric.feature.cs # src/Orchard.Specs/Text.feature # src/Orchard.Web/Core/Contents/Controllers/AdminController.cs # src/Orchard.Web/Core/Contents/Views/Parts.Contents.Clone.SummaryAdmin.cshtml # src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs # src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml # src/Orchard.Web/Core/Orchard.Core.csproj # src/Orchard.Web/Core/Web.config # src/Orchard.Web/Core/packages.config # src/Orchard.Web/Modules/Lucene/packages.config # src/Orchard.Web/Modules/Markdown/packages.config # src/Orchard.Web/Modules/Orchard.Alias/packages.config # src/Orchard.Web/Modules/Orchard.ArchiveLater/packages.config # src/Orchard.Web/Modules/Orchard.Autoroute/Handlers/AutoroutePartHandler.cs # src/Orchard.Web/Modules/Orchard.Autoroute/packages.config # src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj # src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config # src/Orchard.Web/Modules/Orchard.Blogs/packages.config # src/Orchard.Web/Modules/Orchard.Comments/packages.config # src/Orchard.Web/Modules/Orchard.ContentPermissions/packages.config # src/Orchard.Web/Modules/Orchard.ContentPicker/Module.txt # src/Orchard.Web/Modules/Orchard.ContentPicker/packages.config # src/Orchard.Web/Modules/Orchard.ContentTypes/packages.config # src/Orchard.Web/Modules/Orchard.CustomForms/Module.txt # src/Orchard.Web/Modules/Orchard.CustomForms/Orchard.CustomForms.csproj # src/Orchard.Web/Modules/Orchard.CustomForms/Web.config # src/Orchard.Web/Modules/Orchard.CustomForms/packages.config # src/Orchard.Web/Modules/Orchard.Dashboards/Orchard.Dashboards.csproj # src/Orchard.Web/Modules/Orchard.Dashboards/Web.config # src/Orchard.Web/Modules/Orchard.Dashboards/packages.config # src/Orchard.Web/Modules/Orchard.DesignerTools/packages.config # src/Orchard.Web/Modules/Orchard.Fields/Module.txt # src/Orchard.Web/Modules/Orchard.Fields/packages.config # src/Orchard.Web/Modules/Orchard.Forms/Module.txt # src/Orchard.Web/Modules/Orchard.ImageEditor/packages.config # src/Orchard.Web/Modules/Orchard.ImportExport/packages.config # src/Orchard.Web/Modules/Orchard.Indexing/packages.config # src/Orchard.Web/Modules/Orchard.Layouts/packages.config # src/Orchard.Web/Modules/Orchard.Lists/packages.config # src/Orchard.Web/Modules/Orchard.Localization/Module.txt # src/Orchard.Web/Modules/Orchard.Localization/Views/Parts/Localization.ContentTranslations.SummaryAdmin.cshtml # src/Orchard.Web/Modules/Orchard.Localization/packages.config # src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj # src/Orchard.Web/Modules/Orchard.Media/Web.config # src/Orchard.Web/Modules/Orchard.Media/packages.config # src/Orchard.Web/Modules/Orchard.MediaPicker/Orchard.MediaPicker.csproj # src/Orchard.Web/Modules/Orchard.MediaPicker/Web.config # src/Orchard.Web/Modules/Orchard.MediaPicker/packages.config # src/Orchard.Web/Modules/Orchard.MediaProcessing/packages.config # src/Orchard.Web/Modules/Orchard.Modules/packages.config # src/Orchard.Web/Modules/Orchard.MultiTenancy/packages.config # src/Orchard.Web/Modules/Orchard.OutputCache/Orchard.OutputCache.csproj # src/Orchard.Web/Modules/Orchard.OutputCache/packages.config # src/Orchard.Web/Modules/Orchard.Packaging/packages.config # src/Orchard.Web/Modules/Orchard.Projections/Module.txt # src/Orchard.Web/Modules/Orchard.Projections/packages.config # src/Orchard.Web/Modules/Orchard.PublishLater/packages.config # src/Orchard.Web/Modules/Orchard.Recipes/packages.config # src/Orchard.Web/Modules/Orchard.Resources/Orchard.Resources.csproj # src/Orchard.Web/Modules/Orchard.Resources/Web.config # src/Orchard.Web/Modules/Orchard.Resources/packages.config # src/Orchard.Web/Modules/Orchard.Roles/packages.config # src/Orchard.Web/Modules/Orchard.Rules/Orchard.Rules.csproj # src/Orchard.Web/Modules/Orchard.Rules/Web.config # src/Orchard.Web/Modules/Orchard.Rules/packages.config # src/Orchard.Web/Modules/Orchard.Scripting.CSharp/packages.config # src/Orchard.Web/Modules/Orchard.Search/packages.config # src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/packages.config # src/Orchard.Web/Modules/Orchard.Setup/packages.config # src/Orchard.Web/Modules/Orchard.Tags/packages.config # src/Orchard.Web/Modules/Orchard.TaskLease/Module.txt # src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj # src/Orchard.Web/Modules/Orchard.Templates/packages.config # src/Orchard.Web/Modules/Orchard.Themes/packages.config # src/Orchard.Web/Modules/Orchard.Tokens/Module.txt # src/Orchard.Web/Modules/Orchard.Tokens/packages.config # src/Orchard.Web/Modules/Orchard.Users/packages.config # src/Orchard.Web/Modules/Orchard.Warmup/packages.config # src/Orchard.Web/Modules/Orchard.Widgets/packages.config # src/Orchard.Web/Modules/Orchard.Workflows/packages.config # src/Orchard.Web/Modules/Orchard.jQuery/Orchard.jQuery.csproj # src/Orchard.Web/Modules/Orchard.jQuery/Web.config # src/Orchard.Web/Modules/Orchard.jQuery/packages.config # src/Orchard.Web/Modules/TinyMce/TinyMce.csproj # src/Orchard.Web/Modules/TinyMce/Views/Body-Html.Editor.cshtml # src/Orchard.Web/Modules/TinyMce/packages.config # src/Orchard.Web/Themes/Themes.csproj # src/Orchard.Web/Themes/Web.config # src/Orchard.Web/Themes/packages.config # src/Orchard.Web/Web.config # src/Orchard.Web/packages.config # src/Orchard/ContentManagement/DefaultContentManager.cs # src/Orchard/Orchard.Framework.csproj # src/Tools/MSBuild.Orchard.Tasks/TypeScriptFiles.cs