Sebastien Ros a0c61c0328 Merge branch '1.9.x' into dev ...

Conflicts:
	src/Orchard.Web/Modules/Orchard.ContentPermissions/Drivers/ContentPermissionsPartDriver.cs
	src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Orchard.Scripting.CSharp.csproj

2016-01-14 08:50:24 -08: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

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

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

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

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

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

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

Orchard.ContentPermissions.csproj

Updated code base to target .NET Framework 4.5.2. Fixes #5700.

2016-01-14 01:06:32 +01:00

packages.config

Moved System.Web.Mvc to NuGet. Version change: None

2015-12-07 20:46:05 +00: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

Updated code base to target .NET Framework 4.5.2. Fixes #5700.

2016-01-14 01:06:32 +01:00