lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 21:01:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch '1.8.x' into 1.x

Browse Source
This commit is contained in:
Sebastien Ros 2014-04-22 16:40:33 -07:00
commit 485175dc96
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj
View File

@ -180,15 +180,15 @@
<Content Include="Scripts\lib\dash.all.js" />
<Content Include="Scripts\lib\dash.min.js" />
<Content Include="Scripts\lib\jquery.blockui.js" />
<TypeScriptCompile Include="Scripts\cloudmedia-admin-job.ts" />
<TypeScriptCompile Include="Scripts\cloudmedia-admin-common.ts" />
<TypeScriptCompile Include="Scripts\cloudmedia-autorefresh.ts" />
<TypeScriptCompile Include="Scripts\cloudmedia-edit-asset-video.ts" />
<TypeScriptCompile Include="Scripts\cloudmedia-edit-asset.ts" />
<TypeScriptCompile Include="Scripts\cloudmedia-edit-cloudvideopart-direct.ts" />
<TypeScriptCompile Include="Scripts\cloudmedia-edit-cloudvideopart.ts" />
<TypeScriptCompile Include="Scripts\cloudmedia-edit-cloudvideopart-proxied.ts" />
<TypeScriptCompile Include="Scripts\cloudmedia-metadata-cloudvideopart.ts" />
<None Include="Scripts\cloudmedia-admin-job.ts" />
<None Include="Scripts\cloudmedia-admin-common.ts" />
<None Include="Scripts\cloudmedia-autorefresh.ts" />
<None Include="Scripts\cloudmedia-edit-asset-video.ts" />
<None Include="Scripts\cloudmedia-edit-asset.ts" />
<None Include="Scripts\cloudmedia-edit-cloudvideopart-direct.ts" />
<None Include="Scripts\cloudmedia-edit-cloudvideopart.ts" />
<None Include="Scripts\cloudmedia-edit-cloudvideopart-proxied.ts" />
<None Include="Scripts\cloudmedia-metadata-cloudvideopart.ts" />
<Content Include="Scripts\lib\jquery.fileupload-process.js" />
<Content Include="Scripts\lib\jquery.fileupload-validate.js" />
<Content Include="Scripts\lib\jquery.fileupload.js" />
@ -279,13 +279,13 @@
<Content Include="Styles\Web.config" />
<Content Include="Properties\AssemblyInfo.cs" />
<Content Include="Module.txt" />
<TypeScriptCompile Include="Scripts\cloudmedia-videoplayer-data.ts" />
<TypeScriptCompile Include="Scripts\cloudmedia-videoplayer-injectors-dash.ts" />
<TypeScriptCompile Include="Scripts\cloudmedia-videoplayer-injectors-html5.ts" />
<TypeScriptCompile Include="Scripts\cloudmedia-videoplayer-injectors-alt.ts" />
<TypeScriptCompile Include="Scripts\cloudmedia-videoplayer-injectors-smp.ts" />
<TypeScriptCompile Include="Scripts\cloudmedia-videoplayer-injectors.ts" />
<TypeScriptCompile Include="Scripts\cloudmedia-videoplayer-main.ts" />
<None Include="Scripts\cloudmedia-videoplayer-data.ts" />
<None Include="Scripts\cloudmedia-videoplayer-injectors-dash.ts" />
<None Include="Scripts\cloudmedia-videoplayer-injectors-html5.ts" />
<None Include="Scripts\cloudmedia-videoplayer-injectors-alt.ts" />
<None Include="Scripts\cloudmedia-videoplayer-injectors-smp.ts" />
<None Include="Scripts\cloudmedia-videoplayer-injectors.ts" />
<None Include="Scripts\cloudmedia-videoplayer-main.ts" />
<TypeScriptCompile Include="Scripts\typings\moment.d.ts" />
<TypeScriptCompile Include="Scripts\typings\underscore.d.ts" />
<TypeScriptCompile Include="Scripts\typings\uri.d.ts" />
@ -445,7 +445,7 @@
<TypeScriptCompile Include="Scripts\typings\jquery.d.ts" />
<TypeScriptCompile Include="Scripts\typings\jqueryui.d.ts" />
<TypeScriptCompile Include="Scripts\typings\knockout.d.ts" />
<TypeScriptCompile Include="Scripts\cloudmedia-admin-settings.ts" />
<None Include="Scripts\cloudmedia-admin-settings.ts" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\CloudVideo.Edit.Assets.cshtml" />

4
src/Orchard.Web/Modules/Orchard.Blogs/Routing/RsdConstraint.CS
View File

@ -34,9 +34,9 @@ namespace Orchard.Blogs.Routing {
//routeValues.ContainsKey("area") &&
//routeValues["area"] == "Orchard.Blogs" &&
routeValues.ContainsKey("controller") &&
routeValues["area"] == "Blog" &&
routeValues["controller"] == "Blog" &&
routeValues.ContainsKey("action") &&
routeValues["area"] == "Item"
routeValues["action"] == "Item"
;
}