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

..

Drivers

Merge branch '1.9.x' into dev

2016-01-14 08:50:24 -08:00

Models

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

Security

Fixing issue where anon users can spam the SiteService on Content Authorization. Also changing scope of double part check.

2015-06-02 11:19:00 +01:00

Services

#20526: Adding Preview permissions

2014-11-13 12:51:48 -08:00

Settings

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

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

Styles

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

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

ViewModels

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

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

Views

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

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

Migrations.cs

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

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

Module.txt

Updating version numbers to 1.10.1

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

Orchard.ContentPermissions.csproj

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

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

packages.config

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

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

Permissions.cs

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

2015-12-13 22:21:02 +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