Rob King
ff7c7148ac
Moved WebApi to NuGet. Version change: None
2015-12-06 00:13:39 +00:00
neTp9c
dd9f85572c
Import and Export for menu element.
2015-12-05 22:29:12 +03:00
Rob King
fe215587b1
Moved Newtonsoft.Json to NuGet. Version change: None
2015-12-04 17:32:50 +00:00
Sipke Schoorstra
f4f47322c0
Fixed a second binding issue with an overloaded method.
2015-12-03 23:59:18 +01:00
Sipke Schoorstra
8693b68ac7
Fixed a binding issue with FormsElementDriver.
...
This fixes the issue where form elements whose drivers inherit from FormsElementDriver would not persist their changes.
Fixes #6100 , #6035
2015-12-03 22:47:29 +01:00
Lombiq
15d27043d7
Fixing that some files had line endings mixed up (both LF and CRLF)
2015-12-03 00:00:36 +01:00
Sipke Schoorstra
f7ba32a0c2
Merge pull request #6054 from OrchardCMS/feature/configurable-snippets
...
Added support for configurable snippet elements.
2015-11-24 23:20:01 +01:00
Sipke Schoorstra
37550593d4
Added support for reusing the same field in a single snippet file.
2015-11-24 23:19:06 +01:00
Sipke Schoorstra
a09c2045c5
Consolidated separate features into a single one.
2015-11-24 01:44:49 +01:00
Sipke Schoorstra
ddddb7407f
Added Bootstrap and FontAwesome.
2015-11-21 14:21:29 +01:00
Sipke Schoorstra
8258bb3589
Moved AngularJS and Underscore to Resources.
2015-11-20 18:36:25 +01:00
Sipke Schoorstra
febdc19e81
Created initial version of Orchard.Resources module.
...
- Migrated all jQuery usages from Orchard.jQuery to Orchard.Resources.
- Deprecated Orchard.jQuery.
2015-11-20 00:21:39 +01:00
Sipke Schoorstra
e5bb771be1
Renamed WithDisplayName to DisplayedAs and removed test view from TheThemeMachine.
2015-11-19 17:56:42 +01:00
Sipke Schoorstra
f7e3f48df1
Added support for configurable snippet elements.
2015-11-19 17:39:52 +01:00
Sipke Schoorstra
5c18f49fa3
Layouts, Widgets and Conditions.
...
- Moved Rules engine code to new Orchard.Conditions module.
- Refactored Layouts and Widgets to use Conditions.
- Moved Widgets element harvester to the Widgets module as a separate feature.
2015-11-19 14:02:12 +01:00
Sipke Schoorstra
3b4b3c578a
Fixed potential widget orphans when deleting layout content.
...
This fixes the scenario where you have a layout with a widget element pointing to a widget content item, and the layout content item is being deleted.
Doing so will now correctly invoke Remove on all elements within the layout content item being deleted.
2015-11-12 21:38:33 +01:00
Sipke Schoorstra
978408765b
Fixed an issue with copy/paste.
2015-11-12 20:25:35 +01:00
Sipke Schoorstra
391459d273
Merge branch 'dev' into feature/widget-elements
...
Conflicts:
src/Orchard.Web/Modules/Orchard.Layouts/Controllers/ElementController.cs
2015-11-12 19:38:31 +01:00
Sipke Schoorstra
278e22e1b2
Merge pull request #6026 from harmony7/5995-ElementControllerBehavior
...
Fixed behavior of Element Controller in an around editing and updating.
2015-11-12 19:35:54 +01:00
Sipke Schoorstra
92fba4d76d
Updated ClientValidationRegistrationCoordinator with updated interface.
2015-11-12 19:10:03 +01:00
Sipke Schoorstra
6ff17439e8
Implemented Import/Export support for harvesters.
...
Also normalized the way drivers are invoked by moving code from the ElementManager to the ElementDriversCoordinator handler.
2015-11-11 15:48:38 +01:00
Sipke Schoorstra
61f86895db
Merge branch 'dev' into feature/widget-elements
...
Conflicts:
src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Lib.js
src/Orchard.Web/Modules/Orchard.Layouts/Scripts/dialog.js
src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor.css
src/Orchard.Web/Modules/Orchard.Layouts/Styles/Lib.css
2015-11-11 13:12:18 +01:00
Katsuyuki Ohmuro
e9146f60c4
Fixed behavior of Element Controller in an around editing and updating.
...
Also removed unused file, unused methods, and unused parameters.
2015-11-11 17:38:42 +09:00
Sipke Schoorstra
bcf4813c3e
Merge branch '1.9.x' into dev
...
Conflicts:
README.md
src/Orchard.Web/Modules/Orchard.Dashboards/Web.config
src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj
src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/Compare.cs
src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/EmailAddress.cs
src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/Mandatory.cs
src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/OptionRequired.cs
src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/RegularExpression.cs
src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/Required.cs
src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/StringLength.cs
2015-11-03 22:44:13 +01:00
Sipke Schoorstra
d63a9ed9d1
Updated ElementDisplay to use Invoke extension method.
...
The generic Invoke extension method has the advantage of catching any exceptions occurring in client code and logging them, preventing the rest of the Layouts from breaking down.
2015-11-03 20:38:57 +01:00
Katsuyuki Ohmuro
829f69198c
With the Element editor dialog, use dialog frame's jQuery for form submission.
2015-10-29 21:40:47 +09:00
Sipke Schoorstra
5344ed2e2a
Fixed order of exported content part elements.
...
This fixes an issue where the LayoutPart XML element would appear last in the content item XML element due to the fact that the <LayoutPart> element was being added only in the Exported event and not in the Exporting event.
To fix this, the <LayoutPart> element is no first added during the Exporting event, and later updated in the Exporting event.
2015-10-13 20:17:03 +02:00
Sipke Schoorstra
f8ae4cf626
Merge branch 'dev' into issue/5848/importexport
2015-10-10 12:49:56 +02:00
Sipke Schoorstra
df2ab76613
Added ImportCompleted event.
...
This event is invoked after all content items have been imported.
2015-10-09 23:52:35 +02:00
Daniel Stolt
f8409d5ce5
Updated the Gulp pipeline.
...
NOTE: You need to run "npm update" from the solution folder to download the updated version of the dependencies for the updated Gulpfile to work properly.
2015-10-09 22:41:21 +02:00
Sipke Schoorstra
547564eda8
Merge branch 'dev' into feature/widget-elements
...
Conflicts:
src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutEditor.js
src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.js
src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.min.js
2015-10-05 10:22:26 +02:00
Daniel Stolt
df216b6a18
Merge from Orchard/dev.
2015-10-04 01:57:19 +02:00
Daniel Stolt
42914c7896
Fixed a column resizing issue.
2015-10-03 19:32:50 +02:00
Daniel Stolt
bd96bf9895
Enabled focusing (and thereby pasting into) non-sealed templated containers.
2015-10-03 19:26:13 +02:00
Sipke Schoorstra
6a90cdc681
Merge branch 'dev' into feature/widget-elements
2015-10-03 00:35:43 +02:00
Sipke Schoorstra
7a047b6d1e
Removed Element stereotype.
2015-10-03 00:34:42 +02:00
Sipke Schoorstra
8535644b99
Layout editor improvements.
...
- Implemented Removed element event.
- Fixed model validation in Element editor dialog.
- Extended support for placeable content.
2015-10-03 00:28:48 +02:00
Sebastien Ros
508d97ed7d
Fixing merge
2015-10-01 09:14:21 -07:00
Sebastien Ros
d0b364c28e
Merge branch '1.9.x' into dev
...
Conflicts:
src/Orchard.Azure/Orchard.Azure.CloudService/ServiceConfiguration.Cloud.cscfg
src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
src/Orchard.Web/Core/Reports/Module.txt
src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config
src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/Configuration/AzureBlobShellSettingsManager.cs
src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/Configuration/DefaultPlatformConfigurationAccessor.cs
src/Orchard.Web/Modules/Orchard.Layouts/Drivers/LayoutPartDriver.cs
src/Orchard.Web/Modules/Orchard.Layouts/Elements/Column.cs
src/Orchard.Web/Modules/Orchard.Layouts/Module.txt
src/Orchard.Web/Web.config
2015-09-30 15:57:34 -07:00
Sipke Schoorstra
39a6e10c76
Implemented Removing event.
2015-09-30 01:07:43 +01:00
Sipke Schoorstra
6a7452d68b
Removed unneeded property.
2015-09-29 23:42:30 +01:00
Sipke Schoorstra
994b17ebe1
Removed unused scripts.
2015-09-29 23:34:59 +01:00
Sipke Schoorstra
b40a81a469
Merge branch 'dev' into feature/widget-elements
...
Conflicts:
src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
src/Orchard.Web/Modules/Orchard.Layouts/Services/ElementManager.cs
2015-09-29 21:20:50 +01:00
Sipke Schoorstra
5d5f55f535
Refactored Import process.
...
* Added Imported event to Elements.
* Invoking Imported event at the end after all content items have been imported.
Fixes #5848 .
2015-09-29 14:20:12 +01:00
Gert Smith
a3ded18eb6
Update ElementSessionState.cs
...
Make Model Serializable for use in Web Farms with session state stored in a database. Currently a Serialization error is thrown when creating layout or page in the dashboard.
2015-09-26 10:52:39 +02:00
Sebastien Ros
8865041a8b
[ Fixes #5820 ] Fixing default layout support
...
The default layout was just set in the text editor, and would not be
taken into account if the Part settings were not saved. A user would
then think the default template was there but actually not.
The change here is to leave the text editor empty, and if the setting is
empty load the default from the service. To actually have an empty template
a user needs to provide an empty object.
2015-09-25 15:07:56 -07:00
Sebastien Ros
d9e833ba58
[ Fixes #5112 ] Removing Layout dependency on TinyMce
2015-09-25 15:05:33 -07:00
Sebastien Ros
9137414305
[ Fixes #5819 ] Fixing column element default size
2015-09-25 15:04:06 -07:00
Sebastien Ros
80c600fa02
Merge branch '1.9.x' into dev
...
Conflicts:
src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPlacement.cshtml
src/Orchard.Web/Modules/Orchard.Layouts/Assets/JavaScript/Models/Element.js
src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutEditor.js
src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutEditor.min.js
src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.js
src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.min.js
src/Orchard.Web/Modules/Orchard.Layouts/Views/LayoutEditor.Template.Toolbox.cshtml
src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/ClientStorageController.cs
src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchSettingsPartDriver.cs
src/Orchard.Web/Modules/Orchard.Search/ViewModels/SearchSettingsIndexViewModel.cs
src/Orchard.Web/Modules/Orchard.Search/Views/EditorTemplates/Parts/Search.SiteSettings.cshtml
src/Orchard.Web/Modules/Orchard.Widgets/Controllers/AdminController.cs
src/Orchard/Orchard.Framework.csproj
2015-09-21 16:15:40 -07:00
Sébastien Ros
5903f75665
Merge pull request #5828 from OrchardCMS/feature/layoutpermission
...
Adding ManageLayout permission
2015-09-21 15:07:57 -07:00
