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,481 Commits 94 Branches 33 Tags
ff276ae961cf26c6176a32924bc1525739610b3c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sipke Schoorstra c642bc0174 Merge pull request #6253 from Codinlab/patches/media-library-picker 
Fix media-library-picker.js
 2015-12-31 14:40:33 +01:00
Sipke Schoorstra 64d8c1a16f Added handling of nullable enums. 
This enables content parts to use infoset storage with nullable enum types.
Before this change, the NotSupportedException would be thrown.
 2015-12-30 14:20:26 +01:00
Sipke Schoorstra bd1a1eb6e6 Merge pull request #6191 from Codinlab/fixes/6189 
Fixes #6189 : TextAreaElement throwing on null ProcessedValue
 2015-12-28 16:25:39 +01:00
Sipke Schoorstra 8ee37a6de0 Merge pull request #6218 from paynecrl97/patch-3 
Use Display Name to show validation messages
 2015-12-22 22:24:24 +01:00
Sipke Schoorstra e72e6fcb1f Fixed layout editor javascript issue. 
As per the comments in https://github.com/OrchardCMS/Orchard/pull/6159, the issue was that the layout designer host has a dependency on the layout editor object, but the former would be created before the latter.
This changeset moves the initialization code together in order to control the order in which what object is created first.
 2015-12-15 22:35:29 +01:00
Sipke Schoorstra 1e963d4d50 Merge pull request #6159 from connorsmallman/Bug/6142/LayoutEditorJS 
Wait for document ready before calling LayoutEditor constructor
 2015-12-10 14:34:49 +01:00
Sipke Schoorstra 3a7091467b Fixed duplicate field shape issue with Content Field elements. 
Fixes #5974
 2015-12-08 01:15:41 +01:00
Sipke Schoorstra 68b3fe56d0 Updated various input elements using NoEncode. 
This prevents HTML characters from being encoded when using the tokenizer on element labels.
 2015-12-04 12:14:21 +01:00
Sipke Schoorstra e29fb90298 Removed processing of tokens of RuntimeValue (Dynamic Forms). 
Also fixes #6117.

(cherry picked from commit db564d1670)
 2015-12-04 11:55:14 +01:00
Sipke Schoorstra dd59d7c385 Merge pull request #6104 from Codinlab/fixes/6033 
Fixes #6033 : EmailActivity fails when run via background task
 2015-11-29 19:10:49 +01:00
Sipke Schoorstra 06ee7849c1 Removed tokenization from dynamic form error messages. 2015-11-03 22:34:11 +01:00
Sipke Schoorstra 61c91ff858 Merge pull request #5884 from phillipsj/1.9.x 
Resolves #5878 : URL Field for Dynamic Forms
 2015-11-03 22:08:22 +01:00
Sipke Schoorstra 388932b41f Merge pull request #5992 from harmony7/LayoutEditorSaveJquery 
With the Element editor dialog, use dialog iframe's jQuery for form submission
 2015-10-29 14:27:57 +01:00
Sipke Schoorstra 255547288b Fixed T usage in ValidationRules, round 2. 2015-10-16 10:45:08 +02:00
Sipke Schoorstra 054925c297 Fixed T usage in ValidationRules. 2015-10-15 21:47:01 +02:00
Sipke Schoorstra 66ff5d36e9 Merge pull request #5810 from Codinlab/issue/5809 
Fixes #5809 : Layouts : DisplayText encoded twice in Design mode
 2015-09-15 14:03:55 +01:00
Sipke Schoorstra a3fe3592c6 Merge pull request #5799 from mvarblow/patch-5 
Code clean-up in TermCountProcessor.cs
 2015-09-13 13:42:39 +01:00
Sipke Schoorstra e0e600a6ce Merge pull request #5688 from Codinlab/issue/5475 
Fixes #5475 : Add missing properties to HttpRequestPlaceholder
 2015-08-24 10:42:51 +01:00
Sipke Schoorstra 564fdc27be #5636: Fixed a bug with AliasStorage.Remove method. 
Fixes #5636
 2015-08-13 13:48:37 +01:00
Sipke Schoorstra cbf10216b0 Merge pull request #5581 from dcinzona/patch-4 
Updated README.md Orchard version to 1.9.1
 2015-07-28 15:14:00 +01:00
Sipke Schoorstra ea91185816 Falling back to a default base URL in case none is configured. 
This fixes an issue where you run Setup from a command line and the recipe does not set BaseUrl on site settings.
The issue is that if the HttpContext does not have a URL, certain properties on the Request object will throw when constructing a URI with a null value.
 2015-07-24 10:34:37 +01:00
Sipke Schoorstra 34947136d4 Fixed and updated scripts and gulp in Dynamic Forms and Layouts. 2015-07-23 11:42:16 +01:00
Sipke Schoorstra 5d09053d30 Fixed an issue when changing the homepage. 
This fixes an issue where the previous published homepage would not have its regenerated alias stored.
 2015-07-20 20:56:37 +01:00
Sipke Schoorstra 1494aec836 Removed mixed tabs and spaces. 2015-07-20 20:10:58 +01:00
Sipke Schoorstra ddaf49db4a #5530: Fixed a spelling mistake in Layouts. 
Fixes #5530
 2015-07-17 09:46:53 +01:00
Sipke Schoorstra 784e1c0961 Added web.config with redirect bindings. 2015-07-09 13:44:02 +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 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 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 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 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 e810d885a0 #5270: Fixed Shape type not found error. 2015-06-07 00:25:58 +02:00
Sipke Schoorstra 53e58f60fe #5306: Minor refactoring of background http context factory. 2015-05-27 16:36:51 +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 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 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
Sipke Schoorstra a88d68ee7a Added missing *Types* property to ContentPicker shape. 
This fixes an issue where you could not configure the content picker shape to filter the available content items by types or types with certain parts.
 2015-04-27 14:05:50 +02:00
Sipke Schoorstra ae17c75a5e Fixed controller for SELECT input controls. 
When using a SELECT input control, that control itself would be initialized with the call to "toggleWhatYouControl" instead of its child OPTION elements.
 2015-04-27 08:36:38 +02:00
Sipke Schoorstra 363ae13ef7 #5137: Fixed homepage being lost when content with empty alias is removed. 2015-04-26 13:58:22 +02:00
Sipke Schoorstra 20adb3bf51 Merge branch '1.8.x' into 1.9-int 2015-04-25 10:24:31 +02:00
Sipke Schoorstra 060720e92c Minor code formatting + cleanup. 2015-04-25 10:20:00 +02:00
Sipke Schoorstra b2b2e1cf37 #5137: Fixed homepage being lost when content with empty alias is removed. 2015-04-25 10:13:04 +02:00
Sipke Schoorstra 4a92ec7c5a Fixed redirect on server side validation. 
This fixes an issue where, even though the posted values would not be saved, the user is not presented the form with validation errors, being redirected to the configured url instead.
 2015-04-22 17:41:14 +02:00
Sipke Schoorstra 28f6cb27d9 #5153: Fixed *elementEditorModel* deserialization issue. 2015-04-22 17:26:43 +02:00
Sipke Schoorstra b44b4e9170 Fixed an issue with a potentially null controller. 
When the indexing background task displays content with a Form element, the driver was throwing a NRE because of a null controller.
 2015-04-21 17:38:27 +02:00
Sipke Schoorstra 5d7988650e Fixed view compilation issue. 2015-04-20 23:12:18 +02:00
Sipke Schoorstra c61e08abd9 Fixed view compilation issues. 2015-04-20 17:49:19 +02:00
Sipke Schoorstra b3b75b3d74 Fixed copy/paste issue with Html element. 2015-04-18 20:48:16 +02:00
Sipke Schoorstra a93cc9cdbc Fixed minor CSS issue. 2015-04-17 15:04:56 +02:00
Sipke Schoorstra dea42e518b Cleaned up element views. 2015-04-17 14:34:00 +02:00
Sipke Schoorstra 66248a7005 #4957: Fixed search settings. 2015-04-17 00:46:39 +02:00
Sipke Schoorstra 792f5162e4 Moved CustomForms to Deprectaed folder. 2015-04-16 17:18:18 +02:00
Sipke Schoorstra fc85aff463 Merge pull request #5165 from Xeevis/1.9-int 
#5138: Added missing validation message
 2015-04-16 16:59:54 +02:00
Sipke Schoorstra dad113feed #5116: Fixed failing tests. 2015-04-15 14:00:16 +02:00
Sipke Schoorstra 840aea5ff0 #21391: Fixed layout and shape rendering from background processes. 2015-04-13 15:44:40 +02:00
Sipke Schoorstra 1f3c5cc1a4 Simplified URL encoding/decoding of layout editor data. 
This also fixes an issue with certain rendered HTML as part of he element editor model object.
 2015-04-10 17:38:48 +02:00
Sipke Schoorstra 05faccd722 Fixed that element editor dialog is not launched for Html and Form elements. 2015-04-03 17:42:11 +02:00
Sipke Schoorstra eb61269d85 #21304: Fixed Text Element HTML filter issues. 
- Implemented HTML filters for Html, Text and Paragraph elements
- Tokens are only processed on the front-end, not in the editor page itself. This also prevents an exception when the {Shape.Execute} token is used with a theme specific shape.

Work Item: 21304
 2015-04-03 01:46:57 +02:00
Sipke Schoorstra af110a8399 #21303: Fixed encoding issue with layout templates. 
Work Item: 21303
 2015-04-02 22:47:51 +02:00
Sipke Schoorstra 802b6f8200 #21131: Added null check. 
Work Item: 21131
 2015-04-02 22:12:19 +02:00
Sipke Schoorstra 2818064327 #21271: Fixed email settings test. 
Work Item: 21271
 2015-04-02 18:15:28 +02:00
Sipke Schoorstra 1bae4f143b Applied URL decoding to form field keys. 
This fixes an issue where "complex" form field names aren't properly mapped to key value pairs, such as "Parts%5B0%5D.Bindings%5B0%5D.Name"  instead of "Parts[0].Bindings[0].Name"
 2015-04-01 17:16:24 +02:00
Sipke Schoorstra ad6f6a627c Fixed an issue with ElementWrapperPart. 
This fixes an issue where widgets based on elements do not persist element data.
 2015-03-29 15:55:37 +02:00
Sipke Schoorstra 2c8f6aa2a6 Fixed an issue with the media item element not showing selected documents. 
The issue is that the media item element renders the selected media items with the Thumbnail display type.
The Media shape templates for that display type do not include necessary styling themselves; instead the media library picker UI includes the necessary stylesheet.
 2015-03-26 12:43:15 +01:00
Sipke Schoorstra 6a11bf12f2 #21293: Fixed Media Item element design view. 
This fixes the issue where no media items are being shown in design mode.

Work Item: 21293
 2015-03-24 12:38:10 +01:00
Sipke Schoorstra 039220f1f5 #21234: Added delete option to Form element. 
Work Item: 21234
 2015-03-17 15:48:19 +01:00
Sipke Schoorstra dcac46fb8c #21265: Fixed Value cannot be null. Parameter name: fileName error. 
Work Item: 21265
 2015-03-17 13:16:15 +01:00
Sipke Schoorstra 5eb48b8eec Implemented import/export for *ElementWrapperPart*. 2015-03-17 12:49:43 +01:00
Sipke Schoorstra 2d2f2b40dd Improved handling of layout editor data encoding/decoding. 2015-03-16 23:41:13 +01:00