lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge 1.x -> default

Browse Source
This commit is contained in:
Renaud Paquay
2011-04-09 10:46:52 -07:00
parent f7e239d728 8616f7a2e2
commit 98091b23f9
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Orchard.proj
-4
View File
@@ -281,10 +281,8 @@
$(StageFolder)\**\Modules\Orchard.Experimental\**; $(StageFolder)\**\Modules\Orchard.Experimental\**;
$(StageFolder)\**\Modules\Orchard.ImportExport\**; $(StageFolder)\**\Modules\Orchard.ImportExport\**;
$(StageFolder)\**\Modules\Orchard.Indexing\**; $(StageFolder)\**\Modules\Orchard.Indexing\**;
$(StageFolder)\**\Modules\Orchard.MediaPicker\**;
$(StageFolder)\**\Modules\Orchard.Migrations\**; $(StageFolder)\**\Modules\Orchard.Migrations\**;
$(StageFolder)\**\Modules\Orchard.MultiTenancy\**; $(StageFolder)\**\Modules\Orchard.MultiTenancy\**;
$(StageFolder)\**\Modules\Orchard.Recipes\**;
$(StageFolder)\**\Modules\Orchard.Scripting.Dlr\**; $(StageFolder)\**\Modules\Orchard.Scripting.Dlr\**;
$(StageFolder)\**\Modules\Orchard.Search\**; $(StageFolder)\**\Modules\Orchard.Search\**;
$(StageFolder)\**\Modules\Orchard.Warmup\**; $(StageFolder)\**\Modules\Orchard.Warmup\**;
@@ -385,10 +383,8 @@
<Exec Command="&quot;$(GalleryFolder)\bin\Orchard.exe&quot; package create Orchard.Experimental &quot;$(GalleryArtifactFolder)&quot;" WorkingDirectory="$(GalleryFolder)"/> <Exec Command="&quot;$(GalleryFolder)\bin\Orchard.exe&quot; package create Orchard.Experimental &quot;$(GalleryArtifactFolder)&quot;" WorkingDirectory="$(GalleryFolder)"/>
<Exec Command="&quot;$(GalleryFolder)\bin\Orchard.exe&quot; package create Orchard.ImportExport &quot;$(GalleryArtifactFolder)&quot;" WorkingDirectory="$(GalleryFolder)"/> <Exec Command="&quot;$(GalleryFolder)\bin\Orchard.exe&quot; package create Orchard.ImportExport &quot;$(GalleryArtifactFolder)&quot;" WorkingDirectory="$(GalleryFolder)"/>
<Exec Command="&quot;$(GalleryFolder)\bin\Orchard.exe&quot; package create Orchard.Indexing &quot;$(GalleryArtifactFolder)&quot;" WorkingDirectory="$(GalleryFolder)"/> <Exec Command="&quot;$(GalleryFolder)\bin\Orchard.exe&quot; package create Orchard.Indexing &quot;$(GalleryArtifactFolder)&quot;" WorkingDirectory="$(GalleryFolder)"/>
<Exec Command="&quot;$(GalleryFolder)\bin\Orchard.exe&quot; package create Orchard.MediaPicker &quot;$(GalleryArtifactFolder)&quot;" WorkingDirectory="$(GalleryFolder)"/>
<Exec Command="&quot;$(GalleryFolder)\bin\Orchard.exe&quot; package create Orchard.Migrations &quot;$(GalleryArtifactFolder)&quot;" WorkingDirectory="$(GalleryFolder)"/> <Exec Command="&quot;$(GalleryFolder)\bin\Orchard.exe&quot; package create Orchard.Migrations &quot;$(GalleryArtifactFolder)&quot;" WorkingDirectory="$(GalleryFolder)"/>
<Exec Command="&quot;$(GalleryFolder)\bin\Orchard.exe&quot; package create Orchard.MultiTenancy &quot;$(GalleryArtifactFolder)&quot;" WorkingDirectory="$(GalleryFolder)"/> <Exec Command="&quot;$(GalleryFolder)\bin\Orchard.exe&quot; package create Orchard.MultiTenancy &quot;$(GalleryArtifactFolder)&quot;" WorkingDirectory="$(GalleryFolder)"/>
<Exec Command="&quot;$(GalleryFolder)\bin\Orchard.exe&quot; package create Orchard.Recipes &quot;$(GalleryArtifactFolder)&quot;" WorkingDirectory="$(GalleryFolder)"/>
<Exec Command="&quot;$(GalleryFolder)\bin\Orchard.exe&quot; package create Orchard.Scripting.Dlr &quot;$(GalleryArtifactFolder)&quot;" WorkingDirectory="$(GalleryFolder)"/> <Exec Command="&quot;$(GalleryFolder)\bin\Orchard.exe&quot; package create Orchard.Scripting.Dlr &quot;$(GalleryArtifactFolder)&quot;" WorkingDirectory="$(GalleryFolder)"/>
<Exec Command="&quot;$(GalleryFolder)\bin\Orchard.exe&quot; package create Orchard.Search &quot;$(GalleryArtifactFolder)&quot;" WorkingDirectory="$(GalleryFolder)"/> <Exec Command="&quot;$(GalleryFolder)\bin\Orchard.exe&quot; package create Orchard.Search &quot;$(GalleryArtifactFolder)&quot;" WorkingDirectory="$(GalleryFolder)"/>
<Exec Command="&quot;$(GalleryFolder)\bin\Orchard.exe&quot; package create Orchard.Warmup &quot;$(GalleryArtifactFolder)&quot;" WorkingDirectory="$(GalleryFolder)"/> <Exec Command="&quot;$(GalleryFolder)\bin\Orchard.exe&quot; package create Orchard.Warmup &quot;$(GalleryArtifactFolder)&quot;" WorkingDirectory="$(GalleryFolder)"/>
src/Orchard.Web/Modules/Orchard.Media/Services/MediaService.cs
+2 -2
View File
@@ -64,7 +64,7 @@ namespace Orchard.Media.Services {
Size = folder.GetSize(), Size = folder.GetSize(),
LastUpdated = folder.GetLastUpdated(), LastUpdated = folder.GetLastUpdated(),
MediaPath = folder.GetPath() MediaPath = folder.GetPath()
}).Where(f => !f.Name.Equals("RecipeJournal", StringComparison.OrdinalIgnoreCase)); }).Where(f => !f.Name.Equals("RecipeJournal", StringComparison.OrdinalIgnoreCase)).ToList();
} }
/// <summary> /// <summary>
@@ -80,7 +80,7 @@ namespace Orchard.Media.Services {
LastUpdated = file.GetLastUpdated(), LastUpdated = file.GetLastUpdated(),
Type = file.GetFileType(), Type = file.GetFileType(),
FolderName = relativePath FolderName = relativePath
}); }).ToList();
} }
/// <summary> /// <summary>