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,451 Commits 83 Branches 32 Tags
42901c8ea59fbb03f085afb53101ceddd475f678
Commit Graph

9451 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Daniel Stolt
3d3d6205b6 #5516: Changed DefaultDateLocalizationServices.ConvertFromLocalizedDateString() to return DateTimeKind.Utc and added unit test to verify. 
Fixes #5516
 2015-07-16 22:00:20 +01:00
Sébastien Ros
24b0f894ce Merge pull request #5524 from urbanit/patch-1 
Queries Index Page missing Title
 2015-07-16 12:38:13 -07:00
Sébastien Ros
d63119b1e6 Merge pull request #5433 from jersiovic/patch-3 
Issue #5432 Differentiator is ignored processing placement
 2015-07-16 12:02:46 -07: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
urbanit
2e7e5a26a9 Queries Index Page missing Title 2015-07-16 21:40:46 +03: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
Nicholas Mayne
6bc98bede6 Merge pull request #5498 from yw80/1.9.x 
Delete the CamelFriendly function call to DisplayName.
 2015-07-16 15:23:00 +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
Lombiq
76b7121935 Adding AJAX-support to the content item controller, fixes #2703 2015-07-16 15:08:39 +02:00
Daniel Stolt
1471ab8cd5 Fixed handling of multiple URL hosts in multi tenancy UI. 2015-07-16 12:29:29 +01:00
Daniel Stolt
fe5b591b21 Fixed potential NRE in TenantCommand. 2015-07-16 12:16:42 +01:00
Lombiq
99e05c8a09 Fixing exception in Layouts when a driver was inherited from a custom base driver, fixes #5509 2015-07-16 12:11:38 +02: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
Daniel Stolt
c07bd4b2b2 Merge branch 'dev' of https://github.com/OrchardCMS/Orchard.git 2015-07-15 22:33:40 +01:00
Daniel Stolt
551ffb1252 Fixed failing unit tests. 2015-07-15 22:33:24 +01:00
Daniel Stolt
60c546dd7c Fixed XML docs for ITenantService. 2015-07-15 21:57:56 +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
Daniel Stolt
bcd3eb1e2e Cleaned up tenant management commands code. Added validation of the DataProvider parameter. 2015-07-15 13:09:33 +01:00
Sipke Schoorstra
901c11a1ea Simplifying recipe step API for implementers. 2015-07-15 12:53:19 +01:00
Daniel Stolt
ed0fc158e0 Added full command line support for tenant management operations. 2015-07-15 12:18:11 +01:00
Daniel Stolt
4581642425 Checking in CSS files that somebody forgot to include. 2015-07-15 12:17:49 +01:00
Sipke Schoorstra
de58b4253d Renamed Data recipe builder step to Content. 2015-07-15 11:34:57 +01:00
Daniel Stolt
9e49568d38 "Improved" log formatting even more. 2015-07-15 11:19:12 +01:00
Sipke Schoorstra
06996f63d0 Refactored SetupRecipeStep into RecipeMetadataStep. 
This enables users to configure the recipe's metadata without having to turn it into a Setup recipe.
 2015-07-15 10:52:12 +01:00