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,359 Commits 94 Branches 33 Tags
171f7ad22711139ce75c7f29d2efb642cd60a173
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sipke Schoorstra 171f7ad227 Renamed Feature Export feature. 2015-07-13 14:36:35 +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
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
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
Sipke Schoorstra 784e1c0961 Added web.config with redirect bindings. 2015-07-09 13:44:02 +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
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
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
Sipke Schoorstra b05dcf9a56 Fixed default layout data for Form. 2015-07-02 15:40:54 +03:00
Sipke Schoorstra 3c7fffc320 Fixed that default layout data would not be applied. 
This fixes the issue where the default layout data string would not be applied when creating new content items of a content type with the LayoutPart attached.
For example, creating new Form content items would start out with an empty canvas instead of with a default Form element and a submit button.
 2015-07-02 15:34:08 +03:00
Sipke Schoorstra b580995e4b Added "TypeName" to element data serialization black list. 
Having the "TypeName" as part of the element's data field is redundant.
 2015-07-02 15:30:20 +03:00
Sipke Schoorstra 2873eb8991 #5337: Fixed homepage becoming lost after publishing layout template being used by the homepage. 
Work Item: 5337
 2015-07-02 13:37:20 +03:00
Sipke Schoorstra eebe29fec3 #5467: Fixes the issue where the "Set as homepage" setting is not retained when saving, 
The issue was that when you save a content item (without publishing it) while checking the "Set as homepage" checkbox, it would lose its checked status after save.
With this change, the checkbox is again rendered but in a checked status, so that when you do publish, it will become the homepage.

Fixes #5467
 2015-07-02 13:01:49 +03:00
Sipke Schoorstra c3dffb79f5 #5378: Fixed content field elements placement for content picker field and media picker field. 2015-06-29 14:27:23 +03:00
Sipke Schoorstra 5b40567b6d #5407: Layout elements now evaluate tokens. 2015-06-29 14:01:58 +03:00
Sipke Schoorstra 583ff8951a Removed unused namespaces. 2015-06-27 19:49:23 +03:00
Sipke Schoorstra 5c688267fa #5420: Added stub CSS files for various activities to prevent 404 errors. 2015-06-27 18:47:06 +03:00
Sipke Schoorstra 2c496a36db #5437: Maintaining selected values after model validation error. 2015-06-27 18:31:08 +03:00
Sipke Schoorstra 18166bd274 Fixed KeyNotFoundException in AutoroutePart. 
This fixes the issue where the autoroute part fails after a clean Orchard setup.
 2015-06-27 13:38:44 +03:00
Sipke Schoorstra 23e525206b Merge branch 'dev' into feature/dashboard 2015-06-27 12:52:11 +03:00
Sipke Schoorstra b1c782f560 Added permission checks. 2015-06-27 12:51:08 +03:00
Sipke Schoorstra ca4fb40bdf Merge branch 'dev' into feature/dashboard 2015-06-27 12:12:01 +03:00
Sipke Schoorstra 9e88d16273 Added missing null check to Projection element driver's export method. 2015-06-13 19:11:25 +03:00
Sipke Schoorstra 9466d91438 #5379: Improved LayoutPartDriver to safely handle recursive layout rendering. 
This prevents a SO exception when you for example have a Projection element that renders content including the content item rendering that Projection element.
 2015-06-12 13:28:53 +03:00
Sipke Schoorstra 20fe55a458 Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj
	src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/Forms.js
	src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/Forms.min.js
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutEditor.min.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.css.bundle
	src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor.min.css
	src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor/Editor.css
	src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor/Editor.min.css
	src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor/Popup.css
	src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor/Popup.min.css
	src/Orchard.Web/Modules/Orchard.Layouts/Views/LayoutEditor.Template.Toolbox.cshtml
	src/Orchard/Tasks/BackgroundService.cs
 2015-06-10 23:58:18 +03:00
Sipke Schoorstra 1ee4664c50 Removed two more non-existing files. 2015-06-10 22:36:34 +03:00
Sipke Schoorstra 9fbaed9123 Removed non-existing files from Orchard.Layouts.csproj. 2015-06-10 11:04:17 +03:00
Sipke Schoorstra 230d1b5d5d Fixed missing view file issue. 2015-06-09 21:54:48 +03:00
Sipke Schoorstra 711948fd64 Implemented import/export for VectorImage element. 2015-06-09 13:57:22 +03:00
Sipke Schoorstra c4dacc1f62 Fixed that VectorImage would not render in TinyMCE. 2015-06-09 13:37:04 +03:00
Sipke Schoorstra 6a2b6d81f4 Formatted placement file. 2015-06-09 13:30:58 +03:00
Sipke Schoorstra d6154078dc Fixed VectorImage placement. 2015-06-09 13:30:32 +03:00
Sipke Schoorstra 88679bd7ca Corrected bad merge. 2015-06-09 01:33:46 +03:00
Sipke Schoorstra e03df31e50 Fixed unit tests. 2015-06-09 01:23:06 +03:00
Sipke Schoorstra aba53e122d Cherry picked ce630f980c. 2015-06-09 01:22:41 +03:00
Sipke Schoorstra c9887f4d39 Cherry picked 1e83068b8c. 2015-06-09 01:17:37 +03:00
Sipke Schoorstra f0cd135993 Cherry picked 9bf6ac5718. 2015-06-09 01:14:49 +03:00
Sipke Schoorstra 0b309677f8 #5367: Implemented import/export for the Projection Element. 2015-06-09 00:04:59 +03:00
Sipke Schoorstra 56032dd815 Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
	src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TaxonomyFieldDriver.cs
	src/Orchard/Mvc/HttpContextAccessor.cs
	src/Orchard/Mvc/IHttpContextAccessor.cs
	src/Orchard/Orchard.Framework.csproj
	src/Orchard/Tasks/BackgroundService.cs
 2015-06-07 00:46:14 +02:00
Sipke Schoorstra e810d885a0 #5270: Fixed Shape type not found error. 2015-06-07 00:25:58 +02:00
Sipke Schoorstra 071733495e Fixed unit tests. 2015-06-04 11:33:53 +02:00
Sipke Schoorstra ce630f980c #5305: Fixing the issue where httpcontext would be resolved from the wrong lifetime scope container in certain cases. 
This changeset fixes a number of issues:
- Fixes the Autofac.Core.DependencyResolutionException: A delegate registered to create instances of 'System.Web.HttpContextBase' returned null error in VS 2015.
- Fixes indexing of layout part. The issue was that elements being rendered from a background task context and an element template uses an HTML helper, that would cause an exception since HttpContext.Current would normally be null.
- Replaces the need for injecting HttpContextBase with injecting IHttpContextAccessor (actually one should never inject HttpContextBase anymore - use IHttpContextAccessor instead).
 2015-06-04 02:06:24 +02:00
Sipke Schoorstra 1e83068b8c Fixed the immediate issue where setup fails. 
This is a temporary fix falling back to original behavior of the HttpContextAccessor.
 2015-05-28 00:59:48 +02:00
Sipke Schoorstra 53e58f60fe #5306: Minor refactoring of background http context factory. 2015-05-27 16:36:51 +02:00
Sipke Schoorstra 34008c469e Merge branch 'dev' into issue/4607-httpcontextaccessor 2015-05-27 16:20:26 +02:00
Sipke Schoorstra 9bf6ac5718 #4607: Refactored HttpContextAccessor to return a valid HttpContextBase instance in background tasks. 2015-05-26 19:49:55 +02:00
Sipke Schoorstra 09d232612a Removed unused enum values and consolidated SortDirection and OrderByDirection. 
The unused enum values of the SortDirectionEnum were probably an artifact of a copy/paste operation.
 2015-05-23 11:09:41 +02:00
Sipke Schoorstra ef2abe14cb #5306: Implemented a background HttpContext factory. 
This change instantiates an actual HttpContext object during background sweeps so that Razor templates using Html Helpers (that require HttpContext.Current to be not-null) won't fai lwhen being rendered.
 2015-05-22 15:37:51 +02:00
Sipke Schoorstra ce36e115d0 Removed unnecessary field. 2015-05-21 17:25:50 +02:00
Sipke Schoorstra 4d242e83df #5306: Injecting HttpContextBase directly. 
This will ensure that an actual HttpContext object will be available in case of background task operations thanks to the way HttpContextBase is registered (providing a placeholder object in case of background operations).
 2015-05-21 17:24:45 +02:00
Sipke Schoorstra f5b9a76675 #5309: Simplified implementation and renamed helper method. 2015-05-21 13:53:55 +02:00
Sipke Schoorstra 5f30667df1 #5309: Updated OutputCacheFilter to include a check for the OutputCacheAttribute.Location value. 2015-05-21 13:47:14 +02:00
Sipke Schoorstra 064ee72d6d Fixed versioning issues. 2015-05-21 00:12:46 +02:00
Sipke Schoorstra cb7a52b25c Merge branch 'dev' into feature/dashboard 2015-05-20 23:47:19 +02:00
Sipke Schoorstra bcf457d3f3 Fixed default dashboard layout string. 2015-05-20 19:12:38 +02:00
Sipke Schoorstra 22b961f7d4 Improved TokensFilter. 
Since null is an allowed value anyway.
 2015-05-20 18:56:19 +02:00
Sipke Schoorstra f84361d231 Implemented a UrlHelper token provider. 
This enables users to create hyperlinks based on route values that are dynamically turned into actual urls.
 2015-05-20 18:55:28 +02:00
Sipke Schoorstra 316c6e3262 Simplifying dashboard management. 
This removes the ability to edit multiple dashboards in favor of a simplified way for users to edit the default dashboard.
 2015-05-20 01:27:53 +02:00
Sipke Schoorstra f8c6feea86 #5216: Added call to *InitHelpers*. 
This will cause various helpers to be initialized, such as the *Html* property.
 2015-05-14 10:24:04 -07:00
Sipke Schoorstra 865f583be2 Incremental work on Dashboards. 2015-05-09 01:12:17 +02:00
Sipke Schoorstra 55edf7ccfd Incremental work on Dashboards. 2015-05-08 00:38:03 +02:00
Sipke Schoorstra 74a71321de Incremental work on Dashboards. 2015-05-07 00:08:06 +02:00
Sipke Schoorstra fa3f1cbc70 Added NumericFieldBinding. 2015-05-06 21:38:41 +02:00
Sipke Schoorstra 2dc5448ee0 Incremental work on Dashboards. 2015-05-06 12:35:26 +02:00
Sipke Schoorstra 5479fe9bcb Incremental work on Dashboards. 2015-05-04 19:40:11 +02:00
Sipke Schoorstra e0aa89b668 Minor code file cleanup. 2015-05-04 18:00:55 +02:00
Sipke Schoorstra ba409819f2 #5237: Consistified media library breadcrumbs. 2015-05-04 17:59:38 +02:00
Sipke Schoorstra 324214e812 Merge pull request #5232 from giannik/patch-2 
Fix for issue #5219
 2015-05-02 10:59:43 +02:00
Sipke Schoorstra 3311c9a8a4 Updated web.config files to fix intellisense for Razor view files. 
This fixes the side effect of setting CopyLocal=False on the Orchard.Framework project references where Razor intellisense was broken.
Although not necessary in most cases, I also added Orchard.Core for free, for those rare cases where a service is directly consumed in a Razor view.
 2015-05-02 10:14:29 +02:00
Sipke Schoorstra 379ac040e1 Fixed binding issue for Enumeration field when using RadioList. 
This fixes an issue when the Enumeration content field is configured to use radio buttons - in which case the editor shape will use the "Value" property instead of the "SelectedValues" property. Since the binding would only set the value through "SelectedValues", the stored value would be surrounded with a comma, which would not match with any of the enumeration values.
 2015-05-01 16:39:50 +02:00
Sipke Schoorstra ceaa36c329 Fixed default layout data string for Form content type. 2015-04-30 18:09:52 +02:00
Sipke Schoorstra ce6876eacf Revived default layout data initialization. 2015-04-30 18:09:26 +02:00
Sipke Schoorstra a919aab936 Layout Canvas reusability improvements. 
This enables child canvas elements to be moved around and removed.
 2015-04-30 17:35:03 +02:00
Sipke Schoorstra ff461b3945 Added MenuPart to Form content type by default. 2015-04-30 17:29:15 +02:00
Sipke Schoorstra 5a5d2f9ae8 Added URL referrer safety check. 2015-04-30 17:28:49 +02:00
Sipke Schoorstra c7094ab46b #5215: Implemented import/export for *SearchFormPart*. 2015-04-29 20:32:50 +02:00
Sipke Schoorstra e6b84ad587 #5216: Added call to *InitHelpers*. 
This will cause various helpers to be initialized, such as the *Html* property.
 2015-04-29 20:30:08 +02:00
Sipke Schoorstra 8dbd003f61 Implemented import/export for element definitions. 2015-04-28 18:10:45 +02:00
Sipke Schoorstra 6b18883e24 Merge branch '1.9-int' into 1.x 2015-04-27 16:11:28 +02:00
Sipke Schoorstra 02fbd2e1f2 Merge branch '1.8.x' into 1.9-int 2015-04-27 16:04:17 +02:00
Sipke Schoorstra e557151b28 Merge branch '1.8.2-int' into 1.8.x 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Autoroute/Services/AutorouteService.cs
 2015-04-27 16:01:10 +02:00