lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-25 19:17:13 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch '1.8.x' into 1.x

Browse Source 
Conflicts:
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Services/MediaLibraryService.cs
	src/Orchard.Web/Modules/Orchard.Modules/styles/orchard-modules-admin.css
	src/Orchard.Web/Modules/Orchard.Taxonomies/Services/TaxonomyService.cs
	src/Orchard.Web/Modules/Orchard.Widgets/Filters/WidgetFilter.cs
	src/Orchard/Mvc/Routes/RoutePublisher.cs
This commit is contained in:
Sebastien Ros
2015-03-05 12:15:00 -08:00
parent b03c1bc901 1407ff7fce
commit 5ff2ad509b
51 changed files with 1465 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Modules/Orchard.Packaging/Commands/PackagingCommands.cs
View File

@@ -3,10 +3,12 @@ using System.IO;
using System.Web;
using System.Web.Hosting;
using Orchard.Commands;
using Orchard.Environment.Extensions;
using Orchard.Packaging.Services;
using Orchard.UI.Notify;
namespace Orchard.Packaging.Commands {
[OrchardFeature("PackagingServices")]
public class PackagingCommands : DefaultOrchardCommandHandler {
private static readonly string ApplicationPath = HostingEnvironment.MapPath("~/");