Sebastien Ros
1d6cb27d01
Merge branch '1.9.x' into dev
...
Conflicts:
README.md
src/Orchard.Web/Modules/Orchard.DynamicForms/Controllers/FormController.cs
src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/CheckboxElementDriver.cs
src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/EmailFieldElementDriver.cs
src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/EnumerationElementDriver.cs
src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/HiddenFieldElementDriver.cs
src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/RadioButtonElementDriver.cs
src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextAreaElementDriver.cs
src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextFieldElementDriver.cs
src/Orchard.Web/Modules/Orchard.Layouts/Drivers/HeadingElementDriver.cs
src/Orchard.Web/Modules/Orchard.Layouts/Drivers/HtmlElementDriver.cs
src/Orchard.Web/Modules/Orchard.Layouts/Drivers/MarkdownElementDriver.cs
src/Orchard.Web/Modules/Orchard.Layouts/Drivers/TextElementDriver.cs
src/Orchard.Web/Modules/Orchard.Layouts/Filters/TokensFilter.cs
src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Html.cshtml
src/Orchard/Orchard.Framework.csproj
2015-06-30 11:35:41 -07:00
Sebastien Ros
6b0985a44e
Merge branch 'master' into 1.9.x
2015-06-30 11:31:35 -07:00
Sebastien Ros
2c3973bfa0
Merge branch '1.9.1'
2015-06-30 11:30:37 -07:00
Jasmin Savard
28168c0550
Fixes #5457 ; Admin Culture Picker cookie not working on localhost
2015-06-30 13:09:19 -04:00
Sipke Schoorstra
c3dffb79f5
#5378 : Fixed content field elements placement for content picker field and media picker field.
2015-06-29 14:27:23 +03:00
Sipke Schoorstra
5b40567b6d
#5407 : Layout elements now evaluate tokens.
2015-06-29 14:01:58 +03:00
Sipke Schoorstra
583ff8951a
Removed unused namespaces.
2015-06-27 19:49:23 +03:00
Sipke Schoorstra
5c688267fa
#5420 : Added stub CSS files for various activities to prevent 404 errors.
2015-06-27 18:47:06 +03:00
Sipke Schoorstra
2c496a36db
#5437 : Maintaining selected values after model validation error.
2015-06-27 18:31:08 +03:00
Nicholas Mayne
4967fa807b
Fixing multi tenant content culture lookup - thanks to Mr Spits for the patch.
2015-06-27 15:36:13 +01:00
Sipke Schoorstra
18166bd274
Fixed KeyNotFoundException in AutoroutePart.
...
This fixes the issue where the autoroute part fails after a clean Orchard setup.
2015-06-27 13:38:44 +03:00
Sipke Schoorstra
23e525206b
Merge branch 'dev' into feature/dashboard
2015-06-27 12:52:11 +03:00
Sipke Schoorstra
b1c782f560
Added permission checks.
2015-06-27 12:51:08 +03:00
Nicholas Mayne
9dbf30cd10
Merge pull request #5441 from oldrev/pg-connstr-fix
...
Fixed the sample of PostgreSQL's connection string
2015-06-27 10:37:35 +01:00
Sipke Schoorstra
ca4fb40bdf
Merge branch 'dev' into feature/dashboard
2015-06-27 12:12:01 +03:00
oldrev
315f271fcc
Fixed the sample of PostgreSQL's connection string
2015-06-27 16:29:20 +08:00
Nicholas Mayne
c435a98670
Merge pull request #5435 from yw80/1.9.x
...
Remove a excess @ in TaxonomyField.cshtml
2015-06-26 09:07:23 +01:00
yw80
42dae3edf3
Remove a excess @ in TaxonomyField.cshtml
...
I think this is just an oversight.
2015-06-26 14:21:07 +08:00
Lombiq
4e7e274d85
CSS classes can now be specified for widgets, fixes #5387
2015-06-26 00:34:57 +02:00
Sébastien Ros
f3fc2b53ba
Merge pull request #5429 from dalenewman/patch-2
...
Fix moderator notification
2015-06-25 13:20:16 -07:00
Sébastien Ros
1a9b7af4ac
Merge pull request #5430 from jchenga/issues/5148-1.9.x
...
[Fixes #5418 ] Lost Password not working with Anonymous Access Off
2015-06-25 13:15:32 -07:00
Jack Cheng
0c7fd67dca
[ Fixes #5418 ] Lost Password not working with Anonymous Access Off
2015-06-25 12:57:09 -07:00
Dale Newman
6063ba31d0
Fix moderator notification
...
`Orchard.Email.Services.SmtpMessageChannel.Process` expects a string for Recipients, not a string array. This results in an *Object reference not set to an instance of an object* exception and the moderator(s) do not get notified. Fixes #4928 .
2015-06-25 15:45:50 -04:00
Sébastien Ros
7bf2c702a1
Merge pull request #5427 from jersiovic/patch-2
...
#5426 Projections don't order queries following Position field
2015-06-25 12:41:42 -07:00
Sébastien Ros
61d432ba4c
Merge pull request #5413 from dcinzona/patch-2
...
Assembly binding to azure storage 4.3.0
2015-06-25 12:23:20 -07:00
Sébastien Ros
7cdb9ecf53
Merge pull request #5404 from MpDzik/pr/localize-quote
...
Fix handling localized strings with quotes
2015-06-25 12:22:52 -07: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
Sergio Navarro
ae61c81575
#5426 Projections don't order queries following Position field
...
Projections don't order queries following the Position field of each order in the query
Related issue https://github.com/OrchardCMS/Orchard/issues/5426
2015-06-25 20:26:15 +02:00
Lombiq
31e3072328
Enabling SetupService to harvest recipes from themes too
2015-06-25 16:57:13 +02:00
Lombiq
e10ba8126a
Fixing that ClientHostAddressAccessor failed in a background task
...
This was the case e.g. when roles were modified in a background task with Audit Trail trying to record the event
2015-06-25 00:35:21 +02:00
Lombiq
a7626b78f5
Fixing that instead of just widgets all content items were retrieved in some WidgetsService methods
2015-06-24 16:04:11 +02:00
Sebastien Ros
760e30855c
Updating version number 1.9.1
2015-06-23 11:20:06 -07:00
Marek Dzikiewicz
6636527006
Add unit tests for #4154 and #5402
2015-06-23 11:44:46 +02:00
Marek Dzikiewicz
aacf0b2476
Introduce ILocalizationStreamParser
...
This moves the logic of parsing PO files from
DefaultLocalizedStringManager to a separate service, so that parsing
can be tested independently from resolving translations from loaded PO
files.
2015-06-23 11:44:29 +02:00
Gustavo Tandeciarz
88ac0d2879
Assembly binding to azure storage 4.3.0
...
Retargeting to 1.9.x - updated assembly binding from 3.1.0 to 4.3.0
2015-06-22 18:55:35 -04:00
Sébastien Ros
ac305af963
Merge pull request #5406 from MpDzik/pr/media-import-loc
...
MediaLibrary - Fix localization of Import button
2015-06-22 15:45:46 -07: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
Marek Dzikiewicz
50d65bc0b9
MediaLibrary - Fix localization of Import button
2015-06-21 17:42:54 +02:00
agriffard
4eb8d1d2ea
Fix some typos #5405
2015-06-21 15:44:04 +02:00
Marek Dzikiewicz
104cf7d5f4
Fix handling localized strings with quotes
2015-06-20 22:42:33 +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
