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

..

Caching

Converting all files stored as CRLF in git to be stored as LF

2015-12-13 22:21:02 +01:00

Commands

Converting all files stored as CRLF in git to be stored as LF

2015-12-13 22:21:02 +01:00

ContentManagement

Merge branch 'refs/heads/1.9.x' into dev

2015-12-13 23:46:19 +01:00

Data

Converting all files stored as CRLF in git to be stored as LF

2015-12-13 22:21:02 +01:00

DataMigration

Merge branch 'refs/heads/1.9.x' into dev

2015-12-13 23:46:19 +01:00

DisplayManagement

Merge branch 'refs/heads/1.9.x' into dev

2015-12-13 23:46:19 +01:00

Environment

Fixing unit tests

2016-01-14 09:39:51 -08:00

Events

Converting all files stored as CRLF in git to be stored as LF

2015-12-13 22:21:02 +01:00

FileSystems

Converting all files stored as CRLF in git to be stored as LF

2015-12-13 22:21:02 +01:00

Localization

Merge branch 'refs/heads/1.9.x' into dev

2015-12-13 23:46:19 +01:00

Logging

Converting all files stored as CRLF in git to be stored as LF

2015-12-13 22:21:02 +01:00

Messaging

Converting all files stored as CRLF in git to be stored as LF

2015-12-13 22:21:02 +01:00

Mvc

Converting all files stored as CRLF in git to be stored as LF

2015-12-13 22:21:02 +01:00

Properties

Updating version numbers to 1.10.1

2016-04-26 10:12:18 -07:00

Records

Converting all files stored as CRLF in git to be stored as LF

2015-12-13 22:21:02 +01:00

Security

Converting all files stored as CRLF in git to be stored as LF

2015-12-13 22:21:02 +01:00

Services

Removed unnecessary YamlService.

2016-04-12 21:53:12 +02:00

Storage

Converting all files stored as CRLF in git to be stored as LF

2015-12-13 22:21:02 +01:00

Stubs

Merge branch 'refs/heads/1.9.x' into dev

2015-12-13 23:46:19 +01:00

Tasks

Merge branch 'dev' into patch-2

2015-12-15 06:12:42 +01:00

Time

Merge branch 'refs/heads/1.9.x' into dev

2015-12-13 23:46:19 +01:00

UI

Implemented CdnSupportsSsl in Orchard UI Resources

2016-04-29 09:06:31 -07:00

Utility

Converting all files stored as CRLF in git to be stored as LF

2015-12-13 22:21:02 +01:00

App.config

Retargeted remaining projects to .NET Framework 4.5.2.

2016-02-20 01:13:13 +01:00

ContainerTestBase.cs

Merge branch 'refs/heads/1.9.x' into dev

2015-12-13 23:46:19 +01:00

DatabaseEnabledTestsBase.cs

Merge branch 'refs/heads/1.9.x' into dev

2015-12-13 23:46:19 +01:00

DataUtility.cs

Using Nuget version of NUnit

2016-03-31 11:43:10 -07:00

EventsTests.cs

Converting all files stored as CRLF in git to be stored as LF

2015-12-13 22:21:02 +01:00

FakeTests.cs

Converting all files stored as CRLF in git to be stored as LF

2015-12-13 22:21:02 +01:00

FluentDbTests.cs

Using Nuget version of NUnit

2016-03-31 11:43:10 -07:00

LinqToNHibernateTests.cs

Converting all files stored as CRLF in git to be stored as LF

2015-12-13 22:21:02 +01:00

Orchard.Framework.Tests.csproj

Merge remote-tracking branch 'origin/1.10.x' into dev

2016-04-14 19:06:06 +02:00

packages.config

Updating Azure Tests

2016-03-31 13:17:20 -07:00