Daniel Stolt df216b6a18 Merge from Orchard/dev.

2015-10-04 01:57:19 +02:00

..

Assets

Merge from Orchard/dev.

2015-10-04 01:57:19 +02:00

Controllers

Adding ManageLayout permission

2015-09-21 14:04:37 -07:00

Data

Merged 'feature/layouteditor' into 1.x.

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

Drivers

Fixing merge

2015-10-01 09:14:21 -07:00

Elements

Merge branch '1.9.x' into dev

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

Filters

Merge branch 'dev' into issue/homepage-alias

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

Framework

Refactored the way elements are instantiated.

2015-09-07 18:22:56 +01:00

Handlers

Merge branch '1.9.x' into dev

2015-09-04 13:15:43 -07:00

Helpers

Merge branch 'dev' into issue/homepage-alias

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

Images

Merged 'feature/layouteditor' into 1.x.

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

Models

Merge branch '1.9.x' into dev

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

Properties

Adding Orchard.Layouts.

2014-10-14 16:07:00 -07:00

Providers

Removed unintentionally added file.

2015-08-21 23:21:13 +01:00

Recipes

Merge branch 'dev' into issue/homepage-alias

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

Scripts

Merge from Orchard/dev.

2015-10-04 01:57:19 +02:00

Services

Merge branch '1.9.x' into dev

2015-09-08 17:19:58 -07:00

Settings

[Fixes #5820] Fixing default layout support

2015-09-25 15:07:56 -07:00

Shapes

Merge branch 'dev' into issue/homepage-alias

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

Styles

Improved asset manifest file change handling in Gulpfile.js.

2015-09-16 16:56:51 +02:00

Tokens

#21304: Fixed Text Element HTML filter issues.

2015-04-03 01:46:57 +02:00

ViewModels

Merge branch 'dev' into issue/homepage-alias

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

Views

Merge from Orchard/dev.

2015-10-04 01:57:19 +02:00

AdminMenu.cs

Adding ManageLayout permission

2015-09-21 14:04:37 -07:00

Assets.json

Merge branch 'dev' into issue/homepage-alias

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

Default.html

Merged 'feature/layouteditor' into 1.x.

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

Migrations.cs

Adding ManageLayout permission

2015-09-21 14:04:37 -07:00

Module.txt

Merge branch '1.9.x' into dev

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

Notes.txt

Merged 'feature/layouteditor' into 1.x.

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

Orchard.Layouts.csproj

Merge branch '1.9.x' into dev

2015-09-21 16:15:40 -07:00

Permissions.cs

Adding ManageLayout permission

2015-09-21 14:04:37 -07:00

Placement.info

#5378: Fixed content field elements placement for content picker field and media picker field.

2015-06-29 14:27:23 +03:00

ResourceManifest.cs

Replaced Web Essentials with Gulp for Orchard.Layouts.

2015-06-09 14:09:03 +03:00

Routes.cs

Adding Orchard.Layouts.

2014-10-14 16:07:00 -07:00

Signals.cs

Removed Zones integration.

2015-04-19 21:18:31 +02:00

Web.config

Fixing Visual Studio warnings on web.config files

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