Commit Graph

9264 Commits

Author SHA1 Message Date
Sipke Schoorstra
ca4fb40bdf Merge branch 'dev' into feature/dashboard 2015-06-27 12:12:01 +03:00
Lombiq
4e7e274d85 CSS classes can now be specified for widgets, fixes #5387 2015-06-26 00:34:57 +02:00
Sébastien Ros
1aefd0fdbd Merge pull request #5267 from Skrypt/autoroute-patterns-localization
Autoroute patterns localization
2015-06-25 12:12:06 -07:00
Lombiq
31e3072328 Enabling SetupService to harvest recipes from themes too 2015-06-25 16:57:13 +02:00
Daniel Stolt
723c177fe3 Fixed merge artifacts. 2015-06-22 21:12:43 +03:00
Sebastien Ros
622b191ad5 Merge branch '1.9.x' into dev 2015-06-22 10:11:56 -07:00
Sebastien Ros
78fb58f016 Fixing localization gender 2015-06-22 10:10:58 -07:00
Sebastien Ros
8481768b58 Fixing culture list encoding 2015-06-22 10:06:34 -07:00
Skrypt
c192ade6a9 Removing commented code in migration 2015-06-22 12:18:51 -04:00
agriffard
4eb8d1d2ea Fix some typos #5405 2015-06-21 15:44:04 +02:00
Daniel Stolt
45aeb7b467 Merged 1.9.x into dev. 2015-06-20 23:30:49 +03:00
Daniel Stolt
220c1b591a Restored reset of markup content styling in layout editor. 2015-06-20 20:38:42 +03:00
Daniel Stolt
b06a4ecb73 #5403 Improved native clipboard support in layout editor. 2015-06-20 19:35:11 +03:00
Daniel Stolt
764db254da Made layout editor toolbox separately scrollable while in sticky mode. 2015-06-20 16:42:53 +03:00
Bertrand Le Roy
c1359f7a86 Add a heading element that renders as h1-h6 tags. 2015-06-19 18:57:45 -07:00
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
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