Sipke Schoorstra
504f484b19
Fixed broken Html element view.
2015-07-04 10:32:11 +02:00
Sebastien Ros
1d6cb27d01
Merge branch '1.9.x' into dev
...
Conflicts:
README.md
src/Orchard.Web/Modules/Orchard.DynamicForms/Controllers/FormController.cs
src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/CheckboxElementDriver.cs
src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/EmailFieldElementDriver.cs
src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/EnumerationElementDriver.cs
src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/HiddenFieldElementDriver.cs
src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/RadioButtonElementDriver.cs
src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextAreaElementDriver.cs
src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextFieldElementDriver.cs
src/Orchard.Web/Modules/Orchard.Layouts/Drivers/HeadingElementDriver.cs
src/Orchard.Web/Modules/Orchard.Layouts/Drivers/HtmlElementDriver.cs
src/Orchard.Web/Modules/Orchard.Layouts/Drivers/MarkdownElementDriver.cs
src/Orchard.Web/Modules/Orchard.Layouts/Drivers/TextElementDriver.cs
src/Orchard.Web/Modules/Orchard.Layouts/Filters/TokensFilter.cs
src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Html.cshtml
src/Orchard/Orchard.Framework.csproj
2015-06-30 11:35:41 -07:00
Sipke Schoorstra
5b40567b6d
#5407 : Layout elements now evaluate tokens.
2015-06-29 14:01:58 +03:00
Sipke Schoorstra
dacdbdffb2
Canvas everywhere.
2015-04-19 22:13:09 +02:00
Sipke Schoorstra
dea42e518b
Cleaned up element views.
2015-04-17 14:34:00 +02:00
Sipke Schoorstra
eb61269d85
#21304 : Fixed Text Element HTML filter issues.
...
- Implemented HTML filters for Html, Text and Paragraph elements
- Tokens are only processed on the front-end, not in the editor page itself. This also prevents an exception when the {Shape.Execute} token is used with a theme specific shape.
Work Item: 21304
2015-04-03 01:46:57 +02:00
Daniel Stolt
4b11d08ccd
Merged 'feature/layouteditor' into 1.x.
2015-02-19 22:14:55 +01:00
Sipke Schoorstra