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

Merge branch '1.7.x' into 1.x

Browse Source 
Conflicts:
	src/Orchard.Web/Modules/Orchard.AntiSpam/Drivers/ReCaptchaPartDriver.cs
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/AdminController.cs
	src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
This commit is contained in:
Sebastien Ros
2014-03-17 12:09:21 -07:00
parent da6a636247 115b8d79b7
commit db50a5aecb
53 changed files with 409 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Admin/Index.cshtml
View File

@@ -3,13 +3,13 @@
@{
var viewModel = Model;
Script.Require("ShapesBase");
Script.Require("ShapesBase").AtFoot();
Style.Require("MediaManagerAdmin");
Script.Require("jQuery");
Script.Require("jQueryUI_Droppable");
Script.Include("knockout-2.3.0.js");
Script.Include("history.js");
Script.Include("media-library.js");
Script.Require("jQuery").AtFoot();
Script.Require("jQueryUI_Droppable").AtFoot();
Script.Include("knockout-2.3.0.js").AtFoot();
Script.Include("history.js").AtFoot();
Script.Include("media-library.js").AtFoot();
Style.Require("FontAwesome");
Layout.Title = T("Media Library");