lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
8,916 Commits 83 Branches 32 Tags
bfa6f1326e404e305e8117000fe3d8192adf6bdf
Commit Graph

8916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sipke Schoorstra
bfa6f1326e Updated Snippet design shape template. 2015-04-19 17:26:02 +02:00
Sipke Schoorstra
1a889594d9 Improved UI element style. 2015-04-19 17:23:08 +02:00
Sipke Schoorstra
6727e61f6c Merge branch '1.9-int' into feature/layoutzones 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.min.js
	src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Column.cshtml
	src/Orchard.Web/Modules/Orchard.Search/Handlers/SearchSettingsPartHandler.cs
 2015-04-19 14:33:40 +02:00
Sipke Schoorstra
c525bda388 Added rule editor to other element types. 2015-04-19 11:40:13 +02:00
Sipke Schoorstra
d5f75a242d Implemented element rules. 2015-04-19 11:31:53 +02:00
Sipke Schoorstra
24776bf9ee Fixed copy/paste issue with Html element. 2015-04-18 20:48:50 +02:00
Sipke Schoorstra
b3b75b3d74 Fixed copy/paste issue with Html element. 2015-04-18 20:48:16 +02:00
Sipke Schoorstra
79e4aa199f Reverted all Orchard.Widgets modifications. 2015-04-18 20:38:39 +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
Xeevis
69316fe3ae #5138: Added missing validation message 2015-04-15 17:59:58 +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
Daniel Stolt
920819544a Merge branch 'feature/outputcache' into 1.9-int 2015-04-10 23:04:47 +02:00
Daniel Stolt
8b1f00e31c Disabled ASP.NET OutputCacheModule in Web.config. 2015-04-10 22:35:47 +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
3241458017 Fixed a typo. 2015-04-05 14:08:51 +02:00
Sipke Schoorstra
8383572ce1 Optimized widget layer evaluation. 2015-04-05 14:06:43 +02:00
Sipke Schoorstra
1a02d106a8 Added unique zone name validation. 2015-04-05 13:49:39 +02:00
Sipke Schoorstra
c044118b3f Implemented blended positioned rendering. 2015-04-05 12:10:51 +02:00
Sipke Schoorstra
11dc9309f0 Implemented collapsible columns. 2015-04-04 17:22:17 +02:00
Sipke Schoorstra
42d7eeec18 Implemented layout zones caching and changed zone harvesting to collect zones from all layouts. 2015-04-04 15:08:29 +02:00
Sipke Schoorstra
ffd68ec5d6 Incremental work on collapsible columns. 2015-04-03 18:43:57 +02:00
Sipke Schoorstra
721004306d Merge branch '1.9-int' into feature/layoutzones 2015-04-03 17:44:23 +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
804b4bbc7b Incremental work on blending layouts, zones and widgets. 2015-04-03 17:29:47 +02:00
Sipke Schoorstra
765c265977 Merge branch '1.9-int' into feature/layoutzones 2015-04-03 14:53:58 +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
Piotr Szmyd
0c993a43b2 Email. Fixed duplicated addresses in mail message To field. 2015-04-02 16:36:31 +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
Lombiq
5e85d3d872 Untabify CodeGenerationCommands 2015-03-30 00:16:55 +02:00
Lombiq
571f73ee9c Untabify FeatureManager 2015-03-29 20:28:35 +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
Bertrand Le Roy
070c0bb1d0 Merge branch 'feature/msbuildtypescript' into 1.9-int 2015-03-27 11:28:38 -07: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
Piotr Szmyd
a97a7e26d5 #21294: Added optional date parameter to TimerActivity. Also added description hints and updated class name. 
Work Item: 21294
 2015-03-24 15:17:30 +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
Daniel Stolt
8fbc1e41f3 Improved debug log message for ignored child actions. 2015-03-22 14:44:40 +01:00
Daniel Stolt
c80c961513 #20879: Fixed handling of child actions in OutputCache and SecureSocketsLayer. 
Work Item: 20879
 2015-03-22 14:41:02 +01:00
Piotr Szmyd
67c74b72fa #21285: When rendering shapes to string, there is no IWorkContextAccessor available in RequestContext, hence UrlHelper.MakeAbsolute (and AbsoluteAction) fails. 
Work Item: 21285
 2015-03-21 19:16:11 +01:00
Daniel Stolt
fac9080326 Removed JetBrains attributes from code base and removed suppression of CS0436 compiler warning. 2015-03-21 15:38:35 +01:00
Daniel Stolt
bdc64df4eb #21277: Fixed possible cache key collisions in output cache. 
The cache keys of action method parameters are now prefixed with "PARAM:" to avoid collisions with built-in keys such as "theme". Similar to the "HEADER:" prefixing done for headers.

Work Item: 21277
 2015-03-21 14:32:23 +01:00
Bertrand Le Roy
39b4009e40 Enable TypeScript files to be built with a simple "build typescript" and without taking a dependency on Node.js 2015-03-20 20:14:37 -07:00
Benedek Farkas
344d9d77be Tiny fix for the "Contribute back" paragraph on the Dashboard index page 2015-03-20 21:24:04 +01:00