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,913 Commits 83 Branches 32 Tags
7278c0286ff59ab0e8106b48e7aea47013d56341
Commit Graph

9913 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Stolt
7278c0286f Fixed a potential exception in Gulpfile when asset group output doesn't exist. 2015-09-19 22:20:29 +02:00
Daniel Stolt
52e7fd12b1 Fixed incorrect export condition in LinkFieldDriver. 2015-09-18 02:50:11 +02:00
Daniel Stolt
1edf94756c Changed field drivers to not export empty elements. 
This results in much cleaner recipes.
 2015-09-18 02:42:40 +02: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
Sébastien Ros
ee59a61733 Merge pull request #5815 from OrchardCMS/issue/recipeexecutiontimeout 
Added configurable RecipeExecutionTimeout properties.
 2015-09-17 12:06:04 -07:00
Sipke Schoorstra
951391f4dd Refactored DefaultMessageBus. 
* Replaced private GetHostName with IHostNameProvider.
 2015-09-16 23:18:19 +01:00
Daniel Stolt
b011594be6 Improved asset manifest file change handling in Gulpfile.js. 
Code now only restarts watchers for the asset groups in the changed asset manifest file, rather than *all* asset groups. The "build" task now forces rebuild of a given asset group if its asset manifest file is newer than its concatenated output. Refactored and cleaned up the code.
 2015-09-16 16:56:51 +02: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
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
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
Sébastien Ros
bc6313fb38 Merge pull request #5771 from JRKelso/patch-1 
Updated StringExtension.cs - CamelFriendly method
 2015-09-10 10:34:36 -07:00
Ryan Kelso
ba35bc060f Update StringExtensions.cs 
Removed extraneous variable
 2015-09-10 13:13:00 -04:00
Ryan Kelso
57ad6190f8 Updated StringExtension.cs - CamelFriendly method 
Made it more obvious how CamelFriendly was choosing to enter spaces in a string

Done on behalf of Radio Systems Corporation
 2015-09-10 11:11:23 -04: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
Sébastien Ros
c5d1f2d7e8 Merge pull request #5766 from qt1/IBN-Labs/possible-fix-for-rebuild-5754 
Possible fix for #5754
 2015-09-09 16:48:26 -07:00
qt1
c75e6a808d Order of projects change in sln - csprojs come before rebracer and gulp 2015-09-10 01:52:02 +03:00
Sebastien Ros
b26690d747 Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Tests.Modules/Recipes/Services/RecipeManagerTests.cs
	src/Orchard.Web/Modules/Orchard.Widgets/Controllers/AdminController.cs
	src/Orchard/Data/Migration/AutomaticDataMigrations.cs
	src/Orchard/Environment/DefaultOrchardShell.cs
 2015-09-08 17:19:58 -07:00
Sebastien Ros
e8f0ba6ec7 Fixing RecipeManagerTests 2015-09-08 17:12:44 -07:00
Sebastien Ros
60798f9346 Fixing TokenManagerTests 2015-09-08 17:09:53 -07:00
Sebastien Ros
c83f5d88cb Supporting lazy cache manager resolution 2015-09-08 17:04:45 -07:00
Sebastien Ros
2f2134412e [Fixes #5492] Adding JavaScriptEncode token 2015-09-08 16:13:55 -07:00
Sébastien Ros
1e6b6bb24f Merge pull request #5568 from Codinlab/Tokens 
Token chaining improvements
 2015-09-08 16:08:17 -07:00
Sebastien Ros
06bf569774 Fixing compilation issue on CI 2015-09-08 16:05:13 -07:00
Sébastien Ros
16de29dabd Merge pull request #5652 from Codinlab/issues/5614 
Fixes #5614 : ContentPickerField and LayoutPart issue
 2015-09-08 15:57:38 -07:00
Sébastien Ros
a0ca1fca1c Merge pull request #5744 from OrchardCMS/sebastienros/datetimerelative 
Improving DateTimeRelative shape
 2015-09-08 15:46:01 -07:00
Sebastien Ros
691809cd85 [Fixes #5733] Update default Layout state settings 2015-09-08 15:40:28 -07: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
Sébastien Ros
ce1df8d794 Merge pull request #5677 from dcinzona/Gulpfile-watch-assets.json 
Enables gulp watch of Assets.json
 2015-09-08 11:37:54 -07:00
Sébastien Ros
74be36d8a3 Merge pull request #5763 from phillipsj/1.9.x 
Updating DynamicForms Module.txt
 2015-09-08 11:11:12 -07:00
Jamie Phillips
2bb7eb2f91 Updating DynamicForms Module.txt 
The CustomForms module name and website were listed.
 2015-09-08 13:06:04 -04:00