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
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
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
Sébastien Ros
fd7feeafaa
Merge pull request #6102 from Codinlab/fixes/4622
...
[Fixes #4622 ] ShapeTracingFactory Should Not be Activable w/o HttpContext
2015-12-03 12:34:06 -08:00
Sébastien Ros
143cc5e41d
Merge pull request #6119 from mvarblow/patch-3
...
Add missing user activity
2015-12-03 12:08:09 -08:00
Sébastien Ros
bc820e6f9a
Merge pull request #6124 from dcinzona/patch-3
...
Removing duplicate fields from content parts fails
2015-12-03 12:05:52 -08:00
Gustavo Tandeciarz
66e08e5f41
Removing duplicate fields from content parts fails
...
SingleOrDefault will throw an error when removing fields with the same name. Should be FirstOrDefault as it is on line 64
2015-12-03 14:23:37 -05:00
Lombiq
15d27043d7
Fixing that some files had line endings mixed up (both LF and CRLF)
2015-12-03 00:00:36 +01:00
mvarblow
e1019b5fac
Update UserActivity.cs
...
Add missing activity, fixes #5684 in 1.9.x branch.
2015-12-02 11:34:47 -05:00
neTp9c
b04d953f75
Merge remote-tracking branch 'refs/remotes/origin/1.9.x' into issue/6107
2015-12-01 02:32:05 +03:00
neTp9c
b1d356f80b
Merge remote-tracking branch 'refs/remotes/OrchardCMS/1.9.x' into 1.9.x
2015-12-01 02:13:55 +03:00
neTp9c
6e485a5873
fix
2015-12-01 01:56:10 +03:00
Lombiq
c2dd09af5e
Fixing that NavigationQueryMenuItems and BlogArchives widgets couldn't be export/imported due to the lack of an identity, fixes #3488 .
...
Since the Projections migrations is already kind of a mess
2015-11-30 22:50:19 +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
Thierry Fleury
5b53671a2a
Revert "Removing unnecessary resolution"
...
This reverts commit 9b91b1b260
2015-11-29 18:03:58 +01:00
Thierry Fleury
044bb2fdaf
Fixes #4622 : ShapeTracingFactory Should Not be Activable without HttpContext
2015-11-29 16:24:02 +01:00
Lombiq
af76305088
Adding dynamic Content property to the Content Item class for easily accessing Parts and Fields. Thanks Sébastien! :)
2015-11-26 22:11:40 +01:00
