lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-08 00:14:31 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
9,368 Commits 79 Branches 31 Tags
feature/tenantreset
Commit Graph

9368 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Sipke Schoorstra
9a2eaf7ac9 #5489: Handling potential null value for MediaLibraryPickerField.MediaParts. 
This happens when a content type has both a MediaLibraryPickerField and the LayoutPart attached.
The layout editor renders the field, whose shape template accesses the MediaParts property, which is not initialized for new content items.

Fixes #5489
 2015-07-08 22:45:52 +01:00
Lombiq
89c5b2f7de Fixing that Audit Trail summary item edit link was double-encoded 2015-07-06 01:15:12 +02:00
Lombiq
b6db85b8af Untabifying CommentPartDriver 2015-07-05 14:19:37 +02:00
Sipke Schoorstra
4e61c3314d Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Autoroute/Drivers/AutoroutePartDriver.cs
	src/Orchard.Web/Modules/Orchard.Autoroute/Views/EditorTemplates/Parts.Autoroute.Edit.cshtml
	src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/LayoutEditor.js
	src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/LayoutEditor.min.js
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/LayoutPartDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
 2015-07-04 14:35:41 +02:00
Sipke Schoorstra
b37951e205 Merge branch '1.9.x' into dev 
Conflicts:
 src/Orchard.Web/Modules/Orchard.Autoroute/Drivers/AutoroutePartDriver.cs
 src/Orchard.Web/Modules/Orchard.Autoroute/Views/EditorTemplates/Parts.Autoroute.Edit.cshtml
 src/Orchard.Web/Modules/Orchard.DynamicForms/Migrations.cs
 src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/ValidationMessage.Design.cshtml
 src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/ValidationSummary.Design.cshtml
 src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config
 src/Orchard.Web/Modules/Orchard.Layouts/Drivers/LayoutPartDriver.cs
 src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
 src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutEditor.js
 src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutEditor.min.js
 src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.js
 src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.min.js
 src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor.css
 src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor.min.css
 src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Shape.Design.cshtml
 src/Orchard.Web/Modules/Orchard.Layouts/Web.config
 2015-07-04 14:27:04 +02:00
Sipke Schoorstra
6bce34f379 #5260: Fixed the issue where form validation result gets output cached. 
Fixes #5260
 2015-07-04 13:01:17 +02:00
Sipke Schoorstra
c8f2c27311 Fixed form redirect issue. 
This fixes the issue where you would not stay on the same page after a model validation occurred.
 2015-07-04 12:45:17 +02:00
Sipke Schoorstra
22fa33c06f #5279: Fixed "potentially dangerous request" error. 
Fixes #5279
 2015-07-04 12:25:23 +02:00
Sipke Schoorstra
bbf6700e1a #5099: Improved image element dialog by hiding Save/Cancel buttons. 2015-07-04 11:45:43 +02:00
Sipke Schoorstra
c2b0041e1c Updated usage of correct LazyField class. 
This fixes the "is deprecated" build warning for the Widgets module.
 2015-07-04 11:44:18 +02:00
Sipke Schoorstra
70697b8c5e Removed image references. 
This stylesheet is a copy from the TheAdminTheme theme, but doesn't require the images, so removed these references instead of copying over the images.
 2015-07-04 11:42:50 +02:00
Sipke Schoorstra
504f484b19 Fixed broken Html element view. 2015-07-04 10:32:11 +02:00
Sipke Schoorstra
2508f503b7 #5298: Suppressed input validation on SMPT test form. 
This fixes the issue when you try and use address formats such as "User <user@domain.com>" and adds support for sending HTML as part of the message body.

Fixes #5298
 2015-07-04 09:51:05 +02:00
Sipke Schoorstra
1093e16a81 #5452: Improved ContentItem and Projection elements by rendering an abstract representation instead. 
Fixes #5452
 2015-07-04 09:36:31 +02:00
Sipke Schoorstra
1fe436e05a Fixed incorrect method error. 2015-07-04 09:32:51 +02:00
Sipke Schoorstra
b18f153e6a #5445: Fixed form field binding issues. 
This fixes two issues:
1. Adding a Form element (and selecting the content type to create using the submitted values) and then adding a form element would not cause the Bindings tab to appear.
2. Adding nested containers (such as Grid, Row and Column) to a Form element would prevent the Bindings tab from appearing when adding a form field element such as TextField to a nested container.

Work Item: #5445
 2015-07-04 00:37:14 +02:00
Sébastien Ros
c75ba007e6 Merge pull request #5453 from kumards/patch-1 
Fix for duplicate version number on creating a new draft
 2015-07-02 12:28:36 -07:00
Sébastien Ros
b5b3ffea8e Merge pull request #5425 from jersiovic/patch-1 
Issue #5061 GetImageProfileUrl reprocess images obtained through a dynamic profile on every restart
 2015-07-02 12:18:30 -07:00
Sipke Schoorstra
b05dcf9a56 Fixed default layout data for Form. 2015-07-02 15:40:54 +03:00