Lombiq d173816619 Merge branch '1.9.x' into dev ...

Conflicts:
	src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs
	src/Orchard.Web/Core/Navigation/Scripts/navigation-admin.js
	src/Orchard.Web/Core/Navigation/Styles/navigation-admin.css
	src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml
	src/Orchard.Web/Modules/Orchard.Workflows/Styles/orchard-workflows-admin.css
	src/Orchard/Commands/CommandBackgroundService.cs.rej

2015-12-03 00:07:28 +01:00

..

Orchard

Fixing that some files had line endings mixed up (both LF and CRLF)

2015-12-03 00:00:36 +01:00

Orchard.Azure

Merge branch '1.9.x' into dev

2015-12-03 00:07:28 +01:00

Orchard.Azure.Tests

Merge branch 'dev' into issue/homepage-alias

2015-07-24 13:33:36 +01:00

Orchard.Core.Tests

Merge branch '1.9.x' into dev

2015-09-30 15:57:34 -07:00

Orchard.Profile

Consolidated separate features into a single one.

2015-11-24 01:44:49 +01:00

Orchard.Specs

Consolidated separate features into a single one.

2015-11-24 01:44:49 +01:00

Orchard.Tests

Merge branch '1.9.x' into dev

2015-11-24 19:20:05 +01:00

Orchard.Tests.Modules

Layouts, Widgets and Conditions.

2015-11-19 14:02:12 +01:00

Orchard.WarmupStarter

Bumping version number

2015-09-23 17:23:54 -07:00

Orchard.Web

Merge branch '1.9.x' into dev

2015-12-03 00:07:28 +01:00

Orchard.Web.Tests

Merge branch '1.9.x' into dev

2015-09-30 15:57:34 -07:00

Tools

Merge branch '1.9.x' into dev

2015-09-30 15:57:34 -07:00

Gulpfile.js

Updated the Gulp pipeline.

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

Orchard.4.5.resharper

…

Orchard.5.0.ReSharper

…

Orchard.sln

Fixed the things that someone always forgets. ;)

2015-11-24 19:35:27 +01:00

OrchardBasicCorrectness.ruleset

Updating ruleset location for all projects

2015-06-16 16:22:04 -07:00

OrchardSecurity.ruleset

…

Package.json

Updated the Gulp pipeline.

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

Rebracer.xml

Merge branch 'dev' into issue/homepage-alias

2015-08-04 16:25:35 +01:00

Shapes.txt

…

WebEssentials-Settings.json

Merged 'feature/layouteditor' into 1.x.

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

Zones.txt

…