From e29c89362635e7900e9f2ea67065cd0279237092 Mon Sep 17 00:00:00 2001 From: User Date: Wed, 8 Nov 2017 07:14:19 -0700 Subject: [PATCH 1/2] fix for OUJS OUJS has made a change recently to require SPDX codes for OSI approved licensing. These changes are syntactically equivalent. Until this change is made you will be unable to update those affected scripts. I'm not entirely sure if this is all of the ones posted on OUJS. So please make sure. Thanks, OUJS Staff --- BingBgForBaidu/BingBgForBaidu.user.js | 4 ++-- DownloadAllContent/DownloadAllContent.user.js | 4 ++-- Easy offline/Easy offline.user.js | 4 ++-- HacgGodTurn/HacgGodTurn.user.js | 4 ++-- Highlight Every Code/Highlight Every Code.user.js | 4 ++-- Invite Code Tool/Invite Code Tool.user.js | 4 ++-- Kill Baidu AD/Kill Baidu AD.user.js | 4 ++-- Kill TieBa AD/Kill TieBa AD.user.js | 4 ++-- Mouse Gestures/Mouse Gestures.user.js | 4 ++-- True URL downloads/True URL downloads.user.js | 4 ++-- VIP Video Cracker/VIP Video Cracker.user.js | 4 ++-- Valentine's Day/Valentine's Day.user.js | 6 +++--- 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/BingBgForBaidu/BingBgForBaidu.user.js b/BingBgForBaidu/BingBgForBaidu.user.js index 3cecacc3dce..dd57e702783 100644 --- a/BingBgForBaidu/BingBgForBaidu.user.js +++ b/BingBgForBaidu/BingBgForBaidu.user.js @@ -13,7 +13,7 @@ // @grant unsafeWindow // @connect global.bing.com // @connect cn.bing.com -// @license MIT License +// @license MIT // @include *://www.baidu.com/ // @include *://www.baidu.com/home* // @include *://www.baidu.com/?tn=* @@ -153,4 +153,4 @@ } } }); -})(); \ No newline at end of file +})(); diff --git a/DownloadAllContent/DownloadAllContent.user.js b/DownloadAllContent/DownloadAllContent.user.js index 13f6275fc88..98c6aa3ee88 100644 --- a/DownloadAllContent/DownloadAllContent.user.js +++ b/DownloadAllContent/DownloadAllContent.user.js @@ -16,7 +16,7 @@ // @grant GM_setValue // @grant GM_getValue // @require https://cdnjs.cloudflare.com/ajax/libs/FileSaver.js/1.3.3/FileSaver.min.js -// @license MIT License +// @license MIT // @compatible chrome // @compatible firefox // @compatible opera 未测试 @@ -283,4 +283,4 @@ } GM_registerMenuCommand(i18n.fetch, fetch); GM_registerMenuCommand(i18n.setting, setDel); -})(); \ No newline at end of file +})(); diff --git a/Easy offline/Easy offline.user.js b/Easy offline/Easy offline.user.js index 246dfb27230..1abf7ba7bb8 100644 --- a/Easy offline/Easy offline.user.js +++ b/Easy offline/Easy offline.user.js @@ -22,7 +22,7 @@ // @grant GM_deleteValue // @grant unsafeWindow // @supportURL http://www.hoothin.com -// @license MIT License +// @license MIT // @compatible chrome // @compatible firefox // @contributionURL https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=rixixi@sina.com&item_name=Greasy+Fork+donation @@ -794,4 +794,4 @@ } }); GM_registerMenuCommand(i18n.configure, goSetting); -})(); \ No newline at end of file +})(); diff --git a/HacgGodTurn/HacgGodTurn.user.js b/HacgGodTurn/HacgGodTurn.user.js index b9e27b3d1bc..f945c879e1b 100644 --- a/HacgGodTurn/HacgGodTurn.user.js +++ b/HacgGodTurn/HacgGodTurn.user.js @@ -101,7 +101,7 @@ // @require https://cdn.jsdelivr.net/crypto-js/3.1.2/rollups/aes.js // @updateURL https://greasyfork.org/scripts/23316/code/HacgGodTurn.user.js // @downloadURL https://greasyfork.org/scripts/23316/code/HacgGodTurn.user.js -// @license MIT License +// @license MIT // @connect tts.baidu.com // @compatible chrome // @compatible firefox @@ -1555,4 +1555,4 @@ GM_notification(notificationDetails); } } -})(); \ No newline at end of file +})(); diff --git a/Highlight Every Code/Highlight Every Code.user.js b/Highlight Every Code/Highlight Every Code.user.js index 0ca20adad4d..103e4f5e33f 100644 --- a/Highlight Every Code/Highlight Every Code.user.js +++ b/Highlight Every Code/Highlight Every Code.user.js @@ -11,7 +11,7 @@ // @grant GM_openInTab // @compatible chrome // @compatible firefox -// @license MIT License +// @license MIT // @contributionURL https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=rixixi@sina.com&item_name=Greasy+Fork+donation // @contributionAmount 1 // @include * @@ -89,4 +89,4 @@ var y = (e.pageY || e.clientY) - scrollY; return { 'x': x, 'y': y }; } -})(); \ No newline at end of file +})(); diff --git a/Invite Code Tool/Invite Code Tool.user.js b/Invite Code Tool/Invite Code Tool.user.js index d71fdb7412f..8c363526274 100644 --- a/Invite Code Tool/Invite Code Tool.user.js +++ b/Invite Code Tool/Invite Code Tool.user.js @@ -17,7 +17,7 @@ // @grant GM_getValue // @grant GM_deleteValue // @grant unsafeWindow -// @license MIT License +// @license MIT // @compatible chrome // @compatible firefox // ==/UserScript== @@ -137,4 +137,4 @@ } } } -})(); \ No newline at end of file +})(); diff --git a/Kill Baidu AD/Kill Baidu AD.user.js b/Kill Baidu AD/Kill Baidu AD.user.js index d06c5dd5e72..fddbf90990a 100644 --- a/Kill Baidu AD/Kill Baidu AD.user.js +++ b/Kill Baidu AD/Kill Baidu AD.user.js @@ -10,7 +10,7 @@ // @include http*://m.baidu.com/* // @grant none // @run-at document-start -// @license MIT License +// @license MIT // @compatible chrome 测试通过 // @compatible firefox 测试通过 // @compatible opera 未测试 @@ -69,4 +69,4 @@ } } setTimeout(()=>{clearAD();},2000); -})(); \ No newline at end of file +})(); diff --git a/Kill TieBa AD/Kill TieBa AD.user.js b/Kill TieBa AD/Kill TieBa AD.user.js index 0f50fddde70..883c6d75d34 100644 --- a/Kill TieBa AD/Kill TieBa AD.user.js +++ b/Kill TieBa AD/Kill TieBa AD.user.js @@ -14,7 +14,7 @@ // @grant none // @run-at document-body // @supportURL http://www.hoothin.com -// @license MIT License +// @license MIT // @compatible chrome // @compatible firefox // @contributionURL https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=rixixi@sina.com&item_name=Greasy+Fork+donation @@ -114,4 +114,4 @@ } } } -})(); \ No newline at end of file +})(); diff --git a/Mouse Gestures/Mouse Gestures.user.js b/Mouse Gestures/Mouse Gestures.user.js index 67b116a745c..c50018289cb 100644 --- a/Mouse Gestures/Mouse Gestures.user.js +++ b/Mouse Gestures/Mouse Gestures.user.js @@ -15,7 +15,7 @@ // @grant GM_registerMenuCommand // @grant unsafeWindow // @grant GM_info -// @license MIT License +// @license MIT // @compatible chrome // @compatible firefox // ==/UserScript== @@ -309,4 +309,4 @@ function initEventListener(start,move,end,tracer,clientX,clientY,startBool){ GM_openInTab("https://github.com/hoothin/UserScripts/tree/master/Mouse%20Gestures", false); } GM_registerMenuCommand(i18n.configure, goSetting); -})(); \ No newline at end of file +})(); diff --git a/True URL downloads/True URL downloads.user.js b/True URL downloads/True URL downloads.user.js index 0303f08ad08..08113c8851d 100644 --- a/True URL downloads/True URL downloads.user.js +++ b/True URL downloads/True URL downloads.user.js @@ -18,7 +18,7 @@ // @copyright 2013+, Yulei, Hoothin // @grant GM_registerMenuCommand // @grant GM_setClipboard -// @license MIT License +// @license MIT // @require https://cdn.jsdelivr.net/jquery/1.7.2/jquery.min.js // @require https://greasyfork.org/scripts/26615-managerlinks/code/managerLinks.js?version=186539 // @contributionURL https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=rixixi@sina.com&item_name=Greasy+Fork+donation @@ -311,4 +311,4 @@ /* （支持：Opera12；及所有浏览器，如Firefox、Chromes、IE、Safari） * 解码下载地址，并显示真实的下载地址，回显原(初)始链接，如迅雷、快车、QQ旋风的加密下载地址 * 本脚本只作学习研究参考用，版权所有 不得滥用、商用、它用，后果自负 - */ \ No newline at end of file + */ diff --git a/VIP Video Cracker/VIP Video Cracker.user.js b/VIP Video Cracker/VIP Video Cracker.user.js index ad5974dfab0..45f3f9f6830 100644 --- a/VIP Video Cracker/VIP Video Cracker.user.js +++ b/VIP Video Cracker/VIP Video Cracker.user.js @@ -38,7 +38,7 @@ // @grant GM_openInTab // @grant unsafeWindow // @grant GM_xmlhttpRequest -// @license MIT License +// @license MIT // @connect cache.video.qiyi.com // ==/UserScript== @@ -322,4 +322,4 @@ clearInterval(si); },20000); } -})(); \ No newline at end of file +})(); diff --git a/Valentine's Day/Valentine's Day.user.js b/Valentine's Day/Valentine's Day.user.js index c29d1ff7180..ffbedc6f1af 100644 --- a/Valentine's Day/Valentine's Day.user.js +++ b/Valentine's Day/Valentine's Day.user.js @@ -8,7 +8,7 @@ // @description:zh-CN 伪装成百度新闻的情人节惊喜 // @description:zh-TW 僞裝成百度新聞的情人節驚喜 // @author hoothin -// @license MIT License +// @license MIT // @include *://www.baidu.com/ // @include *://www.baidu.com/home* // @include *://www.baidu.com/?tn=* @@ -24,7 +24,7 @@ var valentinName="AAA"; //情人名字 var myName="BBB"; //自己名字 var time="2007 1 12"; //纪念日 - + var date=new Date(); var dateDay=date.getDate(),dateMonth=date.getMonth()+1; if(dateDay!=14||dateMonth!=2)return; @@ -94,4 +94,4 @@ listWrapper.insertBefore(valentineItem,listWrapper.firstChild); } } -})(); \ No newline at end of file +})(); From 98eb5dfecf17258da3f8a8b98594ebdd8eecb1c9 Mon Sep 17 00:00:00 2001 From: Martii Date: Wed, 8 Nov 2017 07:39:16 -0700 Subject: [PATCH 2/2] Related Plus I'm one of the Copyright holders --- Picviewer CE+/GM_config CN.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Picviewer CE+/GM_config CN.js b/Picviewer CE+/GM_config CN.js index 7393f14473d..8a92e667183 100644 --- a/Picviewer CE+/GM_config CN.js +++ b/Picviewer CE+/GM_config CN.js @@ -10,7 +10,7 @@ // @grant GM_getValue // @grant GM_setValue // @grant GM_deleteValue -// @license LGPL 3 +// @license LGPL-3.0+ // ==/UserScript== /*