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 1 Packages Projects Releases Wiki Activity
9,479 Commits 94 Branches 33 Tags
21629dd6c2854ee619e48844a34af8e220b68042
Commit Graph

9479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
sfmskywalker
b6082325f6 Fixed that Default recipe was no longer selected by default on setup screen. 2015-07-19 12:55:17 +01:00
Daniel Stolt
83cae5f0a0 #5536: Removed dependency on IContentManager from FormsAuthenticationService. 
FormsAuthenticationService now uses IMembershipService instead. Also introduced a NullMembershipService implementation in Orchard.Framework, used only for dependency resolution during setup. Fixes #5536.
 2015-07-18 22:05:39 +01:00
Sébastien Ros
56addb2629 Fixing urls 2015-07-17 16:24:58 -07:00
Sébastien Ros
25c8c81382 Adding test links in the readme.md 2015-07-17 16:23:59 -07: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
Daniel Stolt
a9eb00c8fa #4253: Made Azure Blob Storage container names configurable. 
Fixes #4253
 2015-07-17 13:23:21 +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
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