Commit Graph

15 Commits

Author SHA1 Message Date
Sebastien Ros
6d58498b82 Merge branch '1.9.x' into dev
Conflicts:
	src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config
	src/Orchard.Web/Modules/Orchard.ImageEditor/Web.config
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
	src/Orchard/Localization/Text.cs
2015-06-18 10:35:06 -07:00
Sipke Schoorstra
9466d91438 #5379: Improved LayoutPartDriver to safely handle recursive layout rendering.
This prevents a SO exception when you for example have a Projection element that renders content including the content item rendering that Projection element.
2015-06-12 13:28:53 +03:00
Sipke Schoorstra
ce6876eacf Revived default layout data initialization. 2015-04-30 18:09:26 +02:00
Sipke Schoorstra
27a01fb11e Fixed an HTML encoding issue.
See: https://orchard.codeplex.com/discussions/582038
2015-02-28 23:50:40 +01:00
Sipke Schoorstra
102fb14d9a Extracted layout editor creation for reuse purposes.
This simplifies reusing the layout editor in other areas outside the context of LayoutPart (which is now a user of the layout editor).
2015-02-22 12:28:22 +01:00
Sipke Schoorstra
3f15163297 Making LayoutEditor a reusable editor template. 2015-02-22 09:45:49 +01:00
Sipke Schoorstra
edfc16e491 Fixed Layouts import/export merge issue. 2015-02-20 15:03:21 +01:00
Daniel Stolt
4b11d08ccd Merged 'feature/layouteditor' into 1.x. 2015-02-19 22:14:55 +01:00
Jay Harris
dac17198f6 #21151 : Import with LayoutPart Fails if not in XML.
Work Item: 21151
2015-02-14 16:19:15 +00:00
Sipke Schoorstra
893f0149c9 Layouts: Refactoring the way data is transferred between the layout editor and modal element editor dialog.
This change makes implementing element editors more intuitive, since they no longer rely on the initial postback from layout editor to the element editor dialog.
The ObjectStore is a simple database table that serves as a robust data transfer mechanism to share element state without the need for the host (content) to be persisted.
We could have used SessionState, but that would have added configuration requirements when hosting in a web farm.
2015-01-03 17:28:24 +01:00
Sipke Schoorstra
dfe066a3e6 Decoupling layout editor from LayoutPart.
These changes allow for better reuse of the layout editor without requiring a LayoutPart (which is simply there to store Layout state)
2014-12-18 13:18:55 +01:00
Sipke Schoorstra
9581cd583e Simplifying summary shape for LayoutPart. 2014-11-14 20:43:06 -08:00
Sipke Schoorstra
a0390c88bd Adding support for import/export.
This enables elements to export additional information such as content item references by storing their identities.
2014-11-13 18:25:05 -08:00
Sipke Schoorstra
fbac586231 Adding LayoutPart summary shape. 2014-11-13 16:37:21 -08:00
Sipke Schoorstra
16853760ac Adding Orchard.Layouts. 2014-10-14 16:07:00 -07:00