Daniel Stolt
c508584e63
Merge branch '1.9.x' into dev
2015-08-14 11:57:38 +01:00
Daniel Stolt
f2bf75328e
Merge pull request #5642 from paynecrl97/5520/tenantAwareConfig
...
#5520 AppConfigurationAccessor is now tenant aware.
Fixes #5520 .
2015-08-14 11:43:09 +01:00
Chris Payne
0213524317
AppConfigurationAccessor is now tenant aware
2015-08-14 11:34:28 +01:00
Lombiq
64585223ee
Fixing that Layouts couldn't be export/imported properly because they lacked an identity
2015-08-13 17:02:50 +02:00
Sipke Schoorstra
641236f358
Re-implemented HomeAlias custom export step as recipe builder steps.
2015-08-13 14:43:05 +01:00
Sipke Schoorstra
564fdc27be
#5636 : Fixed a bug with AliasStorage.Remove method.
...
Fixes #5636
2015-08-13 13:48:37 +01:00
Sipke Schoorstra
25fa422a5e
Added RemoveContent execution step.
2015-08-13 13:44:26 +01:00
Lombiq
06e4d2f7f8
Fixing typo/language
2015-08-11 02:04:57 +02:00
Sipke Schoorstra
d2c622dac6
Merge pull request #5626 from Xeevis/dev
...
Added woff2 mimetype
2015-08-09 10:37:59 +01:00
Xeevis
f708a0f32e
Added woff2 mimetype
2015-08-09 11:24:05 +02:00
Sipke Schoorstra
86b232aa52
Reformatted web.config and added some default mimetypes.
2015-08-06 21:04:12 +01:00
Sipke Schoorstra
c724cf0fcf
Merge branch '1.9.x' into dev
...
Conflicts:
src/Orchard.Web/Modules/Orchard.DynamicForms/Module.txt
src/Orchard.Web/Modules/Orchard.Rules/Module.txt
2015-08-06 20:52:13 +01:00
Sébastien Ros
b206a656e8
Merge pull request #5603 from mahsaro/WidgetLayersOrder_1.9.x
...
Ordered layers alphabetically in Widget admin UI.
2015-08-06 12:41:19 -07:00
Sébastien Ros
32669d347a
Merge pull request #5610 from psenechal/1.9.x
...
Update Module.txt
2015-08-06 12:40:44 -07:00
Sébastien Ros
5bdfb6e98a
Merge pull request #5476 from dcinzona/patch-1
...
Added mimetype declarations to root web.config
2015-08-06 12:40:01 -07:00
Sébastien Ros
8f9d52307b
Merge pull request #5615 from OrchardCMS/issue/4097/fix-duplicate-content
...
#4097 : Changed Import to accommodate expected behavior as defined as …
Fixes #4097
2015-08-06 12:32:54 -07:00
Sébastien Ros
5f51c7c31a
Merge pull request #5567 from OrchardCMS/issue/homepage-alias
...
Issue/homepage alias
2015-08-06 12:31:40 -07:00
Lombiq
85fd5c8320
Fixing registration settings infoset migration
2015-08-06 21:30:35 +02:00
Sébastien Ros
7e95f78ec9
Merge pull request #5619 from OrchardCMS/issue/5271/module-manifest-metadata
...
#5271 : Added Lifecycle Status field to module manifest.
Fixes #5271
2015-08-06 12:20:35 -07:00
Sipke Schoorstra
4a88752ba8
#5271 : Added Lifecycle Status field to module manifest.
...
- Module manifest extended with LifecycleStatus field.
- Updated Features screen to show lifecycle status if LifecycleStatus != Production.
- Updated the deprecated module manifests with the new lifecycle status (CustomForms, Media, MediaPicker and Rules).
2015-08-06 17:48:50 +01:00
Sebastien Ros
41bd9ce9bc
Adding a file system backed output cache provider
2015-08-05 16:59:34 -07:00
Sebastien Ros
e346170f24
Adding some documentation for IAppDataFolder
2015-08-05 14:21:22 -07:00
Sipke Schoorstra
b1288ae5bc
Minor code cleanup.
2015-08-05 17:18:40 +01:00
Sipke Schoorstra
98666530b4
#4097 : Changed Import to accommodate expected behavior as defined as part of the issue.
...
This formalizes what we decided should happen when importing recipes in combination with various possible statuses a content item can have and how the import affects this.
2015-08-05 17:11:04 +01:00
Sipke Schoorstra
ac1a279d1b
#2540 : Fixes an issue with NotifyFilter.
...
This fixes the case when a controller for example registers a notification and then returns a View result instead of a Redirect result.
When returning a View, the registered notifications would not be rendered until another page request occurred.
Fixes #2540
2015-08-05 14:03:44 +01:00
Sebastien Ros
430c3de460
Compressing output cache content in Redis
2015-08-04 17:28:49 -07:00
bleroy
6e8b4524d0
Delete ghost solution from 2010 from Orchard.ContentTypes module.
2015-08-04 16:50:07 -07:00
Philip Senechal
a6f5e4fb01
Update Module.txt
...
Spelling corrections
2015-08-04 16:25:30 -07:00
Philip Senechal
ff1fe79016
Update Module.txt
...
Language correction
2015-08-04 16:22:56 -07:00
Sipke Schoorstra
226dc719ab
Merge pull request #5599 from mahsaro/dev
...
Importing/Exporting of Aliases.
2015-08-04 22:25:20 +01:00
mahsaro
5e58cf9d70
Removed extra line breaks.
2015-08-04 22:23:17 +01:00
mahsaro
d75af074bb
Remove extra line.
2015-08-04 22:20:02 +01:00
mahsaro
a97cbb5e98
Remove newline.
2015-08-04 22:11:51 +01:00
mahsaro
e53f29a515
Log text change. Change try place in the code to cover more.
2015-08-04 22:02:10 +01:00
mahsaro
14ddaeb713
Optimize LINQ queries AliasStep and RolesStep.
2015-08-04 21:44:13 +01:00
Sebastien Ros
f25758cc05
Refactoring connection multiplexer usage
...
For consistency with other services using Redis
2015-08-04 10:30:23 -07:00
Sebastien Ros
bb6a44634d
Handling output cache provider exceptions
2015-08-04 10:29:46 -07:00
Sipke Schoorstra
de29f63521
Formatted file.
2015-08-04 17:18:28 +01:00
Sipke Schoorstra
8cda6b54c6
Throwing an exception when specifying a non-existing recipe.
2015-08-04 17:08:15 +01:00
Sipke Schoorstra
783281321c
Updated generated assets.
2015-08-04 17:07:32 +01:00
Sipke Schoorstra
f4a707a281
Merge branch 'dev' into issue/homepage-alias
...
Conflicts:
src/Orchard.Web/Modules/Orchard.ImportExport/Views/Admin/ImportResult.cshtml
src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
2015-08-04 16:28:07 +01:00
Sipke Schoorstra
2ad324d4e2
Merge branch 'dev' into issue/homepage-alias
...
Conflicts:
src/Orchard.Web/Modules/Orchard.ImportExport/Views/Admin/ImportResult.cshtml
src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
2015-08-04 16:25:35 +01:00
Sipke Schoorstra
0c6326bafd
Improved recipe import/reset execution by pausing sweep generator.
...
This prevents active background tasks from accessing tables that may no longer be there (in the case of a full site reset) by pausing the sweep generator.
To ensure that the sweep generator is resumed after the recipe has been executed, a new ActivateSweepGeneratorStep is enqueued at the end of the recipe execution.
2015-08-04 15:03:47 +01:00
mahsaro
3657cfecab
Ordered layers alphabetically in Widget admin UI.
2015-08-04 15:02:08 +01:00
mahsaro
492631da85
Added RecipeExecutionLogger to AliasStep constructor.
2015-08-04 14:03:27 +01:00
mahsaro
cc9a7d03f8
Merge remote-tracking branch 'upstream/dev' into dev
2015-08-04 13:38:09 +01:00
mahsaro
5bfd175482
Fixed action names.
2015-08-04 11:58:57 +01:00
mahsaro
2d70794c8b
Remove comments...
2015-08-04 11:04:51 +01:00
mahsaro
6c7c84acee
Adding tabs to Alias admin UI for Managed/Unmanaged aliases.
2015-08-04 10:20:00 +01:00
mahsaro
e09cd37de2
Fix export description text for Aliases and Roles.
2015-08-03 23:09:09 +01:00
