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
3e6043b6d7678d00279486e0092397b37ca3e98c
Commit Graph

8916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sipke Schoorstra
3e6043b6d7 Merge branch '1.9-int' into 1.x 
Conflicts:
	src/Orchard.Web/Modules/Orchard.MediaLibrary/MediaFileName/MediaFileNameEditorSettings.cs
	src/Orchard.Web/Modules/Orchard.Search/Handlers/SearchSettingsPartHandler.cs
 2015-04-17 15:12:28 +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
Sébastien Ros
3bb36ab010 Merge pull request #5156 from MpDzik/pr/users-consts2 
Define constants for maximum username/email length
 2015-04-16 12:57:47 -07: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
0d9a4a295c Merge pull request #5170 from keesd/1.x 
1.x
 2015-04-16 16:56:07 +02:00
Kees Damen
ee1b7a5088 Merge branch '1.x' of https://github.com/keesd/Orchard into 1.x 2015-04-16 16:29:42 +02:00
Kees Damen
2cfcdfaa8b Fixed project references to Orchard.Core and Orchard.Framework 2015-04-16 16:23:12 +02:00
Sipke Schoorstra
bcb6f2c4ac Merge branch '1.9-int' into 1.x 2015-04-16 16:10:57 +02:00
Lombiq
db0c8c3d1f Changing all Codeplex issue links to GitHub links 2015-04-15 21:00:20 +02:00
Lombiq
06070fbb03 Wrapping stream usage into using() instead of manual Dispose() in FileSystemStorageProvider 2015-04-15 20:54:39 +02:00
Lombiq
f8e82be4b9 Rolling back streams in storage providers, fixes #4860 2015-04-15 20:45:11 +02:00
Lombiq
566d23ec55 Untabifying Text class 2015-04-15 20:34:28 +02:00
Xeevis
69316fe3ae #5138: Added missing validation message 2015-04-15 17:59:58 +02:00
Nicholas Mayne
ef135d348c Fixes #5164 2015-04-15 16:35:59 +01:00
Nicholas Mayne
441e6056fa Fixes #4276 : removing Persist Security Info=True 2015-04-15 16:27:01 +01:00
Nicholas Mayne
1bc9adae0d Fixes #4301 : Renaming file 2015-04-15 16:24:31 +01:00
Nicholas Mayne
eca6f9177d Fixes #4295 - removing erroneous check in publish later part 2015-04-15 14:56:41 +01:00
Nicholas Mayne
e3249cc02c removing a dependency 2015-04-15 13:51:17 +01:00
Sipke Schoorstra
dad113feed #5116: Fixed failing tests. 2015-04-15 14:00:16 +02:00
Marek Dzikiewicz
c9ebd1db67 Define constants for maximum username/email length 2015-04-15 09:06:34 +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
1729e73a73 Merge branch '1.9-int' into 1.x 2015-04-10 11:40:54 +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
Piotr Szmyd
0c993a43b2 Email. Fixed duplicated addresses in mail message To field. 2015-04-02 16:36:31 +02:00
Lombiq
68c0e67aee Fixing that during saving a content type definition, updating MediaFileNameEditorSettings caused an exception if the Stereotype is empty 2015-04-02 16:36:19 +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