Sebastien Ros 1205f3ae5a Merge branch 'dev' into 1.10 ...

Conflicts:
	src/Orchard/Orchard.Framework.csproj

2016-02-01 09:33:02 -08:00

..

Orchard

Merge branch 'dev' into 1.10

2016-02-01 09:33:02 -08:00

Orchard.Azure

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

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

Orchard.Azure.Tests

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

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

Orchard.Core.Tests

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

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

Orchard.Profile

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

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

Orchard.Specs

Merge branch 'dev' into 1.10

2016-02-01 09:33:02 -08:00

Orchard.Tests

Fixing unit tests

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

Orchard.Tests.Modules

Added LegacyRulesEvaluator.

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

Orchard.WarmupStarter

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

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

Orchard.Web

Merge branch 'dev' into 1.10

2016-02-01 09:33:02 -08:00

Orchard.Web.Tests

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

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

Tools

White-listing packages.config as None target in projects

2016-01-13 17:34:29 -08:00

Gulpfile.js

Updated the Gulp pipeline.

2015-10-09 22:41:21 +02:00

Orchard.4.5.resharper

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

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

Orchard.5.0.ReSharper

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

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

Orchard.sln

Including msbuild tasks in lib

2016-01-14 12:04:45 -08:00

OrchardBasicCorrectness.ruleset

Normalizing some more line endings

2015-12-13 22:26:26 +01:00

OrchardSecurity.ruleset

Normalizing some more line endings

2015-12-13 22:26:26 +01:00

Package.json

Updated the Gulp pipeline.

2015-10-09 22:41:21 +02:00

Rebracer.xml

Ignoring Rebracer changes

2016-01-14 09:40:26 -08:00

Shapes.txt

Normalizing some more line endings

2015-12-13 22:26:26 +01:00

WebEssentials-Settings.json

Merged 'feature/layouteditor' into 1.x.

2015-02-19 22:14:55 +01:00

Zones.txt

Normalizing some more line endings

2015-12-13 22:26:26 +01:00