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,391 Commits 94 Branches 33 Tags
c07bd4b2b2d9facc2d3ca009f135316a0ce9efa2
Commit Graph
9391 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Daniel Stolt 6c48766f54 Merge branch 'dev' 2015-07-14 19:51:02 +01: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
Daniel Stolt 863761d30a Improved logging in recipe components. 2015-07-09 22:34:21 +01:00
Daniel Stolt ad4a702f7c Adding the Reports feature back. 2015-07-09 21:49:02 +01:00
Sébastien Ros b100634587 Merge pull request #5486 from jersiovic/patch-4 
Issue #5141 Retrieve/Store methods from InfoSet doesn't support char type
 2015-07-09 13:00:10 -07:00
Sébastien Ros a071f21f4e Merge pull request #5485 from jersiovic/patch-1 
Issue #5061 GetImageProfileUrl reprocess images obtained through a dynamic profile on every restart 1.9.x pull request
 2015-07-09 12:57:48 -07:00
Sébastien Ros eed1a9a063 Merge pull request #5479 from dcinzona/patch-3 
Fixes #5398 - ShellDescriptorCache in HostComponents
 2015-07-09 12:57:20 -07:00
Sébastien Ros 0faaa22546 Merge pull request #5465 from qt1/IBN-Labs/Support-Guid-in--CreateColumn 
Support CreateColumn<Guid>()
 2015-07-09 12:32:29 -07:00
Sébastien Ros 0f6fa5844b Merge pull request #5442 from yw80/1.9.x 
Fixed the items count in media library when modify the item size in css
 2015-07-09 12:18:09 -07:00
Sipke Schoorstra 298b2fb930 Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Dashboards/Web.config
 2015-07-09 17:23:13 +01:00
Daniel Stolt 95eecd30b9 Added logging to replace removed recipe journals. 2015-07-09 16:54:13 +01:00
Sipke Schoorstra 537adf9cba #5375: Exporting various items in a predictable order. 
Fixes 5375
 2015-07-09 14:11:34 +01:00
Sipke Schoorstra 85b06375a0 Added assembly binding redirects. 2015-07-09 14:09:40 +01:00
Daniel Stolt a431bb0cb0 Removed recipe journals. 2015-07-09 14:09:29 +01:00
Sipke Schoorstra 784e1c0961 Added web.config with redirect bindings. 2015-07-09 13:44:02 +01:00
Daniel Stolt 2c10b0df98 Added Log4net configuration for recipes logging. Added logging to replace the removed reports logging. 2015-07-09 12:31:37 +01:00
Sipke Schoorstra 2654a2c47c Merge branch 'dev' into feature/importexport-full-roundtrip 2015-07-09 12:30:09 +01:00
Sipke Schoorstra ed214246d8 Removed mixed tabs and spaces. 2015-07-09 12:29:23 +01:00
Sipke Schoorstra 76132f2691 #5056: Added Export Features recipe step. 
Fixes #5056
 2015-07-09 12:29:05 +01:00
Sipke Schoorstra 41b245560c Removed unused namespaces and empty folder. 2015-07-09 11:59:25 +01:00
Daniel Stolt e054a833af Removed Orchard.Reports. 2015-07-09 11:43:04 +01:00