lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 21:01:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
9,469 Commits 73 Branches 31 Tags 239 MiB
128376b662
Commit Graph

9469 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sébastien Ros
128376b662 Merge pull request #6296 from hannan-azam/1.9.x 
[Fixes #5689] Remove Alias when Item is Destroyed
 2016-01-21 12:03:37 -08:00
Hannan Azam
ceed1a04d6 [Fixes #5689] Remove Alias when Item is Destroyed 2016-01-21 20:31:13 +05:00
Piotr Szmyd
7057740787 Fixing issue with fetching a theme and rendering shapes from a background thread. 2016-01-16 00:13:24 +01:00
Sebastien Ros
eb7574df0b [Fixes #6248] Prevent users from renaming their root folder 2016-01-15 08:55:32 -08:00
Sebastien Ros
f17f2c3a93 [Fixes #6279] Adding confirmation for deleting taxonomies 2016-01-14 17:52:07 -08:00
Sébastien Ros
40db1e2a84 Merge pull request #6236 from jtkech/patch-3 
[Fixes #6192] Using Lazy IWorkContextStateProvider
 2016-01-14 12:15:24 -08:00
Sébastien Ros
eb6f2f2752 Merge pull request #6249 from OrchardCMS/issue/infoset-nullable-enums 
Added handling of nullable enums.
 2016-01-14 12:14:16 -08:00
Sebastien Ros
e907334b6c Fixing object dumper unit tests 2016-01-13 15:31:03 -08:00
Sebastien Ros
a55ba9f06b [Fixes #5951] Fixing NRE when exporting media items 2016-01-13 13:06:39 -08:00
Sebastien Ros
112f13bf39 [Fixes #5969] Listing unlistable types in Contents/List 2016-01-13 13:03:46 -08:00
Daniel Stolt
011d80cdb8 Merge pull request #6270 from armanforghani/patch-1 
Made strings localizable in LayoutEditor.cshtml.
 2016-01-11 18:10:05 +01:00
armanforghani
ee54d4237f Update LayoutEditor.cshtml. 
Wrapped strings in T delegate.
Fixes #6269
 2016-01-11 16:03:35 +03:30
Sébastien Ros
2d42c74395 Merge pull request #6207 from Codinlab/features/2027 
[Fixes #2027] Add role rule  in Orchard.Widgets module
 2016-01-07 12:35:31 -08:00
Sébastien Ros
7578daa510 Merge pull request #6131 from sebastienros/sebros/cachemonitor 
Improving monitors usage for output cache
 2016-01-07 12:14:52 -08:00
Sébastien Ros
5dd54b6d55 Merge pull request #6125 from neTp9c/issue/6107 
[Fixes #6107] Fixing content permissions part
 2016-01-07 12:12:26 -08:00
Sébastien Ros
7ee227b73e Merge pull request #6114 from Codinlab/fixes/6113 
[Fixes #6113] Anchor custom link on homepage produces bad href
 2016-01-07 12:10:03 -08:00
Lombiq
79b0b809ca Fixing that when editing blog posts permissions were mistakenly checked for the blog instead of the post 2016-01-06 14:49:57 +01:00
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
Thierry Fleury
1a7eae5dc1 Fix media-library-picker.js 2015-12-31 14:10:25 +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
Nicholas Mayne
d13a467882 Merge pull request #6239 from Codinlab/patches/LuceneLogger 
Remove duplicate Logger assignation
 2015-12-28 10:54:34 +00:00
Thierry Fleury
66963d1845 Remove duplicate Logger assignation 2015-12-28 10:27:36 +01:00
jtkech
45ea8513a2 Update WorkContextImplementation.cs 2015-12-26 23:16:19 +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
Lombiq
37b97eaa26 Move Mono DLL from the Orchard.Scripting.CSharp module to the root lib folder 2015-12-22 21:57:25 +01:00
Chris Payne
28e2e8f695 Use Display Name to show validation messages 2015-12-22 16:44:24 +00:00
Thierry Fleury
c45da04455 Close #2027 : Add role rule in Orchard.Widgets module 2015-12-20 19:54:21 +01:00
Sébastien Ros
da8898e946 Merge pull request #6178 from Jwheuvel/1.9.x 
All /lib dll files are now correctly taken into account when using git
 2015-12-17 12:32:38 -08:00
Sébastien Ros
2853197117 Merge pull request #6183 from mvarblow/issue-1978 
[Fixes #1978] Extending MarshalByRef object lease
 2015-12-17 12:32:04 -08:00
Thierry Fleury
ea5ce6c865 Fixes 6189 : TextAreaElement throwing on null ProcessedValue 2015-12-16 18:33:43 +01:00
Piotr Szmyd
83900802b7 #6188: Using correct key when removing Redis cache entry. 2015-12-16 17:05:28 +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
Matt Varblow
4362b00da1 Fixed indentation 2015-12-15 16:09:24 -05:00
Matt Varblow
67dd5abc31 Fixes #1978: Long-running Orchard commands crashed the command line due to expired leases on remote proxies for MarshalByRef parameters passed in cross-AppDomain calls. 2015-12-15 16:07:34 -05:00
Sebastien Ros
117dd09f8c Improving monitors usage for output cache 2015-12-15 10:36:06 -08:00
Jwheuvel
b1b34e444a All /lib dll files are now correctly taken into account when using git 
Changed the .gitignore so all /lib dependencies are included correctly.
 2015-12-15 09:34:57 +01:00
neTp9c
f6be2834ff Merge remote-tracking branch 'refs/remotes/origin/1.9.x' into issue/6107 
# Conflicts:

#	src/Orchard.Web/Modules/Orchard.ContentPermissions/Drivers/ContentPermissionsPartDriver.cs
 2015-12-14 20:50:22 +03:00
neTp9c
ed1a3b0c6c Merge remote-tracking branch 'refs/remotes/OrchardCMS/1.9.x' into 1.9.x 2015-12-14 20:23:28 +03:00
Thierry Fleury
19faeecc9a Fixes #6113 : Anchor custom link on homepage produces bad href 2015-12-14 17:49:07 +01:00
Lombiq
6e3c8cbb9e Fixing line endings in further two extension-less text files 2015-12-14 01:42:32 +01:00
Lombiq
5406b17601 Converting all files stored as CRLF in git to be stored as LF 
LF is the git default and all new files are stored as such. Old files from the hg to git conversion however were moved over as CRLF.
 2015-12-13 22:21:02 +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
Lombiq
6cc481e825 Normalizing some more line endings 2015-12-09 00:41:46 +01:00
Lombiq
4105f4490b Normalizing line endings in some more files (most possibly remainder of the hg to git conversion) 2015-12-09 00:34:05 +01:00
Lombiq
2ab0094f73 Adding .gitattributes file to enforce common line ending configuration 
As also advised by GitHub: https://help.github.com/articles/dealing-with-line-endings/
 2015-12-09 00:25: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
Connor Smallman
43d8b1a803 Wait for document ready before calling LayoutEditor constructor 2015-12-07 15:16:20 +00: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