Rob King 89f0213a78 Merge branch 'dev' of https://github.com/OrchardCMS/Orchard into replace-lib-with-nuget ...

Conflicts:
	src/Orchard.Web/Core/Orchard.Core.csproj
	src/Orchard.Web/Modules/Orchard.Fields/Orchard.Fields.csproj

2015-12-22 09:48:44 +00:00

..

Commands

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

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

Controllers

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

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

Drivers

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

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

Handlers

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

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

Helpers

Simplified Admin Search.

2015-04-18 20:16:40 +02:00

Models

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

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

Properties

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

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

Recipes

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

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

Scripts

#4957: Fixed search settings.

2015-04-17 00:46:39 +02:00

Services

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

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

Settings

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

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

Styles

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

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

ViewModels

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

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

Views

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

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

ContentAdminMenu.cs

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

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

ContentPickerNavigationProvider.cs

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

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

Migrations.cs

Creating helpers for settings based metadata scenarios to be used in migrations, fixes #4693

2015-12-19 20:01:32 +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.Search.csproj

Merge branch 'dev' of https://github.com/OrchardCMS/Orchard into replace-lib-with-nuget

2015-12-22 09:48:44 +00:00

packages.config

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

2015-12-07 20:46:05 +00:00

Placement.info

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

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

ResourceManifest.cs

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

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

Routes.cs

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

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

Web.config

Fixing Visual Studio warnings on web.config files

2015-08-27 11:11:10 -07:00