lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
11,086 Commits 94 Branches 33 Tags
3ceda381c54ca24cbcaa2ea17db4898fc9a12df1
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sipke Schoorstra d3f4c91d40 Fixing ExclusiveBranchActivity 
The ToList call prevents an issue where the foreach body would cause a collection change, whoch would throw a "collection modified" exception.
 2018-05-21 12:54:03 +02:00
Sipke Schoorstra 097119466a Revert "Updated GroupInfo name for AuditTrail settings." 
This reverts commit 9f98d3151b.
 2017-02-28 21:17:48 +01:00
Sipke Schoorstra 9f98d3151b Updated GroupInfo name for AuditTrail settings. 
#Fixes 7583
 2017-02-28 14:37:39 +01:00
Sipke Schoorstra 03d5a375d3 Fixed an issue with layout element lookup. (#7305) 
Fixes #7304
 2016-10-13 12:09:19 -07:00
Sipke Schoorstra ec0a0998da Wrapped owin middleware config (#7161) 
This wraps owin middle ware configuration within a work context scope.

Fixes #6991
 2016-09-29 12:34:50 -07:00
Sipke Schoorstra 8218535d27 Added CodeRush for Roslyn settings folder to .gitignore. 2016-09-28 16:10:46 +02:00
Sipke Schoorstra bc74aec232 Fixed ContentFieldHarvester when NULL Content 
The content field harvester throws an error when the LayoutEditor is rendered without having a content item as the context (BluePrints, for example). The previous code would fall back to simply enumerating all fields of all parts to make available all content fields as elements. However, the content field elements can't render these fields without having a proper content item as context, so it would fail with an exception.

There are scenarios where one might still want to be able to add content field elements on the canvas even when there is no current content item (to create template layouts for example). But to support this, we need to figure out what we want to render if we can;t actually render the content field at design time. Perhaps a simplified representation would suffice in this scenario. To be discussed. Removing the broken feature for now.
 2016-09-24 11:45:19 +02:00
Sipke Schoorstra 0a06a788b2 Renamed private method in NavigationHelper. 2016-06-16 21:55:07 +02:00
Sipke Schoorstra 06422f9e63 Removed unnecessary YamlService. 
Instead we can use the NuGet package directly.
 2016-04-12 21:53:12 +02:00
Sipke Schoorstra 660f41c582 Fixed removal of records in DistributedLockService 
Fixes #6444
 2016-04-11 16:10:00 -07:00
Sipke Schoorstra a5605b7fbd Added support for snippet manifests 
Fixes #6672
 2016-04-11 16:08:44 -07:00
Sipke Schoorstra 54c8c8417e Fixed LayoutEditor JS bugs. 
Fixes #6546
 2016-04-02 02:15:48 +02:00
Sipke Schoorstra 3690968646 Fixed Dynamic Forms Bindings issue. Fixes #6470 
ModelBinding failed due to the "null" key being specified. Instead, the type name of the model should be specified as the key (which happens by default when no key is specified). Not sure how this worked before, since this code has been there from the beginning, and file histories don;t show an obvious change. Perhaps due to the upgrade to newer ASP.NET MVC?
 2016-03-02 23:51:22 +01:00
Sipke Schoorstra 1e2d919b02 Improved snippets harvester. 
Fixes #6432
 2016-02-20 17:44:31 +01:00
Sipke Schoorstra 96a4af5a68 Removed unneeded HTML file. 2016-02-04 21:28:27 +01:00
Sipke Schoorstra 59d20c3d40 Fixed an issue with rendering shapes from Orchard.exe. 
Fixes #6321
 2016-01-31 22:43:03 +01:00
Sipke Schoorstra b9fa87d5e2 Fixed an issue with a null BaseUrl during Setup from Orchard.exe. 
Fixes #6320
 2016-01-31 14:25:45 +01:00
Sipke Schoorstra cb572e0bed Merge pull request #6139 from neTp9c/ImportExportMenuElement 
Import and Export for menu element.
 2016-01-29 00:48:16 +01:00
Sipke Schoorstra 91fdba1e2c Added LegacyRulesEvaluator. 
This will handle third-party modules that still implement the deprecated IRuleProvider.
 2016-01-28 23:15:13 +01:00
Sipke Schoorstra 5f0e690874 Fixed reCaptcha driver. 
This fixes an issue where the reCaptcha driver would not add a model validation error in case captcha-validation failed, enabling bots to circumvent the validation altogether.
 2016-01-17 16:26:17 +01:00
Sipke Schoorstra c642bc0174 Merge pull request #6253 from Codinlab/patches/media-library-picker 
Fix media-library-picker.js
 2015-12-31 14:40:33 +01:00
Sipke Schoorstra fde4c32aff Fixed activity toolbox filtering. 
Due to a bug in the orchard-workflows.js script, the activity toolbox filter was broken.
 2015-12-30 17:52:46 +01:00
Sipke Schoorstra c8b5664d26 Fixed a bug in HomeAliasService 
The bug would cause a null reference exception in case there is no alias with an empty string (the home alias).
 2015-12-30 17:28:23 +01:00
Sipke Schoorstra d21aae3506 Merge pull request #6250 from infofromca/fix6245b 
second time to fix #6245
 2015-12-30 16:10:20 +01:00
Sipke Schoorstra 64d8c1a16f Added handling of nullable enums. 
This enables content parts to use infoset storage with nullable enum types.
Before this change, the NotSupportedException would be thrown.
 2015-12-30 14:20:26 +01:00
Sipke Schoorstra bd1a1eb6e6 Merge pull request #6191 from Codinlab/fixes/6189 
Fixes #6189 : TextAreaElement throwing on null ProcessedValue
 2015-12-28 16:25:39 +01:00
Sipke Schoorstra d1fd7cd271 Improved class attribute logic. 
This change fixes that the `"class"` attribute would be added to the tag even if there are no css classes to assign. This in turn has the effect that the root `Canvas` element is not rendering its outer tags needlessly by default (only if it has at least one attribute).
 2015-12-28 16:05:54 +01:00
Sipke Schoorstra 49317ec33f Giving back Classes to the Shapes. 
This fixes a limitation where the Classes property on an element shape would be ignored when rendering tags using attributes returned from the TagBuilderExtensions.GetCommonElementAttributes method.
 2015-12-25 14:43:43 +01:00
Sipke Schoorstra 8ee37a6de0 Merge pull request #6218 from paynecrl97/patch-3 
Use Display Name to show validation messages
 2015-12-22 22:24:24 +01:00
Sipke Schoorstra 4418bcdc19 Fixed a bug in LayoutModelMapper. 
If the root Canvas is manually instantiated, it will not have a valid ElementDescriptor.
 2015-12-22 20:21:28 +01:00
Sipke Schoorstra a492f89ea0 Further Layouts client-side scripting improvements. 
- Pushed the editElement function further down from Content to Element, which means even less code for custom container elements.
- Fixed a bug where client-side element editor state would not be applied after editing that element.
- Pushed down the toObject function from Content to Element, which means less code is necessary for custom container elements.
-
 2015-12-21 20:59:47 +01:00
Sipke Schoorstra d1c0f98010 Updated Layouts to simplify custom container elements. 
These changes simplifies the requirements for implementing custom container elements by minimizing the amount of code necessary to tie things together.
 2015-12-21 19:48:59 +01:00
Sipke Schoorstra 8eef43f20d Fixed media library picker field script. 
This fixes an issue where the code selecting the 'Save' button would match any button with the 'button.save' class.
The issue became apparent when working with Image element on a layout. The Element Editor Dialog also has a 'Save' button with the 'button save' class, en became hidden when no image was selected.
 2015-12-20 16:37:57 +01:00
Sipke Schoorstra 68c94f4534 Fixed a potential issue with new Container elements. 
Making the ContentModelMap the default mapper for all elements fixes a potential issue when a new Container element is introduced but no model map implementation exists for that container. Letting the ContentModelMap handle the mapping by default would yield best results rather than doing no mapping at all.
 2015-12-20 16:33:34 +01:00
Sipke Schoorstra 9715ee88df Removed unnecessary Html model map. 
The Html model mapping was originally needed to support inline editing of Html elements, but that capability has been removed.
 2015-12-20 16:28:36 +01:00
sfmskywalker 72aa82c048 Merge branch '1.9.x' into dev 
# Conflicts:
#	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutDesignerHost.js
 2015-12-18 00:33:56 +01:00
Sipke Schoorstra e72e6fcb1f Fixed layout editor javascript issue. 
As per the comments in https://github.com/OrchardCMS/Orchard/pull/6159, the issue was that the layout designer host has a dependency on the layout editor object, but the former would be created before the latter.
This changeset moves the initialization code together in order to control the order in which what object is created first.
 2015-12-15 22:35:29 +01:00
Sipke Schoorstra 1e963d4d50 Merge pull request #6159 from connorsmallman/Bug/6142/LayoutEditorJS 
Wait for document ready before calling LayoutEditor constructor
 2015-12-10 14:34:49 +01:00
Sipke Schoorstra 206f1396d5 Merge pull request #6144 from connorsmallman/Bug/6142/LayoutEditorJS 
Fix for issue #6142
 2015-12-10 14:28:59 +01:00
Sipke Schoorstra 3a7091467b Fixed duplicate field shape issue with Content Field elements. 
Fixes #5974
 2015-12-08 01:15:41 +01:00
Sipke Schoorstra d9e96d6870 Fixed Dynamic Forms merge issue. 
1.9 > dev: renamed ElementDisplayContext to ElementDisplayingContext.
 2015-12-04 12:26:42 +01:00
Sipke Schoorstra 18b2ffe593 Merge branch '1.9.x' into dev 
Conflicts:
	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/FieldsetElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/HiddenFieldElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/LabelElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextAreaElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/UrlFieldElementDriver.cs
 2015-12-04 12:20:58 +01:00
Sipke Schoorstra 68b3fe56d0 Updated various input elements using NoEncode. 
This prevents HTML characters from being encoded when using the tokenizer on element labels.
 2015-12-04 12:14:21 +01:00
Sipke Schoorstra e29fb90298 Removed processing of tokens of RuntimeValue (Dynamic Forms). 
Also fixes #6117.

(cherry picked from commit db564d1670)
 2015-12-04 11:55:14 +01:00
Sipke Schoorstra db564d1670 Removed processing of tokens of RuntimeValue (Dynamic Forms). 
Also fixes #6117.
 2015-12-04 00:18:27 +01: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
Sipke Schoorstra 33484ae31a Fixed date and time picker. 2015-12-02 23:27:46 +01:00
Sipke Schoorstra c4f961105d Updated Orchard.Resources descr. by Daniel Stolt. 2015-12-01 22:54:06 +01:00
Sipke Schoorstra dd59d7c385 Merge pull request #6104 from Codinlab/fixes/6033 
Fixes #6033 : EmailActivity fails when run via background task
 2015-11-29 19:10:49 +01:00
Sipke Schoorstra 7b6f0ec56f Merge pull request #6076 from PaulDevenney/Issues/6075/SetupSlowRecipes 
Added two optimisations to avoid duplicate work
 2015-11-26 17:15:40 +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 7b47356152 Merge pull request #6062 from OrchardCMS/feature/resources 
Orchard.Resources - Consolidate third-party client-side resources into dedicated module
 2015-11-24 01:45:40 +01:00
Sipke Schoorstra a09c2045c5 Consolidated separate features into a single one. 2015-11-24 01:44:49 +01:00
Sipke Schoorstra 3da3ab8a49 Added Uri. 2015-11-21 15:49:23 +01:00
Sipke Schoorstra 1271539b0a Added BlockUI and Moment. 2015-11-21 15:42:03 +01:00
Sipke Schoorstra 599624c3b0 Added History and Knockout and updated MediaLibrary. 2015-11-21 15:09:56 +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 a93398eac0 Merge pull request #6030 from OrchardCMS/feature/widget-elements 
Widgets in Layouts
 2015-11-19 14:08:25 +01:00
Sipke Schoorstra bda0f3d732 Merge branch 'dev' into feature/widget-elements 2015-11-19 14:03:16 +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 db8c11d79b Added tabbed editor UI support to MenuItem types. 2015-11-16 22:08:59 +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 578184f50f Fixed an audittrail diff bug. 
The bug caused a YSOD if the diffgram contained a match for a changed attribute being the last node of the diffgram.
 2015-11-12 21:06:44 +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
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 06ee7849c1 Removed tokenization from dynamic form error messages. 2015-11-03 22:34:11 +01:00
Sipke Schoorstra 61c91ff858 Merge pull request #5884 from phillipsj/1.9.x 
Resolves #5878 : URL Field for Dynamic Forms
 2015-11-03 22:08:22 +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
Sipke Schoorstra 388932b41f Merge pull request #5992 from harmony7/LayoutEditorSaveJquery 
With the Element editor dialog, use dialog iframe's jQuery for form submission
 2015-10-29 14:27:57 +01:00
Sipke Schoorstra ab60db84b3 Added Orchard.Dashboards to Project Dependencies. 2015-10-29 13:02:07 +01:00
Sipke Schoorstra e3026b199e Added Priority setting to the Orchard.Setup module manifest. 
Fixes #5980
 2015-10-27 10:08:11 +01:00
Sipke Schoorstra 255547288b Fixed T usage in ValidationRules, round 2. 2015-10-16 10:45:08 +02:00
Sipke Schoorstra 054925c297 Fixed T usage in ValidationRules. 2015-10-15 21:47:01 +02:00
Sipke Schoorstra d6c4d648a6 Refactored content handler invocations using Invoke. 2015-10-13 21:29:19 +02:00
Sipke Schoorstra 161ac92c9e Removed unused Guid property from LayoutRecord. 2015-10-13 20:41:05 +02: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 51fe8fecb9 Added ImportCompleted event to field drivers too. 2015-10-12 21:37:04 +02:00
Sipke Schoorstra ed78338e4e Merge branch 'dev' into issue/5848/importexport 2015-10-12 21:27:37 +02:00
Sipke Schoorstra 98c8101891 Added batch label to log messages. 2015-10-12 21:24:37 +02:00
Sipke Schoorstra 80a51561b5 Added CompleteImport to IContentManager. 
This makes it easier for other places that leverage the Import method to also invoke the CompleteImport method.
 2015-10-12 21:22:44 +02:00
Sipke Schoorstra 9605d216e6 Renamed a method and improved logging messages. 
- Renamed ImportedAll to ImportCompleted.
- Added a "batch label" to the BatchedInvoke method to be able to better identify what's being executed from the log files.
 2015-10-12 12:54:59 +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
Sipke Schoorstra ee43743621 Reverted changes to content manager and content step. 2015-10-09 22:35:50 +02:00
Sipke Schoorstra d09406c4ca Merge branch 'dev' into feature/widget-elements 2015-10-05 15:36:17 +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
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