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 2 Packages Projects Releases Wiki Activity
Files
eb71d1ced71bce1e6f79c199f71487091d05d9b3
Orchard/src/Orchard.Web/Modules
History
Sebastien Ros c8a4def111 Merge branch '1.10.x' into dev 
# Conflicts:
#	src/Gulpfile.js
#	src/Orchard.Web/Core/Common/Views/EditorTemplates/Fields.Common.Text.Edit.cshtml
#	src/Orchard.Web/Modules/Orchard.ContentPicker/Module.txt
#	src/Orchard.Web/Modules/Orchard.CustomForms/Module.txt
#	src/Orchard.Web/Modules/Orchard.Fields/Module.txt
#	src/Orchard.Web/Modules/Orchard.Fields/Views/DefinitionTemplates/EnumerationFieldSettings.cshtml
#	src/Orchard.Web/Modules/Orchard.Fields/Views/DefinitionTemplates/NumericFieldSettings.cshtml
#	src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Link.Edit.cshtml
#	src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Numeric.Edit.cshtml
#	src/Orchard.Web/Modules/Orchard.Forms/Module.txt
#	src/Orchard.Web/Modules/Orchard.Projections/Module.txt
#	src/Orchard.Web/Modules/Orchard.TaskLease/Module.txt
#	src/Orchard.Web/Modules/Orchard.Tokens/Module.txt
#	src/Package.json
2016-05-05 17:45:57 -07:00
..
Lucene
Updating version numbers to 1.10.1
2016-04-26 10:12:18 -07:00
Markdown
Updating version numbers to 1.10.1
2016-04-26 10:12:18 -07:00
Orchard.Alias
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.AntiSpam
Updating version numbers to 1.10.1
2016-04-26 10:12:18 -07:00
Orchard.ArchiveLater
Updating version numbers to 1.10.1
2016-04-26 10:12:18 -07:00
Orchard.AuditTrail
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.Autoroute
Updating version numbers to 1.10.1
2016-04-26 10:12:18 -07:00
Orchard.Azure
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.Azure.MediaServices
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.Blogs
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.Caching
Updating version numbers to 1.10.1
2016-04-26 10:12:18 -07:00
Orchard.CodeGeneration
Add generic default theme.png
2016-04-28 13:03:33 -07:00
Orchard.Comments
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.Conditions
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.ContentPermissions
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.ContentPicker
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.ContentTypes
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.CustomForms
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.Dashboards
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.DesignerTools
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.DynamicForms
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.Email
Updating version numbers to 1.10.1
2016-04-26 10:12:18 -07:00
Orchard.Fields
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.Forms
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.ImageEditor
Updating version numbers to 1.10.1
2016-04-26 10:12:18 -07:00
Orchard.ImportExport
Updating version numbers to 1.10.1
2016-04-26 10:12:18 -07:00
Orchard.Indexing
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.JobsQueue
Updating version numbers to 1.10.1
2016-04-26 10:12:18 -07:00
Orchard.jQuery
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.Layouts
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.Lists
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.Localization
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.Media
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.MediaLibrary
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.MediaPicker
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.MediaProcessing
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.MessageBus
Updating version numbers to 1.10.1
2016-04-26 10:12:18 -07:00
Orchard.Migrations
Updating version numbers to 1.10.1
2016-04-26 10:12:18 -07:00
Orchard.Modules
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.MultiTenancy
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.OutputCache
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.Packaging
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.Pages
Updating version numbers to 1.10.1
2016-04-26 10:12:18 -07:00
Orchard.Projections
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.PublishLater
Updating version numbers to 1.10.1
2016-04-26 10:12:18 -07:00
Orchard.Recipes
Updating version numbers to 1.10.1
2016-04-26 10:12:18 -07:00
Orchard.Redis
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.Resources
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.Roles
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.Rules
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.Scripting
Updating version numbers to 1.10.1
2016-04-26 10:12:18 -07:00
Orchard.Scripting.CSharp
Updating version numbers to 1.10.1
2016-04-26 10:12:18 -07:00
Orchard.Scripting.Dlr
Updating version numbers to 1.10.1
2016-04-26 10:12:18 -07:00
Orchard.Search
Updating version numbers to 1.10.1
2016-04-26 10:12:18 -07:00
Orchard.SecureSocketsLayer
Fixed Specific url's in SecureSocketsLayer not redirected to https
2016-04-29 09:08:43 -07:00
Orchard.Setup
Updating version numbers to 1.10.1
2016-04-26 10:12:18 -07:00
Orchard.Tags
Updating version numbers to 1.10.1
2016-04-26 10:12:18 -07:00
Orchard.TaskLease
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.Taxonomies
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.Templates
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.Themes
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.Tokens
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.Users
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.Warmup
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.Widgets
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
Orchard.Workflows
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00
SysCache
Updating version numbers to 1.10.1
2016-04-26 10:12:18 -07:00
TinyMce
Updating version numbers to 1.10.1
2016-04-26 10:12:18 -07:00
Upgrade
Merge branch '1.10.x' into dev
2016-05-05 17:45:57 -07:00