Sebastien Ros db50a5aecb Merge branch '1.7.x' into 1.x ...

Conflicts:
	src/Orchard.Web/Modules/Orchard.AntiSpam/Drivers/ReCaptchaPartDriver.cs
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/AdminController.cs
	src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj

2014-03-17 12:09:21 -07:00

..

Commands

Incremental work on multiple indexes

2013-03-05 11:13:33 -08:00

Controllers

Shifting SearchSettingsPart

2013-11-12 17:55:54 -08:00

Drivers

#20404: Exporting/Importing site settings through a driver, then simple types in standard fashion

2014-03-17 11:59:45 -07:00

Handlers

Shifting SearchSettingsPart

2013-11-12 17:55:54 -08:00

Models

Shifting SearchSettingsPart

2013-11-12 17:55:54 -08:00

Properties

Updating version numbers

2013-11-08 16:53:03 -08:00

Recipes

Incremental work on multiple indexes

2013-03-05 11:13:33 -08:00

Services

#20033: Fixing that SearchService should filter based on CurrentCultre instead of SiteCulture

2013-09-24 23:26:38 +02:00

Settings

Incremental work on multiple indexes

2013-03-05 11:13:33 -08:00

Styles

remove webpages:enabled from scripts and content folders

2013-12-04 11:55:57 -08:00

ViewModels

Incremental work on multiple indexes

2013-03-05 11:13:33 -08:00

Views

Delete views/web.config and update webpages to 3.0

2013-12-04 11:55:54 -08:00

ContentAdminMenu.cs

Adding Content Search in Admin

2012-05-30 11:33:51 -07:00

ContentPickerNavigationProvider.cs

Adding Content Picker filters

2013-02-10 07:38:34 -08:00

Migrations.cs

Shifting SearchSettingsPart

2013-11-12 17:55:54 -08:00

Module.txt

Updating version numbers

2013-11-08 16:53:03 -08:00

Orchard.Search.csproj

Merge branch '1.7.x' into 1.x

2014-03-17 12:09:21 -07:00

Placement.info

Implementing media search

2013-09-25 16:41:44 -07:00

ResourceManifest.cs

Cleanup (includes)

2010-12-07 15:47:45 -08:00

Routes.cs

Gave search a friendly URL (/search)

2010-06-04 08:35:24 -07:00

web.config

Upgrading to ASP.NET MVC 5.1

2014-01-21 18:12:22 -08:00