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,822 Commits 83 Branches 32 Tags
428b44a900a13632a97c23cf77daba246a0ea0f1
Commit Graph

9822 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Stolt
f19b57c1e6 Fixed one remaining unit datetime localization unit test on Windows 10. 2015-08-17 00:25:34 +01:00
Daniel Stolt
9429ad6e63 Merge branch '1.9.x' into dev 2015-08-17 00:03:59 +01:00
Daniel Stolt
7533cd8879 Improved DateTime localization and unit tests on Windows 10. 
Added support for era names to date formatting/parsing framework. Added handling of cultures with missing AM/PM designators. Fixes failing unit tests on Windows 10. Fixes #5595.
 2015-08-17 00:01:32 +01:00
Daniel Stolt
75609bf2ce Excluded private locator URLs from JSON serialization in Azure Media Services. Fixes #4686. 2015-08-16 20:13:33 +01:00
Daniel Stolt
6228f4e8fb Merge branch '1.9.x' into dev 2015-08-16 18:02:29 +01:00
Daniel Stolt
4b44827f2a Added skeleton Assets.json to codegen theme template. 2015-08-16 17:50:47 +01:00
Daniel Stolt
a04195ee0e Added a simple skeleton Assets.json to codegen module template. Fixes #5606. 2015-08-16 17:38:16 +01:00
Daniel Stolt
3183df5b4a Recreated folder to resolve git case inconsistency. 2015-08-16 16:27:09 +01:00
Daniel Stolt
dfa1ada978 Deleted folder to resolve git case inconsistency. 2015-08-16 16:25:58 +01:00
Daniel Stolt
a6a6cb2d90 Merge branch '1.9.x' into dev 2015-08-16 16:19:59 +01:00
Daniel Stolt
b2c131f516 Refactored watch task in Gulpfile.js. 2015-08-16 16:15:46 +01:00
Daniel Stolt
359d25c1f2 Merge branch 'patch-5' of https://github.com/dcinzona/Orchard into 1.9.x 2015-08-16 14:43:36 +01:00
Lombiq
6552735df3 Media Library now correctly handles files with a # character in their name, fixes #5421. 2015-08-16 02:23:11 +02:00
Lombiq
59b3d50e03 Fixing that the empty username validation message wasn't shown on the Lost Password page, fixes #5353 2015-08-16 02:08:12 +02:00
Daniel Stolt
c508584e63 Merge branch '1.9.x' into dev 2015-08-14 11:57:38 +01:00
Daniel Stolt
f2bf75328e Merge pull request #5642 from paynecrl97/5520/tenantAwareConfig 
#5520 AppConfigurationAccessor is now tenant aware.

Fixes #5520.
 2015-08-14 11:43:09 +01:00
Chris Payne
0213524317 AppConfigurationAccessor is now tenant aware 2015-08-14 11:34:28 +01:00
jtkech
1ed973ab88 Update MediaController.cs 2015-08-14 00:29:02 +02:00
jtkech
c4d20e3b73 Update ContentPickerController.cs 2015-08-14 00:14:57 +02:00
jtkech
07efdb267a Update Routes.cs 2015-08-13 23:27:40 +02:00
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