Merge branch 'master' into 1.x

2025-10-08 00:14:31 +08:00 · 2013-08-05 16:07:14 -07:00
parent b7aa1cb2f3 5e0c26f73c
commit ace100d40f
8 changed files with 217 additions and 75 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,182 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+
+[Dd]ebug/
+[Rr]elease/
+x64/
+build/
+[Bb]in/
+[Oo]bj/
+
+# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
+!packages/*/build/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.log
+*.scc
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+*.ncrunch*
+.*crunch*.local.xml
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.Publish.xml
+*.pubxml
+
+# NuGet Packages Directory
+## TODO: If you have NuGet Package Restore enabled, uncomment the next line
+packages/
+
+# Windows Azure Build Output
+csx
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Others
+sql/
+*.Cache
+ClientBin/
+[Ss]tyle[Cc]op.*
+~$*
+*~
+*.dbmdl
+*.[Pp]ublish.xml
+*.pfx
+*.publishsettings
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+App_Data/*.mdf
+App_Data/*.ldf
+
+# =========================
+# Windows detritus
+# =========================
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Mac crap
+.DS_Store
+
+# =========================
+# Orchard specifics
+# =========================
+
+App_Data/
+glob:*.user
+*.patch
+*.hg
+build/
+/buildazure
+/buildtasks
+/artifacts
+*.sln.cache
+src/Orchard.Web/Media/*
+log.xml
+profiling/
+*.orig
+src/Orchard.Web/Modules-temp/*
+src/Backup/*
+src/packages/*
+src/UpgradeLog.*
+*.itrace.csdef
+*.build.csdef
+src/Orchard.Azure/Orchard.Azure.Web/Core/
+src/Orchard.Azure/Orchard.Azure.Web/Modules/
+src/Orchard.Azure/Orchard.Azure.Web/Themes/
+src/Orchard.Azure/Orchard.Azure.CloudService/csx/Debug/*
+src/Orchard.Web/Orchard.Web.Publish.xml
+src/TestResults/*
+src/Orchard.Web/Properties/PublishProfiles
--- a/.hgignore
+++ b/.hgignore
@@ -1,36 +0,0 @@
-glob:bin
-glob:Bin
-glob:obj
-glob:App_Data
-glob:_ReSharper*
-glob:*.user
-glob:*.patch
-glob:*.hg
-glob:build
-glob:buildazure
-glob:buildtasks
-glob:artifacts
-glob:*.sln.cache
-glob:src/Orchard.Web/Media/*
-glob:desktop.ini
-glob:log.xml
-glob:profiling
-glob:*.ReSharper
-glob:*.orig
-glob:*.suo
-glob:src/Orchard.Web/Modules-temp/*
-glob:src/Backup/*
-glob:src/packages/*
-glob:src/UpgradeLog.*
-glob:*.itrace.csdef
-glob:*.build.csdef
-glob:src/Orchard.Azure/Orchard.Azure.Web/Core
-glob:src/Orchard.Azure/Orchard.Azure.Web/Modules
-glob:src/Orchard.Azure/Orchard.Azure.Web/Themes
-glob:src/Orchard.Azure/Orchard.Azure.CloudService/csx/Debug/*
-syntax: glob
-src/Orchard.Web/Orchard.Web.Publish.xml
-glob:src/TestResults/*
-glob:TestResults.xml
-*/TestResults/*
-glob:src/Orchard.Web/Properties/PublishProfiles
--- a/.hgtags
+++ b/.hgtags
@@ -1,30 +0,0 @@
-e048b594f33613d53b59a3578d17511dc833ecb5 MIX10
-a6b8d094848d4efee67c787e52e5f7d358e3f0c1 0.5
-48d6ca62955335ce6a51859d5fab43b3b48d1911 0.8
-0ffac89fcc3013edf7283f6ebd761ee967368e77 perf first pass
-48d6ca62955335ce6a51859d5fab43b3b48d1911 0.8
-0000000000000000000000000000000000000000 0.8
-0000000000000000000000000000000000000000 0.8
-083d09cd94a7c9175272fba453a156673be9db78 0.8
-523f3564d2c053ff068970eab8c64eaf74e3dcec perf baseline
-d2cca954cbf94750946a6325e5ec23e267430bd2 perf snapshot 1
-83536b451ffe01a2d94867894f2b284cea2e68aa 1.0
-83536b451ffe01a2d94867894f2b284cea2e68aa 1.0
-5cc01ad95f11fcd241163685effaf01ef4b6cb02 1.0
-5cc01ad95f11fcd241163685effaf01ef4b6cb02 1.0
-16f874f7c4f38ed92ec2e40bd5a9cc7b1ee87407 1.0
-6d7b973415c94482a417ba025a4c823d5c2d6630 1.1
-6d7b973415c94482a417ba025a4c823d5c2d6630 1.1
-48aedbdcebb174eb37534df9c7401fa35da22bbd 1.1
-48aedbdcebb174eb37534df9c7401fa35da22bbd 1.1
-97186e9f4536562febcdecf3da481231d375b0c7 1.1
-e1ec47d08d85c6da922fc6fe74bb663264fd20fc 1.2
-e1ec47d08d85c6da922fc6fe74bb663264fd20fc 1.2
-2ca8b2e7914c82faa4e05eb11a99a21feded85a0 1.2
-8732e2734cd26dca85c2018726a039771b6431b5 1.3
-0b91d3e737b82a6ddfe872446e25848ae531fc40 1.4
-0b91d3e737b82a6ddfe872446e25848ae531fc40 1.4
-cfc1cec81fee0b1e1016bf27b5775467eb250839 1.4
-8ed0034d0b454586ed6943a5099f6a91934c4330 1.4.1
-4ec7a156eaff54961491422d1001a8e21bf119e6 1.6-rc
-f9b5789dac27dc9b63c1914e7cb31efae3ed2820 1.6
--- a/CREDITS.txt
+++ b/CREDITS.txt
@@ -51,6 +51,12 @@ Website:      http://codemirror.net/2/
 Copyright:    Copyright (C) 2011 by Marijn Haverbeke
 License:      MIT

+Console Shim
+-----
+Website:      https://github.com/kayahr/console-shim
+Copyright:    Copyright (C) 2011 Klaus Reimer <k@ailis.de>
+License:      MIT
+
 DLR
 ---
 Website:      http://dlr.codeplex.com
--- a/Orchard.proj
+++ b/Orchard.proj
@@ -274,9 +274,9 @@

 		<!-- disable all file monitoring but ExtensionMonitoringCorrdinator to detect new modules/themes -->
    <XmlUpdate XmlFileName="$(StageFolder)\Config\HostComponents.config"
-      XPath="/HostComponents/Components/Component/Properties/Property[@Name='DisableMonitoring']/@Value"
+      XPath="/HostComponents/Components/Component[@Type != 'Orchard.Environment.Extensions.Folders.ExtensionHarvester']/Properties/Property[@Name='DisableMonitoring']/@Value"
      Value="true" />
-    
+
    <!-- move over extra non-content files the csproj referenced -->
    <Copy SourceFiles="@(StageProjectAlteration-ExtraFiles->'$(SrcFolder)\Orchard.Web\%(Identity)')"
        DestinationFolder="$(StageFolder)\%(RecursiveDir)"/>
--- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Scripts/history.js
+++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Scripts/history.js
--- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Admin/Index.cshtml
@@ -107,7 +107,7 @@
        //<![CDATA[
 
        $(function () {
-            
+
            function MediaPartViewModel(data) {
                var self = this;
                
@@ -246,12 +246,12 @@
                };

                self.selectFolder = function (folderPath) {
-                    window.history.pushState({ action: 'displayFolder', folderPath: folderPath }, '', '?folderPath=' + folderPath);
+                    History.pushState({ action: 'displayFolder', folderPath: folderPath }, '', '?folderPath=' + folderPath);
                    self.displayFolder(folderPath);
                };

                self.selectRecent = function () {
-                    window.history.pushState({ action: 'selectRecent' }, '', '?recent');
+                    History.pushState({ action: 'selectRecent' }, '', '?recent');
                    
                    self.results([]);
                    self.displayed(null);
@@ -363,13 +363,13 @@
            @if (viewModel.FolderPath != null) {
            <text>
            viewModel.displayFolder('@HttpUtility.JavaScriptStringEncode(viewModel.FolderPath)');
-            window.history.pushState({ action: 'displayFolder', folderPath: '@HttpUtility.JavaScriptStringEncode(viewModel.FolderPath)' }, '', '?folderPath=@HttpUtility.UrlEncode(viewModel.FolderPath)');
+            History.pushState({ action: 'displayFolder', folderPath: '@HttpUtility.JavaScriptStringEncode(viewModel.FolderPath)' }, '', '?folderPath=@HttpUtility.UrlEncode(viewModel.FolderPath)');
            </text>
            }
            else {
                <text>
                viewModel.selectRecent();
-                window.history.pushState({ action: 'selectRecent' }, '', '?recent');
+                History.pushState({ action: 'selectRecent' }, '', '?recent');
                </text>
            }
            
--- a/src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js
+++ b/src/Orchard.Web/Themes/TheAdmin/Scripts/admin.js
@@ -70,4 +70,24 @@

        return confirm(confirmRemoveMessage);
    });
-})(jQuery);
+})(jQuery);
+
+
+/*
+ console-shim 1.0.2
+ https://github.com/kayahr/console-shim
+ Copyright (C) 2011 Klaus Reimer <k@ailis.de>
+ Licensed under the MIT license
+ (See http://www.opensource.org/licenses/mit-license)
+*/
+function f() { return function () { } }
+(function () {
+    function c(a, l, b) { var c = Array.prototype.slice.call(arguments, 2); return function () { var b = c.concat(Array.prototype.slice.call(arguments, 0)); a.apply(l, b) } } window.console || (window.console = {}); var a = window.console; if (!a.log) if (window.log4javascript) { var b = log4javascript.getDefaultLogger(); a.log = c(b.info, b); a.debug = c(b.debug, b); a.info = c(b.info, b); a.warn = c(b.warn, b); a.error = c(b.error, b) } else a.log = f(); a.debug || (a.debug = a.log); a.info || (a.info = a.log); a.warn || (a.warn = a.log); a.error || (a.error = a.log);
+    if (null != window.__consoleShimTest__ || eval("/*@cc_on @_jscript_version \x3c\x3d 9@*/")) b = function (d) { var b, e, c; d = Array.prototype.slice.call(arguments, 0); c = d.shift(); e = d.length; if (1 < e && !1 !== window.__consoleShimTest__) { "string" != typeof d[0] && (d.unshift("%o"), e += 1); for (b = (b = d[0].match(/%[a-z]/g)) ? b.length + 1 : 1; b < e; b += 1) d[0] += " %o" } Function.apply.call(c, a, d) }, a.log = c(b, window, a.log), a.debug = c(b, window, a.debug), a.info = c(b, window, a.info), a.warn = c(b, window, a.warn), a.error = c(b, window, a.error); a.assert || (a.assert =
+    function () { var d = Array.prototype.slice.call(arguments, 0); d.shift() || (d[0] = "Assertion failed: " + d[0], a.error.apply(a, d)) }); a.dir || (a.dir = a.log); a.dirxml || (a.dirxml = a.log); a.exception || (a.exception = a.error); if (!a.time || !a.timeEnd) { var g = {}; a.time = function (a) { g[a] = (new Date).getTime() }; a.timeEnd = function (b) { var c = g[b]; c && (a.log(b + ": " + ((new Date).getTime() - c) + "ms"), delete g[b]) } } a.table || (a.table = function (b, c) {
+        var e, g, j, h, k; if (b && b instanceof Array && b.length) {
+            if (!c || !(c instanceof Array)) for (e in c =
+            [], b[0]) b[0].hasOwnProperty(e) && c.push(e); e = 0; for (g = b.length; e < g; e += 1) { j = []; h = 0; for (k = c.length; h < k; h += 1) j.push(b[e][c[h]]); Function.apply.call(a.log, a, j) }
+        }
+    }); a.clear || (a.clear = f()); a.trace || (a.trace = f()); a.group || (a.group = f()); a.groupCollapsed || (a.groupCollapsed = f()); a.groupEnd || (a.groupEnd = f()); a.timeStamp || (a.timeStamp = f()); a.profile || (a.profile = f()); a.profileEnd || (a.profileEnd = f()); a.count || (a.count = f())
+})();