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

..

Drivers

Merge branch '1.10.x' into dev

2017-02-09 14:34:21 +01:00

Fields

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

Settings

Adding the ability to have placeholders for content fields, fixes #5943

2016-02-08 18:01:03 +01:00

Styles

Cleaned up and reformatted all Web.config files according to #6072.

2016-01-22 20:38:34 +01:00

Tokens

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

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

ViewModels

Field default value as a proposed value on first edition when creating.

2016-04-26 09:50:02 -07:00

Views

Usage of undeclared variables in Link.Edit.cshtml. (#7473)

2016-12-12 14:16:10 -08:00

Module.txt

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

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

Orchard.Fields.csproj

Merge branch '1.10.2' into dev

2017-04-03 11:54:43 -07:00

packages.config

Retargeted NuGet references to targetFramework="net452". Fixes #6406.

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

Placement.info

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

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

Web.config

Removing roslyn compilation for now

2016-02-01 11:55:04 -08:00