Sebastien Ros bca5aee822 Merge branch 'refs/heads/1.10.x' into dev ...

# Conflicts:
#	src/Orchard.Web/Modules/Orchard.ContentPicker/Module.txt
#	src/Orchard.Web/Modules/Orchard.CustomForms/Module.txt
#	src/Orchard.Web/Modules/Orchard.Email/Services/SmtpMessageChannel.cs
#	src/Orchard.Web/Modules/Orchard.Fields/Module.txt
#	src/Orchard.Web/Modules/Orchard.Forms/Module.txt
#	src/Orchard.Web/Modules/Orchard.Localization/Module.txt
#	src/Orchard.Web/Modules/Orchard.Projections/Module.txt
#	src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.min.min.js
#	src/Orchard.Web/Modules/Orchard.TaskLease/Module.txt
#	src/Orchard.Web/Modules/Orchard.Tokens/Module.txt

2017-04-25 09:04:16 -07:00

..

Autoroute

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

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

CodeGeneration/Commands

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

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

Comments/Services

PE tasks list init and start background timer after PE tasks.

2016-05-26 12:58:31 -07:00

Conditions

Added LegacyRulesEvaluator.

2016-01-28 23:15:13 +01:00

DesignerTools/Services

Fixing unit tests

2015-09-21 12:45:57 -07:00

Email

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

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

ImageProcessing

Fixing unit tests and warnings

2014-03-26 17:37:01 -07:00

ImportExport/Services

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

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

Indexing

Implementing user-configurable Lucene indexing analyzer selection, resolves #3887

2017-03-23 00:45:57 +01:00

Media

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

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

Migrations

Extensions are not enabled any more if they can't actually be loaded, fixes #2437

2016-12-10 01:43:36 +01:00

Packaging

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

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

Properties

Updating version number

2017-04-03 12:21:56 -07:00

Recipes

Fixing unit test

2017-01-03 13:45:09 -08:00

Roles

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

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

Scripting

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

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

Scripting.Dlr

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

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

Settings/Blueprint

Fixing unit tests

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

Stubs

Fixing unit tests and warnings

2014-03-26 17:37:01 -07:00

Tags/Services

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

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

Themes/Services

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

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

Users

Fixing membership unit tests

2017-01-03 16:35:40 -08:00

Warmup

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

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

Widgets/Services

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

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

Workflows/Activities

#20100: Fixing multi-lines parsing in WebActivityTask

2013-09-11 14:12:46 -07:00

XmlRpc

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

DatabaseEnabledTestsBase.cs

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

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

Orchard.Tests.Modules.csproj

Adding LangVersion 5 setting to each csproj's Debug and Release target (#7641)

2017-04-03 10:38:41 -07:00

packages.config

Merge branch '1.10.x' into dev

2016-06-17 23:24:01 +02:00

Values.cs

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

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