lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
9,802 Commits 83 Branches 32 Tags
42914c7896b38be859dce6f45ffbc88d4d521b7b
Commit Graph

9802 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mvarblow
fd931397a4 Allow for packing a debug build 
We use the orchard packaging script for continuous deployments to QA servers where we'd like to run debug builds.
 2015-08-13 12:01:35 -04:00
Lombiq
64585223ee Fixing that Layouts couldn't be export/imported properly because they lacked an identity 2015-08-13 17:02:50 +02: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
Lombiq
06e4d2f7f8 Fixing typo/language 2015-08-11 02:04:57 +02: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
Thierry Fleury
cc70480126 Fixes 5591 : ContentType's name encoding 2015-08-10 15:28:19 +02: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
Sipke Schoorstra
f2e0fb22b3 Removed copy/paste artifact. 2015-08-10 13:48:54 +01:00
Sipke Schoorstra
15e6c95740 Added thread synchronization. 
This ensures that only one thread at a time can acquire a lock.
 2015-08-10 13:24:54 +01:00
Gustavo Tandeciarz
7bcb6b83fb Update Package.json 
Removed Gulp Notify as it is not required.
 2015-08-10 08:08:29 -04:00
Gustavo Tandeciarz
e72471f020 Moved watchPaths in gulpfile 
Moved the watchPaths generation to the watch task.
Cleaned up some spacing
 2015-08-10 08:07:49 -04:00
Gustavo Tandeciarz
de74c00378 Updates to gulpfile.js 
Removed comments and notify, as well as console.logs.
 2015-08-10 07:53:19 -04:00
Sipke Schoorstra
5813647574 Refactor renamed ILock to IDistributedLock. 
Also refactored the IDistributedLockService to be more in line with general .NET patterns by return a boolean from the TryAcquire method.
 2015-08-10 12:47:53 +01:00
Sipke Schoorstra
f363ac2b5f Initial work on a distributed locking service. 2015-08-10 11:56:00 +01:00
Sipke Schoorstra
d2c622dac6 Merge pull request #5626 from Xeevis/dev 
Added woff2 mimetype
 2015-08-09 10:37:59 +01:00
Xeevis
f708a0f32e Added woff2 mimetype 2015-08-09 11:24:05 +02:00
Sipke Schoorstra
86b232aa52 Reformatted web.config and added some default mimetypes. 2015-08-06 21:04:12 +01:00
Sipke Schoorstra
c724cf0fcf Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Modules/Orchard.DynamicForms/Module.txt
	src/Orchard.Web/Modules/Orchard.Rules/Module.txt
 2015-08-06 20:52:13 +01:00
Sébastien Ros
b206a656e8 Merge pull request #5603 from mahsaro/WidgetLayersOrder_1.9.x 
Ordered layers alphabetically in Widget admin UI.
 2015-08-06 12:41:19 -07:00
Sébastien Ros
32669d347a Merge pull request #5610 from psenechal/1.9.x 
Update Module.txt
 2015-08-06 12:40:44 -07:00
Sébastien Ros
5bdfb6e98a Merge pull request #5476 from dcinzona/patch-1 
Added mimetype declarations to root web.config
 2015-08-06 12:40:01 -07:00
Sébastien Ros
8f9d52307b Merge pull request #5615 from OrchardCMS/issue/4097/fix-duplicate-content 
#4097: Changed Import to accommodate expected behavior as defined as …

Fixes #4097
 2015-08-06 12:32:54 -07:00
Sébastien Ros
5f51c7c31a Merge pull request #5567 from OrchardCMS/issue/homepage-alias 
Issue/homepage alias
 2015-08-06 12:31:40 -07:00
Lombiq
85fd5c8320 Fixing registration settings infoset migration 2015-08-06 21:30:35 +02:00
Sébastien Ros
7e95f78ec9 Merge pull request #5619 from OrchardCMS/issue/5271/module-manifest-metadata 
#5271: Added Lifecycle Status field to module manifest.

Fixes #5271
 2015-08-06 12:20:35 -07:00
Sipke Schoorstra
4a88752ba8 #5271: Added Lifecycle Status field to module manifest. 
- Module manifest extended with LifecycleStatus field.
- Updated Features screen to show lifecycle status if LifecycleStatus != Production.
- Updated the deprecated module manifests with the new lifecycle status (CustomForms, Media, MediaPicker and Rules).
 2015-08-06 17:48:50 +01:00
Sebastien Ros
41bd9ce9bc Adding a file system backed output cache provider 2015-08-05 16:59:34 -07:00
Sebastien Ros
e346170f24 Adding some documentation for IAppDataFolder 2015-08-05 14:21:22 -07:00
Sipke Schoorstra
b1288ae5bc Minor code cleanup. 2015-08-05 17:18:40 +01:00
Sipke Schoorstra
98666530b4 #4097: Changed Import to accommodate expected behavior as defined as part of the issue. 
This formalizes what we decided should happen when importing recipes in combination with various possible statuses a content item can have and how the import affects this.
 2015-08-05 17:11:04 +01:00
Sipke Schoorstra
ac1a279d1b #2540: Fixes an issue with NotifyFilter. 
This fixes the case when a controller for example registers a notification and then returns a View result instead of a Redirect result.
When returning a View, the registered notifications would not be rendered until another page request occurred.

Fixes #2540
 2015-08-05 14:03:44 +01:00
Gustavo Tandeciarz
b399925368 Updated Gulpfile.js 
Switched property check to use `hasOwnProperty` instead of `!== undefined`
 2015-08-05 08:42:08 -04:00
Gustavo Tandeciarz
ecbd485fd8 Updated Gulpfile.js 
Removed variable option for rebuildAlways
Set watch task to always check `watchPaths` and populated that based on `watch` variable option (if the option is present, it will watch files designated in `watch` as well as files designated in `input`.  Otherwise, it will only watch files designated in `input`.
 2015-08-05 08:28:08 -04:00