Commit Graph

9385 Commits

Author SHA1 Message Date
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
Skrypt
34ddbbd371 Adding lazy update of patterns. Code optimizations.
Commented out the migration patterns upgrade code.
2015-06-14 21:18:57 -04: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
Skrypt
6e3d00b2d9 Optimization to support null values on culture instead of needing to set it to an empty string --> cleaner 2015-06-12 01:54:42 -04:00
Skrypt
8beec81217 Reverting changes in Migration.
Adding String.IsNullOrEmpty instead of == ""
Fixed migration code to use ContentDefinitionManager only
Fixed return numbers on migration
using DefaultJsonConverter service in AutorouteSettings.cs
2015-06-11 23:53:41 -04: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
Bertrand Le Roy
c16de7f20a Fix flashing popup when adding a fieldset to the layout canvas. 2015-06-10 10:26:47 -07:00
Daniel Stolt
c1eff70f4a Refactored client-side asset build automation to fix watch triggering. 2015-06-10 16:26:51 +03:00
Rob King
92bde1ac71 Merge pull request #2 from gcsuk/ImprovedRecipeJournal
Replaced string.format with Localizable T
2015-06-10 12:24:32 +01:00
Rob King
7e149c4bc1 Replaced string.format with Localizable T 2015-06-10 10:07:04 +01:00
Sipke Schoorstra
9fbaed9123 Removed non-existing files from Orchard.Layouts.csproj. 2015-06-10 11:04:17 +03:00
Bertrand Le Roy
ef3ca907c7 Remove editor completely when adding a fieldset to the layout editor. 2015-06-09 13:48:58 -07:00
Bertrand Le Roy
7a1983b47f Add a fieldset element 2015-06-09 13:08:57 -07:00
Sipke Schoorstra
230d1b5d5d Fixed missing view file issue. 2015-06-09 21:54:48 +03:00
Daniel Stolt
5d40be8390 Removing an MSBuild property that was not supposed to be committed. 2015-06-09 21:31:27 +03:00
Daniel Stolt
452b8cfeac Added sticky positioning to layout editor toolbox. 2015-06-09 19:38:44 +03:00
Rob King
d78afaeb51 Merge pull request #1 from gcsuk/ImprovedRecipeJournal
Improved Recipe Journal Logging Detail
2015-06-09 16:09:53 +01:00
Rob King
a0279f2d9c Improved recipe logging to give a trail of executed tasks 2015-06-09 15:59:44 +01:00