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
9,976 Commits 94 Branches 33 Tags
8535644b990cb3aaa8f2f5069547787ef7768620
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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 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 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 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
Sipke Schoorstra 5f4cd14937 Changed the lifetime of DB services to match their lifetime scope. 
This enables tests that involve multi threading and child lifetime scopes.
 2015-08-22 20:13:46 +01:00
Sipke Schoorstra 7673e2e12f Non-functional change but more explicit. 
Perhaps a bit subjective, but passing in a null value or a zero value controls whether the AcquireLockInternal will block or not, so probably better to provide an explicit Zero value from TryAcquireLock instead.
 2015-08-22 18:10:43 +01:00
Sipke Schoorstra 3615cbe6db Added table index to DistributedLockRecord. 2015-08-22 18:04:12 +01:00
Sipke Schoorstra 5dcbad2235 Formatted code. 
Moved static members to top of class.
 2015-08-22 17:51:34 +01:00
Sipke Schoorstra 079fb1f84b Narrowed the lock scope to per-thread. 2015-08-22 17:11:03 +01:00
Sipke Schoorstra 1cf2b6cf27 Corrected message on ObsoleteAttribute applied to ITaskLeaseService/TaskLeaseService. 2015-08-22 17:05:42 +01:00
Sipke Schoorstra de3d205ca9 Implemented a Widget element harvester. 2015-08-22 16:59:17 +01:00
Sipke Schoorstra 47ac6ba0ad Fixed a typo. 2015-08-22 16:58:44 +01:00
Sipke Schoorstra 59c711fdb0 Fixed a subtle bug. 2015-08-22 16:58:22 +01:00
Sipke Schoorstra 2555302ed7 Removed unintentionally added file. 2015-08-21 23:21:13 +01:00
Sipke Schoorstra 811001143e Corrected interface name. 
Potentially breaking, but I highly doubt anyone implemented this interface.
 2015-08-21 23:14:37 +01:00
Sipke Schoorstra 412c531027 Merge branch 'dev' into feature/auto-enable-dependencies 
Conflicts:
	src/Orchard/Orchard.Framework.csproj
 2015-08-21 19:45:53 +01:00
Sipke Schoorstra 81bf5d94fd Updated usages of ITaskLeaseService with IDistributedLockService. 2015-08-21 19:35:42 +01:00
Sipke Schoorstra 6c712a9840 Fixed bugs, refactored and polished distributed lock service. 
- Added machine and thread scoped locking.
- Added support for blocking acquisitions.
- Added thread synchronization when creating and committing nested transactions for lock record creation and updates.
 2015-08-21 15:22:32 +01:00
Sipke Schoorstra 61f1c3ae00 Simplified distributed locking implementation and did the following: 
- Added Support for re-entry
- Made TryAcquireLock method thread-safe.
- Changed the way locks are released by decreasing their ref count. A lock is expired if: a) ref count == 0 or b) ExpiredUtc lies in the past. It is no longer necessary to delete a lock record (but would be fine, maybe as a background task).
 2015-08-19 23:05:39 +01:00
Sipke Schoorstra 641236f358 Re-implemented HomeAlias custom export step as recipe builder steps. 2015-08-13 14:43:05 +01:00
Sipke Schoorstra 564fdc27be #5636: Fixed a bug with AliasStorage.Remove method. 
Fixes #5636
 2015-08-13 13:48:37 +01:00
Sipke Schoorstra 25fa422a5e Added RemoveContent execution step. 2015-08-13 13:44:26 +01:00
Sipke Schoorstra 7d7340fbab Resolved merge conflicts. 
The dev branch had the ExtensionManagerExtensions class as a separate file while the 1.9.x branch had this class in the same file as IExtensionManager.cs.
 2015-08-12 15:33:10 +01:00
Sipke Schoorstra 591a06e944 Merge branch 'dev' of https://github.com/OrchardCMS/Orchard into feature/auto-enable-dependencies 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Layouts/Module.txt
	src/Orchard/Environment/Extensions/IExtensionManager.cs
	src/Orchard/Orchard.Framework.csproj
 2015-08-12 15:24:36 +01:00
Sipke Schoorstra 08a3285e4f #3132: Auto-enabling dependency features. 
This makes sure that any dependency of a feature that is currently not enabled gets enabled automatically before the shell is activated.
This prevents potential autofac resolution issues if one service depends on another service provided by a feature that is disabled.

Fixes #3132
 2015-08-12 15:13:03 +01:00
Sipke Schoorstra 4cd88cb9c9 Minor cleanup and formatting. 2015-08-12 15:07:15 +01:00
Sipke Schoorstra f39b273558 Fixed some typos and corrected TinyMce dependency listings. 2015-08-12 14:47:24 +01:00
Sipke Schoorstra 77b8df516a Improved locking code. 
- Moved DatabaseLock into Framework and making it the default lock provider.
- Removed unnecessary thread synchronization code.
- Allowing multiple lock acquisitions from the same machine (simulating a "lease").
- Updated unit tests.
 2015-08-11 16:43:48 +01:00
Sipke Schoorstra 11f6ecc4d4 Added unit test for CompositionStrategy. 2015-08-11 12:56:18 +01:00
Sipke Schoorstra cb6835aba3 Updated AutomaticDataMigrations to take advantage of the DistributedLockService. 2015-08-10 18:08:00 +01:00
Sipke Schoorstra 0a9b05314e Changed dependency resolution. 
This ensures dependency resolution works even when there's no work context (which happens when the code executes at the EndRequest event for example).
 2015-08-10 18:06:57 +01:00
Sipke Schoorstra 01de9ef646 Addec leanup code to the ContainerTestBase. 2015-08-10 18:05:15 +01:00
Sipke Schoorstra 92c6d5fd80 Added logging statement in case of non-fatal exception. 2015-08-10 17:43:21 +01:00
Sipke Schoorstra 97fcfd4e24 Added tests for DistributedService. 2015-08-10 16:27:04 +01:00
Sipke Schoorstra 68c401c6eb Preventing usage disposed object and fixed EnsureLifetimeScope. 2015-08-10 15:27:15 +01:00
Sipke Schoorstra 16cd4e89c4 Added tests for DatabaseLock. 2015-08-10 15:24:18 +01:00
Sipke Schoorstra 17082eec9c Refactored disposal of DatabaseLock. 
This ensures the cleanup will be able to resolve a database transaction even when it's Autofac that's disposing the object.
 2015-08-10 15:13:03 +01:00
Sipke Schoorstra b62939f850 Implemented locking using ReaderWriterLockSlim and simplified logging statements. 2015-08-10 14:06:58 +01:00
Sipke Schoorstra ab12e9e630 Turned IDistributedLockService into an ISingleton. 2015-08-10 14:06:13 +01:00