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,413 Commits 94 Branches 33 Tags
e562f6adbd041efe70b402f79e658ef5d75f040c
Commit Graph

9413 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
urbanit
2e7e5a26a9 Queries Index Page missing Title 2015-07-16 21:40:46 +03:00
Sipke Schoorstra
50002ee10d #5503: Increased server script timeout on Import action. 
Fixes #5503
 2015-07-16 17:47: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
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
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
25e7d6db87 Fixed Roles export handler. 2015-07-15 14:52:49 +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
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
Daniel Stolt
9e49568d38 "Improved" log formatting even more. 2015-07-15 11:19:12 +01:00
Daniel Stolt
dbe7697803 Cleaned up migration file in Orchard.Recipes. 2015-07-14 21:00:55 +01:00
Sergio Navarro
3e1087ff58 Update ShapePlacementParsingStrategy.cs 2015-07-14 20:51:29 +02:00
Daniel Stolt
6c48766f54 Merge branch 'dev' 2015-07-14 19:51:02 +01:00
Sergio Navarro
43315c349f Update ShapePlacementParsingStrategy.cs 2015-07-14 20:49:39 +02:00
Daniel Stolt
012c15c18c Merged from 1.9.x. 2015-07-14 19:49:05 +01:00
Daniel Stolt
b6d0fa3dd2 Implemented tenant reset action. 2015-07-14 17:43:40 +01:00
Sipke Schoorstra
3f5919fa40 Fixed incorrect label on Export screen. 2015-07-13 23:15:00 +01:00
Sipke Schoorstra
79745abaeb Fixed unit test. 2015-07-13 19:43:21 +01:00
Sipke Schoorstra
0697042a65 Added Recipe Name option to export screen. 2015-07-13 18:12:42 +01:00
Sipke Schoorstra
6d2832ef08 Added the ability to generate a Setup recipe using the export feature. 2015-07-13 17:56:20 +01:00
Sipke Schoorstra
dbc6f61b5c Added ImportBatchSize option to export screen. 
This enables users to optionally provide the desired batch size to use when importing the recipe without having to manually edit it.
 2015-07-13 17:23:47 +01:00
Sipke Schoorstra
4d1f1f663f Simplified Export.cshtml a bit. 2015-07-13 17:15:23 +01:00
Lombiq
b3980940ef Adding default classes to Projections layouts, fixes #3405 2015-07-13 17:35:11 +02:00
Sipke Schoorstra
cb00640ecc #5375: Added current theme recipe step. 
This enables exporting the current theme setting and restoring it during import.
 2015-07-13 14:37:41 +01:00
Sipke Schoorstra
171f7ad227 Renamed Feature Export feature. 2015-07-13 14:36:35 +01:00
Lombiq
e74b6ad6f8 Fixing potential NRE in LocalizationPartHandler by adding a nullcheck in LocalizationPartDriver 2015-07-12 19:35:52 +02:00
Daniel Stolt
bfe2c296ec Added IRecipeResultAccessor for programmatically obtaining result of recipe execution. 2015-07-11 23:22:18 +01:00
Daniel Stolt
3036396ae6 Merge from dev. 2015-07-11 20:59:35 +01:00
Daniel Stolt
6fe3cf8538 Deleted unused element from layout editor. 2015-07-11 17:03:45 +01:00
Daniel Stolt
db6c25aba2 Added keyboard shortcut reference to layout editor. 2015-07-11 16:58:49 +01:00
Daniel Stolt
27da7125b8 Improved log formatting. 2015-07-10 16:11:50 +01:00
Sipke Schoorstra
fd1b06f72d Updated Features recipe step to include Migrations step. 
This will cause migrations to execute after features have been enabled.
 2015-07-10 15:31:35 +01:00
Sipke Schoorstra
a2d3e41dad Removed unnecessary injection of IContentManager. 2015-07-10 14:54:15 +01:00
Sipke Schoorstra
645c36a2dd Added support for VS2015 to ClickToBuild.cmd. 2015-07-10 11:55:35 +01:00
Sipke Schoorstra
6c04c416c7 Merge branch 'feature/importexport-full-roundtrip' into dev 2015-07-10 11:48:08 +01:00