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
10,238 Commits 94 Branches 33 Tags
206f1396d5b86a9c9eb51a757319afead3046f24
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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 5f40af0f99 Changed LayoutRecord Guid type to Guid. 2015-09-29 21:13:11 +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
Sipke Schoorstra e2e539897e Updated Azure Host.config. 2015-09-28 15:23:49 +01:00
Sipke Schoorstra 0ad1ef3098 #5847: Fixed CssClasses import/export. 2015-09-24 14:03:29 +01:00
Sipke Schoorstra d310a56c38 Merge pull request #5814 from OrchardCMS/task/machinenameprovider 
Refactor renamed IMachineNameProvider.
 2015-09-17 21:52:15 +01:00
Sipke Schoorstra 8d0205ebfb Changed namespace. 2015-09-17 21:51:58 +01:00
Sipke Schoorstra 951391f4dd Refactored DefaultMessageBus. 
* Replaced private GetHostName with IHostNameProvider.
 2015-09-16 23:18:19 +01:00
Sipke Schoorstra 8ee09eacd0 Added configurable RecipeExecutionTimeout properties. 
* Added RecipeExecutionTimeout to SetupController.
* Added RecipeExecutionTimeout to ExecuteRecipeAction.
* Added property-injection registration source to ShellContainerFactory so that controllers can have their public properties be configured.
 2015-09-15 23:41:58 +01:00
Sipke Schoorstra 3896a8f921 Minor cleanup and formatting. 2015-09-15 23:02:58 +01:00
Sipke Schoorstra c6a87f5228 Refactor renamed IMachineNameProvider. 2015-09-15 22:58:21 +01:00
Sipke Schoorstra 66ff5d36e9 Merge pull request #5810 from Codinlab/issue/5809 
Fixes #5809 : Layouts : DisplayText encoded twice in Design mode
 2015-09-15 14:03:55 +01:00
Sipke Schoorstra 40071a6050 Fixed missing feature states exception. 
- Fixed an issue with Orchard failing to initialize when the Settings_ShellFeatureRecord contains orphaned features (which happens when a module has been removed).
- Added unit tests.
 2015-09-15 12:38:27 +01:00
Sipke Schoorstra 40f1e39622 Merge pull request #5806 from OrchardCMS/issues/5805/outputcachesettings-importexport 
Implemented output cache routes import/export.
 2015-09-15 10:27:23 +01:00
Sipke Schoorstra 7fae88a879 Implemented output cache routes import/export. 
Fixes #5805
 2015-09-14 23:33:17 +01:00
Sipke Schoorstra d0e7c09ba5 Updated AliasMap 
Ordering by key Length rather than key value.
 2015-09-14 13:21:57 +01:00
Sipke Schoorstra a3fe3592c6 Merge pull request #5799 from mvarblow/patch-5 
Code clean-up in TermCountProcessor.cs
 2015-09-13 13:42:39 +01:00
Sipke Schoorstra fe43ef4912 Small UI improvement to Content / Content Definition export UI. 2015-09-12 19:25:55 +01:00
Sipke Schoorstra 5540e98079 Fixed MultiTenancy feature specflow tests. 2015-09-12 15:50:38 +01:00
Sipke Schoorstra 8ca6c3367a Fixed Pages specflow test. 
Note: this changes the specification from the hime page being accessible only via ~/ to being accessible via both ~/ as well as ~/my-page.
 2015-09-12 15:03:12 +01:00
Sipke Schoorstra 9e3d9c8557 Changed home alias and fixed blog feature specflow test. 
- The Home Alias change causes home page content items to be reachable via two URLS (e.g. ~/ and ~/my-blog), so accomodated the specflow test for that.
- Fixed a bug with HomeAlias where it would not find content items if their display route values contains keys other than "Id". Blogs uses "blogId", so the former implementation of just looking up the "Id" entry was too naive.
 2015-09-12 14:44:46 +01:00
Sipke Schoorstra 158069ef47 Formatted specflow files. 2015-09-11 19:46:09 +01:00
Sipke Schoorstra ac8ee80b2a Fixed some more specflow tests. 2015-09-11 19:45:37 +01:00
Sipke Schoorstra db6d1912a7 Fixed alias generation. 
The Specflow tests revealed a bug where a default pattern would be used instead of the configured one.
 2015-09-11 19:25:55 +01:00
Sipke Schoorstra 8b9189f750 Fixed Autoroute Specflow test. 2015-09-11 18:46:35 +01:00
Sipke Schoorstra 37c344842a Updated Host.config for Specflow tests. 2015-09-11 18:42:57 +01:00
Sipke Schoorstra e86a1bd1b7 Simplified shell context creation. 2015-09-11 17:18:54 +01:00
Sipke Schoorstra 482dae3a20 Merge pull request #5770 from OrchardCMS/feature/tenantstateinitializing 
Changed the handling of the Initializing shell status.
 2015-09-11 12:16:20 +01:00
Sipke Schoorstra 4874b2d53d Merge remote-tracking branch 'origin/dev' into feature/tenantstateinitializing 2015-09-10 23:39:01 +01:00
Sipke Schoorstra 8308d66d66 Resetting shell state in case of an unexpected exception during setup. 2015-09-10 23:37:10 +01:00
Sipke Schoorstra e97d54e600 Improved "tenant initializing" status description. 2015-09-10 23:20:33 +01:00
Sipke Schoorstra 9897f6ada5 Added "service unavailable" support for the currently requested shell. 2015-09-10 23:18:43 +01:00
Sipke Schoorstra 256b1313b2 Added control over standalone environment creation without affecting shell state. 
Setting the shell state to "Running" just to create the correct work context scope works, but in theory, requests could come in and be served from a "running" shell while the setup recipe is still being executed.
 2015-09-10 22:45:29 +01:00
Sipke Schoorstra 9c912b842b Merge pull request #5752 from OrchardCMS/feature/distributedlocking 
Refactored distributed locks to support existing installations.
 2015-09-10 21:55:16 +01:00
Sipke Schoorstra b7aa00faf4 Merge remote-tracking branch 'origin/dev' into feature/distributedlocking 
Conflicts:
	src/Orchard.Web/Modules/Orchard.ImportExport/Services/SetupService.cs
	src/Orchard/Tasks/Locking/Services/DistributedLockService.cs
 2015-09-10 21:50:46 +01:00