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

Shifting Menu Items

2013-11-12 17:53:07 -08:00

Content

remove webpages:enabled from scripts and content folders

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

Controllers

remove cast from dynamic to object for medium trust

2013-08-31 15:15:10 +02:00

Drivers

#18877: Adding a prefix to WidgetPart

2012-09-21 17:05:09 -07:00

Filters

Fixing wrong media queries

2013-11-12 17:56:05 -08:00

Handlers

Creating "contenttype" rule for layers

2013-02-11 11:39:54 -08:00

Models

Shifting Widgets

2013-11-12 17:51:53 -08:00

Properties

Updating version numbers

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

RuleEngine

Creating "contenttype" rule for layers

2013-02-11 11:39:54 -08:00

Services

#20349: Fix Orphans Widgets in WidgetService

2013-12-18 13:23:43 +01:00

Styles

remove webpages:enabled from scripts and content folders

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

Views

Merge branch '1.7.x' into 1.x

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

AdminMenu.cs

Fixing #17500: Change order of menu items to reflect real usage

2011-03-31 15:44:24 -07:00

ControlWrapper.cs

#17177: Moving content wrappers to features

2011-12-16 11:26:22 -08:00

Migrations.cs

Providing some default descriptions for out-of-the-box content parts.

2013-03-11 12:35:12 +01:00

Module.txt

Updating version numbers

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

Orchard.Widgets.csproj

Delete views/web.config and update webpages to 3.0

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

Permissions.cs

Cleanup & Refactoring

2010-12-07 17:11:55 -08:00

Placement.info

Moving the widget and layer delete button into its own (placed) template to drop it in by the save button

2010-12-09 14:54:27 -08:00

ResourceManifest.cs

Improving the editor toolbar

2013-01-23 12:17:15 -08:00

Shapes.cs

#18624: Fixing Widget-Name alternate

2012-04-24 15:19:40 -07:00

web.config

Upgrading to ASP.NET MVC 5.1

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