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 1 Packages Projects Releases Wiki Activity
10,135 Commits 94 Branches 33 Tags
92fba4d76dcf26d5446ac59b5caef4bfbdf566bd
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sipke Schoorstra 91b0dd5369 Changed the handling of the Initializing shell status. 
This improves the responsiveness of subsequent requests coming in dramatically.
 2015-09-10 12:11:46 +01:00
Sipke Schoorstra e9f883c296 Removed unnecessary call to DistributedLockSchemaBuilder. 
Also added code to commit the transaction if the schema was created so that it can be used in the same request (DataMigrationManager is doing the same after each migration).
 2015-09-08 20:56:28 +01:00
Sipke Schoorstra dcb340c3e6 Improved exception message. 
When developers accidentally add recipes to a module with the same name, a "key already exists" error would be logged.
This message makes it easier to identify the issue.
 2015-09-08 14:27:03 +01:00
Sipke Schoorstra c3ab703a9c Incremental work on placeable content. 2015-09-07 23:55:06 +01:00
Sipke Schoorstra 6243ecdcfe Merge branch 'dev' into feature/widget-elements 2015-09-07 20:15:21 +01:00
Sipke Schoorstra 4ad806af8e Refactored the way elements are instantiated. 
Elements are now resolved using work context scope.
 2015-09-07 18:22:56 +01:00
Sipke Schoorstra a760f012f2 Optimized HomeAlias exported XML a bit. 
Also fixed an issue when a custom route contains an empty value for a route value entry (e.g. id=null).
 2015-09-07 17:57:36 +01:00
Sipke Schoorstra d81e32d3b8 Added separator pipe between edit and delete (Alias UI). 2015-09-07 17:48:00 +01:00
Sipke Schoorstra 7ba273b4c4 Removed copy of SetupService from ImportExport. 
Refactored ISetupService and SetupContext to work with an actual Recipe object so that client code can control what recipe to use.
 2015-09-07 17:29:30 +01:00
Sipke Schoorstra 999a10b6e4 Shaving off a few microseconds per content item import. 2015-09-07 13:22:01 +01:00
Sipke Schoorstra 7d93bbbc10 Incremental work on placeable content. 2015-09-07 11:31:33 +01:00
Sipke Schoorstra 94db186b37 Minor polishing. 2015-09-04 14:43:30 +01:00
Sipke Schoorstra 3efc38dc65 Refactored distributed locks to support existing installations. 2015-09-04 14:06:08 +01:00
Sipke Schoorstra dfce6deaf1 Incremental work on placeable content. 2015-09-04 12:42:08 +01:00
Sipke Schoorstra e02bf2dacb Merge pull request #5680 from OrchardCMS/feature/initializing-tenant 
Implemented Initializing status.
 2015-09-03 13:15:42 +02:00
Sipke Schoorstra d0ad5de25c Rebuilt assets with Gulp. 2015-09-02 17:29:36 +01:00
Sipke Schoorstra 902021c686 Fixed default dashboard layout data string. 2015-09-02 14:40:15 +01:00
Sipke Schoorstra ce15e438ca Getting rid of a compiler warning regarding deprecated ExportOptions type. 2015-09-02 14:10:41 +01:00
Sipke Schoorstra 6995f26fd5 Revert "Relaxed focus targets to allow pasting of elements into templated containers." 
This reverts commit dd34d87ac9.

Conflicts:
	src/Orchard.Web/Modules/Orchard.Layouts/Assets/JavaScript/Models/Canvas.js
	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.js
	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.min.js
 2015-09-02 13:21:30 +01:00
Sipke Schoorstra a762cdf63e Revert "Incremental work on selectable elements." 
This reverts commit 54c53b7a12.

Conflicts:
	src/Orchard.Web/Modules/Orchard.Layouts/Assets/JavaScript/Models/Canvas.js
	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.js
	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.min.js
 2015-09-02 13:16:41 +01:00
Sipke Schoorstra 3c3ece6404 Revert "Work on selectable container elements." 
This reverts commit b639d893c0.

Conflicts:
	src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/Forms.js
	src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/Forms.min.js
 2015-09-02 13:12:11 +01:00
Sipke Schoorstra 748a354632 Merge pull request #5628 from OrchardCMS/feature/distributed-locking 
Feature/distributed locking
 2015-09-02 12:49:38 +02:00
Sipke Schoorstra db03498cfa Deletes lock records when Count reaches 0. 
Also some minor polishing and changed ObjectDisposedException to OrchardException in case a lock was already released.
 2015-09-02 11:43:12 +01:00
Sipke Schoorstra 553a0e260a Merge branch 'dev' into feature/distributed-locking 
Conflicts:
	src/Orchard/Orchard.Framework.csproj
 2015-09-02 10:20:57 +01:00
Sipke Schoorstra e9799d5537 Fixed a potential "ValueFactory attempted to access the Value property of this instance" issue. 
The underlying cause of such an error is a recursive call issue, where some code in a background task accesses the current http context (which is a stand in), while its construction also (indirectly) accesses the http context in order to get the site content item and query the configured BaseUrl. In theory we could access this information straight from the database without loading the Site content item, but since the URL value doesn't really matter it is better to keep it simple.
 2015-09-01 15:05:28 +01:00
Sipke Schoorstra 735ab882b2 Removed unnecessary feature from setup context. 2015-08-28 12:25:35 +01:00
Sipke Schoorstra 8f2bd16fed Fixed broken setup due to auto-enabling features. 
This change will only auto-enable features for already running shells.
 2015-08-27 14:32:43 +01:00
Sipke Schoorstra e0e600a6ce Merge pull request #5688 from Codinlab/issue/5475 
Fixes #5475 : Add missing properties to HttpRequestPlaceholder
 2015-08-24 10:42:51 +01:00
Sipke Schoorstra 7fae246341 Added convenience overload taking a default value factory method. 
This overload is useful in scenarios where you want to provide a default value but is relatively expensive to execute.
Using the overload, the factory method is only executed if the infoset does not contain an entry for the requested key.
 2015-08-23 22:40:34 +01:00
Sipke Schoorstra 81adb78818 Implemented Initializing status. 2015-08-23 18:27:36 +01:00
Sipke Schoorstra b560a4c3d0 Corrected labels on import screen. 2015-08-22 23:35:45 +01:00
Sipke Schoorstra ec0c071ab6 Refactored minor internal affairs. 2015-08-22 23:07:55 +01:00
Sipke Schoorstra 86bae087fa Added support for eternal distributed locks. 
Eternal locks never expire until they are explicitly released.
 2015-08-22 22:55:00 +01:00
Sipke Schoorstra c5b0cac24a Removed unnecessary lock statements and updated tests. 
The updated test needs to refresh the lock record entity since the DB record is updated using different connections (from child lifetime scopes).
 2015-08-22 20:15:20 +01:00