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 3 Packages Projects Releases Wiki Activity
9,719 Commits 94 Branches 33 Tags
8f2bd16fed1d81ea6bf98f550a7dd0d88b4aafb0
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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 b560a4c3d0 Corrected labels on import screen. 2015-08-22 23:35:45 +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 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 11f6ecc4d4 Added unit test for CompositionStrategy. 2015-08-11 12:56:18 +01:00
Sipke Schoorstra d2c622dac6 Merge pull request #5626 from Xeevis/dev 
Added woff2 mimetype
 2015-08-09 10:37:59 +01: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
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
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
Sipke Schoorstra 226dc719ab Merge pull request #5599 from mahsaro/dev 
Importing/Exporting of Aliases.
 2015-08-04 22:25:20 +01:00
Sipke Schoorstra de29f63521 Formatted file. 2015-08-04 17:18:28 +01:00
Sipke Schoorstra 8cda6b54c6 Throwing an exception when specifying a non-existing recipe. 2015-08-04 17:08:15 +01:00
Sipke Schoorstra 783281321c Updated generated assets. 2015-08-04 17:07:32 +01:00
Sipke Schoorstra f4a707a281 Merge branch 'dev' into issue/homepage-alias 
Conflicts:
	src/Orchard.Web/Modules/Orchard.ImportExport/Views/Admin/ImportResult.cshtml
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
 2015-08-04 16:28:07 +01:00
Sipke Schoorstra 2ad324d4e2 Merge branch 'dev' into issue/homepage-alias 
Conflicts:
	src/Orchard.Web/Modules/Orchard.ImportExport/Views/Admin/ImportResult.cshtml
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
 2015-08-04 16:25:35 +01:00
Sipke Schoorstra 0c6326bafd Improved recipe import/reset execution by pausing sweep generator. 
This prevents active background tasks from accessing tables that may no longer be there (in the case of a full site reset) by pausing the sweep generator.
To ensure that the sweep generator is resumed after the recipe has been executed, a new ActivateSweepGeneratorStep is enqueued at the end of the recipe execution.
 2015-08-04 15:03:47 +01:00
Sipke Schoorstra d746548f56 Fixed reset. 
The database tables need to be dropped after reading settings from the Site item.
 2015-08-03 18:51:15 +01:00
Sipke Schoorstra 7ba2751de1 Fixed an issue with site reset. 
This fixes an issue where currently enabled features are enabled too soon.
Instead only core features should be enabled and then whatever is enabled via the recipe.
 2015-08-03 18:00:15 +01:00
Sipke Schoorstra 0c729e6e7f Fixed DI registration of IDatabaseManager. 2015-08-03 17:23:47 +01:00
Sipke Schoorstra 7f55f27580 Renamed weirdly named argument. 2015-08-03 17:21:14 +01:00
Sipke Schoorstra 3cd39bcc73 Fixed dropping of database tables during site reset. 
This fixes an issue where only a subset of the actual tables were being deleted due to a minimal shell context.
 2015-08-03 17:20:55 +01:00
Sipke Schoorstra 09f3e2ad2f Removed unused namespaces and some whitespace. 2015-08-03 17:19:08 +01:00
Sipke Schoorstra 64077ae09a Changed labels of content recipe builder step. 
This should make for a more consistent terminology.
 2015-07-30 23:13:19 +01:00
Sipke Schoorstra 2a2aba9548 Fixed that xmldecl was not part of the export.xml. 2015-07-30 22:57:26 +01:00
Sipke Schoorstra c746fe926b Fixed removal of database tables when using data table prefix. 2015-07-30 16:39:17 +01:00
Sipke Schoorstra 73170a0d63 Added support for multiple recipe steps of the same type and added unit tests. 
Enables execution of multiple child recipes in a particular sequence. This is useful for the RecipesStep for example, where you want to execute a child recipe first, then execute some commands and import some content, then execute a second child recipe.
 2015-07-30 14:26:01 +01:00
Sipke Schoorstra a7d2777478 Made DatabaseEnabledTestsBase.Cleanup virtual. 
This enables child classes to provide additional cleanup.
 2015-07-30 14:21:32 +01:00
Sipke Schoorstra d13d3e7ff3 Fixed a null reference exception by initializing the lists. 2015-07-29 13:06:50 +01:00
Sipke Schoorstra 57692e073d Added RecipesStep. 
This recipe steps enables the execution of other recipes within the same ExecutionId.
 2015-07-28 18:15:43 +01:00
Sipke Schoorstra cbf10216b0 Merge pull request #5581 from dcinzona/patch-4 
Updated README.md Orchard version to 1.9.1
 2015-07-28 15:14:00 +01:00
Sipke Schoorstra 805de7d563 Removed unnecessary check for "/". 
The DisplayAlias of a content item will not be set to "" or "/" for the item to become the homepage, so there's no need to check for the display alias to be "/".
 2015-07-26 17:16:41 +01:00
Sipke Schoorstra 8aa2a9f070 Fixed autoroute part editor template. 
This fixes an issue where the alias text field becomes hidden when the content is the homepage, while given the home alias updates you should still be able to change the alias of the content item.
 2015-07-26 17:10:09 +01:00
Sipke Schoorstra c4ff7a21f3 Removed unused namespace. 2015-07-26 17:06:33 +01:00
Sipke Schoorstra 2317d6a737 Update FrontEndCultureSelector shape template to accommodate home alias changes. 2015-07-26 16:19:38 +01:00
Sipke Schoorstra 6566c11880 Fixed bad merge. 2015-07-24 15:01:16 +01:00
Sipke Schoorstra 0d3f525610 Simplified accessing the localizable aspect and elaborated a bit on the hack. 2015-07-24 14:57:19 +01:00
Sipke Schoorstra e8cc0cba6e Merge branch 'dev' into issue/homepage-alias 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Autoroute/Drivers/AutoroutePartDriver.cs
	src/Orchard.Web/Modules/Orchard.Autoroute/Handlers/AutoroutePartHandler.cs
	src/Orchard.Web/Modules/Orchard.Autoroute/ImportExport/HomeAliasExportStep.cs
	src/Orchard.Web/Modules/Orchard.Autoroute/Orchard.Autoroute.csproj
	src/Orchard.Web/Modules/Orchard.Autoroute/Services/AutorouteService.cs
	src/Orchard.Web/Modules/Orchard.ImportExport/Views/Admin/ImportResult.cshtml
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
	src/Orchard.Web/Modules/Orchard.Localization/Providers/LocalizationDateTimeFormatProvider.cs
	src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj
	src/Orchard/Localization/Services/CultureDateTimeFormatProvider.cs
	src/Orchard/Localization/Services/DefaultDateFormatter.cs
	src/Orchard/Localization/Services/IDateTimeFormatProvider.cs
 2015-07-24 14:11:00 +01:00
Sipke Schoorstra f575944df3 Updated Page commands to create home page alias. 2015-07-24 13:52:38 +01:00
Sipke Schoorstra 4159584d85 Merge branch 'dev' into issue/homepage-alias 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Autoroute/Drivers/AutoroutePartDriver.cs
	src/Orchard.Web/Modules/Orchard.Autoroute/Handlers/AutoroutePartHandler.cs
	src/Orchard.Web/Modules/Orchard.Autoroute/Services/AutorouteService.cs
 2015-07-24 13:33:36 +01:00
Sipke Schoorstra d6e96252e7 Merge branch 'feature/tabs' into dev 2015-07-24 11:52:39 +01:00
Sipke Schoorstra f6e5f6b91e Removed "Both" column from Content recipe builder step. 2015-07-24 11:42:26 +01:00
Sipke Schoorstra a88b35192e Fixed Orchard.AntiSpam compilation issue by correcting data type. 2015-07-24 11:20:22 +01:00
Sipke Schoorstra bd82412d95 Updated gulped script output. 2015-07-24 10:59:15 +01:00
Sipke Schoorstra ea91185816 Falling back to a default base URL in case none is configured. 
This fixes an issue where you run Setup from a command line and the recipe does not set BaseUrl on site settings.
The issue is that if the HttpContext does not have a URL, certain properties on the Request object will throw when constructing a URI with a null value.
 2015-07-24 10:34:37 +01:00
Sipke Schoorstra a39aa6ad3f Merge branch 'dev' of https://github.com/OrchardCMS/Orchard into dev 2015-07-23 11:45:15 +01:00
Sipke Schoorstra f3a7aeffcb Merge branch '1.9.x' into dev 2015-07-23 11:44:57 +01:00
Sipke Schoorstra 34947136d4 Fixed and updated scripts and gulp in Dynamic Forms and Layouts. 2015-07-23 11:42:16 +01:00
Sipke Schoorstra 9f9a0cc4e5 Updated recipes unit test to accommodate Orchard.Recipes changes. 2015-07-23 10:34:39 +01:00
Sipke Schoorstra aa143054fc Merge pull request #5562 from OrchardCMS/feature/recipesteps 
Feature/recipesteps
 2015-07-22 23:27:33 +01:00
Sipke Schoorstra eade51a9db Merge branch 'dev' into feature/recipesteps 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.cshtml
 2015-07-22 23:26:23 +01:00
Sipke Schoorstra 1d8897e49e Export parts in alphabetical order. 2015-07-22 15:52:25 +01:00
Sipke Schoorstra cf94a646c5 Formatted Setup/Index.cshtml file. 2015-07-22 10:17:34 +01:00
Sipke Schoorstra eace3c2506 Fixed recipe grouping on Setup screen. 2015-07-22 10:15:20 +01:00
Sipke Schoorstra 9bd2c8448d Merge branch 'dev' into feature/recipesteps 2015-07-21 23:53:48 +01:00
Sipke Schoorstra 8dd6b52909 Minor Autoroute cleanup. 2015-07-21 16:08:07 +01:00
Sipke Schoorstra b5bc89cb21 Implemented import/export step for home alias. 2015-07-21 16:04:28 +01:00
Sipke Schoorstra f60643d460 Fixed an issue with old aliases being kept in memory. 2015-07-21 13:11:24 +01:00
Sipke Schoorstra a9ff7d5973 Simplified autoroute part import and added renamed IsHomePage to PromoteToHomepage. 2015-07-21 12:06:34 +01:00
Sipke Schoorstra 8f302d1b90 Updated Autoroute part, driver and handler to simplify setting the homepage. 2015-07-21 11:53:25 +01:00
Sipke Schoorstra 32584416b9 Introduced IHomeAliasService to deal with managing the home page. 2015-07-21 11:52:09 +01:00
Sipke Schoorstra 2dad35731e Fixed alias remove method. 2015-07-21 11:51:07 +01:00
Sipke Schoorstra adc7bc1b53 Commented out everything that changes the alias of a content item. 2015-07-21 10:17:15 +01:00
Sipke Schoorstra ad35d78126 Applied proper casing. 2015-07-21 10:16:25 +01:00
Sipke Schoorstra 5d09053d30 Fixed an issue when changing the homepage. 
This fixes an issue where the previous published homepage would not have its regenerated alias stored.
 2015-07-20 20:56:37 +01:00
Sipke Schoorstra 1494aec836 Removed mixed tabs and spaces. 2015-07-20 20:10:58 +01:00
Sipke Schoorstra b0177ab7b8 Added configuration upload to Export screen. 2015-07-20 17:13:28 +01:00
Sipke Schoorstra 4c962b2f66 Added support for default configurations, enabling a full site export. 
The command "export file" with no arguments will export everything.
 2015-07-20 16:05:27 +01:00
Sipke Schoorstra 2c6c4a22c4 Updated command line support for import/export. 
- Added export file switch.
- Added config file switch for both import and export commands.
- Minor refactoring.
 2015-07-20 15:39:06 +01:00
Sipke Schoorstra 6e42065bac Simplified recipe step configuration names. 2015-07-20 10:55:21 +01:00
Sipke Schoorstra 1084c945dd Implemented Configure method for CustomStepsStep. 2015-07-20 10:27:10 +01:00
Sipke Schoorstra a971f2825d Added Recipe Category to Recipe Metadata builder step. 2015-07-19 23:41:34 +01:00
Sipke Schoorstra 46d88feb0c Added IsVisible property to recipe builders to control their visibility. 
This is useful for builder steps that should only be rendered when there's actually something to render.
For example, the Custom Steps step should only be visible if there actually are any custom steps available for execution.
 2015-07-19 23:36:37 +01:00
Sipke Schoorstra 531f8bc352 Setting Enabled Feature setting to true by default on Feature recipe builder step. 2015-07-19 23:24:03 +01:00
Sipke Schoorstra 6a07fae67f Improved export file name generation. 2015-07-19 23:21:27 +01:00
Sipke Schoorstra db48f60fe6 Fixed a typo in the Content recipe execution step description. 2015-07-19 23:14:59 +01:00
Sipke Schoorstra c59a056524 Setting BatchSize to a reasonable default value on the Content Recipe Execution Step. 2015-07-19 23:13:42 +01:00
Sipke Schoorstra 32a5082405 Removed checkbox for Recipe Execution Steps. 
Since recipe execution steps are always to be configured and executed, there's no need for a checkbox.
 2015-07-19 23:10:13 +01:00
Sipke Schoorstra 00dc6ab13c Minor UI changes. 2015-07-19 23:06:10 +01:00
Sipke Schoorstra ed85e96621 Replaced ResetSite checkbox with radio buttons. 
This should make things more clear to the user.
 2015-07-19 23:03:57 +01:00
Sipke Schoorstra 833d297499 Removed extraneous curly brace. 2015-07-19 22:45:20 +01:00
Sipke Schoorstra 21629dd6c2 Removed ImportExportCurrentTheme feature. 
Removed this feature in favor of it being part of the default feature of the module.
 2015-07-19 21:45:35 +01:00
Sipke Schoorstra c0469aea85 Removed unused feature declarations. 2015-07-19 21:44:40 +01:00
Sipke Schoorstra 942700cf5c Merge branch 'dev' into feature/recipesteps 2015-07-19 20:03:30 +01:00
Sipke Schoorstra d7595f62a7 Restored Content.Edit.cshtml HTML structure. 2015-07-19 19:55:02 +01:00
Sipke Schoorstra f4d630e2f6 Simplified tabs harvesting and implemented sorting by shape position. 2015-07-19 19:50:07 +01:00
sfmskywalker b6082325f6 Fixed that Default recipe was no longer selected by default on setup screen. 2015-07-19 12:55:17 +01:00
Sipke Schoorstra 3c8e39a7c5 Implemented tabbed editor UI support. 2015-07-18 22:38:26 +01:00