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,220 Commits 73 Branches 31 Tags 239 MiB
d6c452466c
Commit Graph

9220 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastien Ros
d6c452466c Merge branch '1.9.x' into dev 2015-06-19 12:57:49 -07:00
Sebastien Ros
51409346cc Fixing mismatched assembly versions 2015-06-19 12:57:19 -07:00
Sebastien Ros
a4edee5474 Refactoring authentication validation 2015-06-19 11:33:44 -07:00
Sebastien Ros
0e47295b9f Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Comments/Web.config
	src/Orchard.Web/Modules/Orchard.Fields/Web.config
	src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Web.config
 2015-06-19 11:33:12 -07:00
Sebastien Ros
2cd5af5193 Reverting IMembership usage in FormsAuthenticationService 2015-06-19 10:54:46 -07:00
Sebastien Ros
1180425109 Updating libraries 2015-06-19 10:39:00 -07:00
Sébastien Ros
3c3a6df6dd Merge pull request #5391 from paynecrl97/5390/delay_output_cache_key_creation 
Defers output cache key creation until we know we need it
 2015-06-19 09:35:10 -07:00
paynecrl97
c6e96867c7 Only executes itemDescriptor logic if Debug logging is enabled 2015-06-19 09:17:29 +01:00
Sebastien Ros
8d134ba0c5 Fixing html-encoding in WebSearch settings page 2015-06-18 16:47:38 -07:00
Sebastien Ros
745e88805c Fixing unresolvable IMembership dependency 
Fixes #5395
 2015-06-18 16:23:27 -07:00
Sebastien Ros
db66ec941c Adding setting to set allowed media types 2015-06-18 16:03:50 -07:00
Sebastien Ros
fb923f09e0 Merge branch '1.9.x' into dev 2015-06-18 14:20:08 -07:00
Sebastien Ros
9d5bc20666 Fixing unit tests 2015-06-18 14:19:44 -07:00
Sebastien Ros
95a073ff93 Ignoring auth cookies of logged out users 2015-06-18 14:06:01 -07:00
Sébastien Ros
a3a252fb19 Merge pull request #5392 from paynecrl97/5356/abstract_active_layer_evaluation 
Abstract active layer evaluation away from the Widget Filter
 2015-06-18 12:53:21 -07:00
Sébastien Ros
5560cd76db Merge pull request #5376 from thekaveman/dev 
adding 'export file' command for use in Orchard.exe
 2015-06-18 12:40:22 -07:00
Sébastien Ros
1fcf7c86d0 Merge pull request #5371 from gcsuk/1.9.x 
Improved Recipe Journal Logging Detail
 2015-06-18 12:39:05 -07:00
Sébastien Ros
d2ad3e31bb Merge pull request #5358 from oldrev/feature/postgresql 
Feature: PostgreSQL Support
 2015-06-18 12:35:03 -07:00
Sébastien Ros
bca643bf1f Merge pull request #5292 from Hazzamanic/1.9.x 
fixing placementeditor try/catch block
 2015-06-18 12:28:00 -07:00
Sebastien Ros
6d58498b82 Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config
	src/Orchard.Web/Modules/Orchard.ImageEditor/Web.config
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
	src/Orchard/Localization/Text.cs
 2015-06-18 10:35:06 -07:00
Sebastien Ros
f276501923 Merge branch 'sebros/authcookie' into 1.9.x 2015-06-18 10:31:57 -07:00
paynecrl97
5a828da403 Changes signature of ILayerEvaluationService from IEnumerable to array; Fixes localizer access. 2015-06-18 09:41:18 +01:00
Sebastien Ros
76408da930 #5315: Adding new settings to configure SSL cookies 
- Creating ISslSettingsProvider to define whether cookies can only be sent over SSL or not
- Implementing DefaultSslSettingsProvider based on Sites.config and web.config
making it configurable per tenant or for the whole site
- Implementing SecureSocketsLayerSettingsProvider in Orchard.SecureSocketsLayerSettingsProvider

Fixes 5315
 2015-06-17 18:06:47 -07:00
Skrypt
43497c8093 Closes #5389; Admin Culture Picker wrong cookie domain. 2015-06-17 20:02:04 -04:00
Skrypt
c68d212681 Closes #5389; Admin Culture Picker wrong cookie domain. 2015-06-17 19:47:09 -04:00
paynecrl97
0bd279cc89 Places active layer IDs into a LazyField in order to prevent evaluation multiple times per request 2015-06-17 16:27:29 +01:00
paynecrl97
f13c9d47c7 Adds more detail to itemDescriptor 2015-06-17 16:05:53 +01:00
paynecrl97
1a8b17d04e Defers output cache key creation until we know we need it 2015-06-17 14:02:05 +01:00
Sebastien Ros
20c5b494cd By default, html-encode translation parameters 
Also ensure that any existing parameter is not double-encoded by
removing .Text when used as a translation parameter.
 2015-06-16 16:50:45 -07:00
Sebastien Ros
cd49d2ccf2 Updating ruleset location for all projects 2015-06-16 16:22:04 -07:00
Sebastien Ros
aa2e2cf1d0 Ignoring VS 2015 settings files 2015-06-16 11:16:35 -07:00
Bertrand Le Roy
8eea9a6771 Add missing reference to media library from image editor web config so that views compile properly. 2015-06-15 12:42:50 -07:00
Lombiq
1d445c5438 Fixing that Custom Forms didn't display a submit button text if there was none configured 
The button text not being configured can happen on an 1.8 to 1.9 upgrade for example.
 2015-06-15 00:07:01 +02:00
Lombiq
6aabc4d9f9 Fixing that the Audit Trail Recycle Bin caused YSOD if a content item didn't have a display text (like Comments) 2015-06-14 23:18:25 +02:00
Bertrand Le Roy
14172fec51 Fix compilation issue on dynamic forms admin views that use namespaces from layouts. 2015-06-13 16:42:09 -07:00
Lombiq
de9fc2fb5b Registration and last login date are now tracked for users, fixes #1296 2015-06-13 23:56:40 +02:00
Lombiq
e066e39070 Decoupling Dynamic Forms' root feature from Orchard.Scripting.CSharp and Orchard.Users, fixes #5349 2015-06-13 23:50:26 +02:00
Sipke Schoorstra
9e88d16273 Added missing null check to Projection element driver's export method. 2015-06-13 19:11:25 +03:00
Lombiq
66af4a8cdf Adding null check for query string parameters in AuditTrail to prevent possible YSOD 2015-06-13 01:02:16 +02: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
Bertrand Le Roy
e3a9758331 Add a break element that renders the hr tag. 2015-06-11 20:47:37 -07:00
Bertrand Le Roy
564eeacf04 Merge branch '1.9.x' of https://github.com/OrchardCMS/Orchard into 1.9.x 2015-06-11 10:03:57 -07:00
Kegan Maher
d782d83db7 ensure that a version arg was given 2015-06-11 08:48:48 -07:00
Daniel Stolt
83429f4000 Restoring commit: Render fieldset as a fieldset in the editor canvas (by Bertrand Le Roy). 2015-06-11 16:11:30 +03:00
Sipke Schoorstra
20fe55a458 Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj
	src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/Forms.js
	src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/Forms.min.js
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutEditor.min.js
	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.min.js
	src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor.css
	src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor.css.bundle
	src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor.min.css
	src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor/Editor.css
	src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor/Editor.min.css
	src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor/Popup.css
	src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor/Popup.min.css
	src/Orchard.Web/Modules/Orchard.Layouts/Views/LayoutEditor.Template.Toolbox.cshtml
	src/Orchard/Tasks/BackgroundService.cs
 2015-06-10 23:58:18 +03:00
Bertrand Le Roy
47a0a87dc0 Render fieldset as a fieldset in the editor canvas. 2015-06-10 13:10:59 -07:00
Daniel Stolt
c8590fd934 Added missing NPM dependency in Orchard.Layouts. 2015-06-10 23:06:41 +03:00
Kegan Maher
298f30e628 adding 'export file' command for use in Orchard.exe for #4937 2015-06-10 13:02:41 -07:00
Sipke Schoorstra
1ee4664c50 Removed two more non-existing files. 2015-06-10 22:36:34 +03:00
Daniel Stolt
e8de82b611 Added Gulp build to Orchard.DynamicForms. 2015-06-10 20:43:59 +03:00