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,584 Commits 94 Branches 33 Tags
09f3e2ad2f31e94f60df12df334ee1e4ee869a53
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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 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
Sipke Schoorstra 86056e2e9c Added System.Web.WebPages assembly reference. 
This removes a warning displayed by the code editor.
 2015-07-18 19:31:20 +01:00
Sipke Schoorstra fe0ae26e10 Incremental work on recipe builder and execution step configuration. 2015-07-17 17:45:39 +01:00
Sipke Schoorstra 924f70bd89 Corrected class name to match file name. 2015-07-17 17:24:17 +01:00
Sipke Schoorstra 5b33acb68c Added descriptive text instead of showing no custom steps. 2015-07-17 15:17:12 +01:00
Sipke Schoorstra 1035543ecc Removed useless where clause. 2015-07-17 15:16:45 +01:00
Sipke Schoorstra 7d49c36ba3 Deprecated CustomStepsStep. 2015-07-17 15:16:24 +01:00
Sipke Schoorstra 3e745c38ee Deprecated ICustomExportStep. 2015-07-17 15:02:02 +01:00
Sipke Schoorstra 8a04052dfe Removed Dynamic Forms Import Export feature. 
Import/export for form submissions now automatically becomes available when Dynamic Forms is enabled.
 2015-07-17 14:50:17 +01:00
Sipke Schoorstra de37e29610 Refactored Workflows import/export step. 2015-07-17 14:47:31 +01:00
Sipke Schoorstra aa91768bf1 Refactored Rules import/export step. 2015-07-17 13:52:41 +01:00
Sipke Schoorstra 8baa6edad7 Refactored Roles import/export step. 2015-07-17 13:33:00 +01:00
Sipke Schoorstra 0de0a1a517 Removed mixed tabs and spaces. 2015-07-17 13:30:44 +01:00
Sipke Schoorstra 65509b5eea Fixed code formatting. 2015-07-17 13:30:07 +01:00
Sipke Schoorstra 2507ef17d3 Refactored Dynamic Forms Submissions import/export step. 2015-07-17 13:21:34 +01:00
Sipke Schoorstra 860282bb44 Refactored CustomElements import/export step. 2015-07-17 13:09:58 +01:00
Sipke Schoorstra f82132102d Refactored CurrentTheme import/export step. 2015-07-17 12:57:50 +01:00
Sipke Schoorstra dca935ebbc Removed dependency on Orchard.ImportExport. 2015-07-17 12:57:12 +01:00
Sipke Schoorstra 0fe16bf54a Refactored AuditTrail import/export. 2015-07-17 12:47:30 +01:00
Sipke Schoorstra 6c5d82d927 Simplified Settings recipe builder step. 2015-07-17 12:46:29 +01:00
Sipke Schoorstra ea9e0ca07e Improved export UI. 
When recipe builder steps provide no UI, no need for rendering a controlled subsection (which would cause a slight glitch when checking the step checkbox by expanding the div a few pixels).
 2015-07-17 12:44:08 +01:00
Sipke Schoorstra c44167749d Cleaned up interfaces by moving out convenience methods to extension classes. 2015-07-17 11:24:52 +01:00
Sipke Schoorstra 42901c8ea5 #5532: Checking for recipe steps having executed. 
If no steps were scheduled, the user stays on the Import screen and a notification is displayed.

Fixes #5532
 2015-07-17 10:41:46 +01:00
Sipke Schoorstra 9f7908a410 Merge branch 'dev' into feature/recipesteps 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Recipes/Services/RecipeParser.cs
	src/Orchard.Web/Modules/Orchard.Setup/Recipes/blog.recipe.xml
	src/Orchard.Web/Modules/Orchard.Setup/Recipes/core.recipe.xml
	src/Orchard.Web/Modules/Orchard.Setup/Recipes/default.recipe.xml
 2015-07-17 09:57:45 +01:00
Sipke Schoorstra e562f6adbd Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Taxonomies/Views/EditorTemplates/Fields/TaxonomyField.Autocomplete.cshtml
	src/Orchard.Web/Modules/Orchard.Taxonomies/Views/EditorTemplates/Fields/TaxonomyField.cshtml
 2015-07-17 09:52:23 +01:00
Sipke Schoorstra ddaf49db4a #5530: Fixed a spelling mistake in Layouts. 
Fixes #5530
 2015-07-17 09:46:53 +01:00
Sipke Schoorstra 0d0bac8765 Removed mixed tabs and spaces. 2015-07-16 23:27:12 +01:00
Sipke Schoorstra 534bbcdff8 Formatting default recipe files. 2015-07-16 23:20:49 +01:00
Sipke Schoorstra 034d048ca7 #5525: Added Category field to Recipe and updated default recipes with "Default" category. 
Recipes are now ordered alphabetically, first by group then by name.

Fixes #5525
 2015-07-16 23:20:13 +01:00
Sipke Schoorstra a5336354cc Removed mixed tabs and spaces. 2015-07-16 23:06:09 +01:00
Sipke Schoorstra 879c42a0a9 #3627: Added support for recipes harvested from themes. 
Fixes #3627
 2015-07-16 19:55:06 +01:00
Sipke Schoorstra c0771e5d56 #3627: Added support for recipes harvested from themes. 
Fixes #3627
 2015-07-16 19:54:34 +01:00
Sipke Schoorstra df03781a34 Merge branch 'dev' into feature/recipesteps 
Conflicts:
	src/Orchard.Tests.Modules/Recipes/Services/RecipeManagerTests.cs
	src/Orchard.Web/Modules/Orchard.ImportExport/Controllers/AdminController.cs
 2015-07-16 19:21:12 +01:00
Sipke Schoorstra 50002ee10d #5503: Increased server script timeout on Import action. 
Fixes #5503
 2015-07-16 17:47:54 +01:00
Sipke Schoorstra f64028cdab Added backward compatibility with Metadata and Data recipe steps and added more granular control over ordering. 2015-07-16 17:17:03 +01:00
Sipke Schoorstra 9f1f6edf81 Renamed ExportStep to BuilderStep and removed BatchSize from ContentBuilderStep. 2015-07-16 16:45:54 +01:00
Sipke Schoorstra 5aecec3127 Fixed modelstate persistence on import screen in case of validation errors. 2015-07-16 14:58:57 +01:00
Sipke Schoorstra 262454322c Enhanced RecipeExecutionSteps to provide and handle UI on the import screen. 2015-07-16 14:24:55 +01:00
Sipke Schoorstra cc59a0ed74 Increased server script timeout on Import page. 2015-07-16 11:01:45 +01:00
Sipke Schoorstra dbe7e30f80 Added super user password fields to UploadRecipe import action. 2015-07-16 10:52:02 +01:00
Sipke Schoorstra 405ed7452a Fixed recipe file model validation. 2015-07-16 09:35:33 +01:00
Sipke Schoorstra 6ba117d016 Merging ResetSiteAction with UploadRecipeAction and implementing site setup during import. 2015-07-15 23:47:24 +01:00
Sipke Schoorstra 22869b1960 Incremental work on reset site action. 2015-07-15 19:32:53 +01:00
Sipke Schoorstra 665900214c Updated setup recipes with new step names. 2015-07-15 19:32:22 +01:00
Sipke Schoorstra f2de649a3e Simplified step names and added ResetSiteAction skeleton. 2015-07-15 18:26:31 +01:00
Sipke Schoorstra ebe659a5f1 Added ImportStep abstraction and extracted recipe upload step. 2015-07-15 17:59:44 +01:00
Sipke Schoorstra edd6db2331 Created ExportAction abstraction and RecipeBuilder implementation. 2015-07-15 17:03:48 +01:00
Sipke Schoorstra 7a7a9b1943 Extracted Updater for reuse. 2015-07-15 17:03:07 +01:00
Sipke Schoorstra c4985ff708 Merge branch 'dev' into feature/recipesteps 2015-07-15 14:53:07 +01:00
Sipke Schoorstra 25e7d6db87 Fixed Roles export handler. 2015-07-15 14:52:49 +01:00
Sipke Schoorstra 8347b4de1f Reorganized recipe step folders. 2015-07-15 14:37:24 +01:00
Sipke Schoorstra 4a8f46e624 Moved Theme recipe execution step to Orchard.Themes. 2015-07-15 14:16:44 +01:00
Sipke Schoorstra 03e6948055 Moved recipe builder and execution API into Framework and simplified step names. 
This enables other modules to implement custom steps without taking a dependency on Orchard.Recipes, which would cause circular dependencies in certain cases (e.g. Orchard.Themes).
 2015-07-15 14:13:36 +01:00