diff --git a/CHANGELOG.md b/CHANGELOG.md index e3efc7f5c..f75caeb5b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's wor ### v1.11.34 +**v1.11.34.6** *(2016-05-21)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.34.6/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.34.6/builds/4chan-X-noupdate.crx "Chromium version")] +- Merge v1.11.33.6: Quick fix for blinking. + **v1.11.34.5** *(2016-05-19)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.34.5/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.34.5/builds/4chan-X-noupdate.crx "Chromium version")] - Merge v1.11.33.5: Update ad server blacklist. - Change link on report form to 4chan IRC. diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index 6741bd8fd..923303ec6 100644 Binary files a/builds/4chan-X-beta.crx and b/builds/4chan-X-beta.crx differ diff --git a/builds/4chan-X-beta.meta.js b/builds/4chan-X-beta.meta.js index b286ab074..a3675abce 100644 --- a/builds/4chan-X-beta.meta.js +++ b/builds/4chan-X-beta.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X beta -// @version 1.11.34.5 +// @version 1.11.34.6 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X-beta.user.js b/builds/4chan-X-beta.user.js index 0ad1e26d1..e62767153 100644 --- a/builds/4chan-X-beta.user.js +++ b/builds/4chan-X-beta.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X beta -// @version 1.11.34.5 +// @version 1.11.34.6 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -134,7 +134,7 @@ docSet = function() { }; g = { - VERSION: '1.11.34.5', + VERSION: '1.11.34.6', NAMESPACE: '4chan X.', boards: {} }; @@ -1299,6 +1299,9 @@ boards: "body > div[style*=\" top: -10000px;\"] {\n" + " visibility: hidden !important;\n" + "}\n" + +".blink {\n" + +" animation: none !important;\n" + +"}\n" + "/* Ads */\n" + ":root:not(.ads-loaded) .ad-cnt,\n" + ":root:not(.ads-loaded) .ad-plea,\n" + diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index 585693279..0c4830f66 100644 Binary files a/builds/4chan-X-noupdate.crx and b/builds/4chan-X-noupdate.crx differ diff --git a/builds/4chan-X-noupdate.user.js b/builds/4chan-X-noupdate.user.js index 2355ae596..48fbe094e 100644 --- a/builds/4chan-X-noupdate.user.js +++ b/builds/4chan-X-noupdate.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.11.34.5 +// @version 1.11.34.6 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -134,7 +134,7 @@ docSet = function() { }; g = { - VERSION: '1.11.34.5', + VERSION: '1.11.34.6', NAMESPACE: '4chan X.', boards: {} }; @@ -1299,6 +1299,9 @@ boards: "body > div[style*=\" top: -10000px;\"] {\n" + " visibility: hidden !important;\n" + "}\n" + +".blink {\n" + +" animation: none !important;\n" + +"}\n" + "/* Ads */\n" + ":root:not(.ads-loaded) .ad-cnt,\n" + ":root:not(.ads-loaded) .ad-plea,\n" + diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index f1932b45c..4d1576ece 100644 Binary files a/builds/4chan-X.crx and b/builds/4chan-X.crx differ diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js index b3abc4a38..fa44e3c59 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.11.34.5 +// @version 1.11.34.6 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 2d76e2d9c..f0bad2138 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.11.34.5 +// @version 1.11.34.6 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -134,7 +134,7 @@ docSet = function() { }; g = { - VERSION: '1.11.34.5', + VERSION: '1.11.34.6', NAMESPACE: '4chan X.', boards: {} }; @@ -1299,6 +1299,9 @@ boards: "body > div[style*=\" top: -10000px;\"] {\n" + " visibility: hidden !important;\n" + "}\n" + +".blink {\n" + +" animation: none !important;\n" + +"}\n" + "/* Ads */\n" + ":root:not(.ads-loaded) .ad-cnt,\n" + ":root:not(.ads-loaded) .ad-plea,\n" + diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index af039768f..f164e9266 100644 Binary files a/builds/4chan-X.zip and b/builds/4chan-X.zip differ diff --git a/builds/updates-beta.xml b/builds/updates-beta.xml index 42620c1ce..99f3c672d 100644 --- a/builds/updates-beta.xml +++ b/builds/updates-beta.xml @@ -1,7 +1,7 @@ - + diff --git a/builds/updates.xml b/builds/updates.xml index c22cba898..48084f9d6 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/version.json b/version.json index 8467d439b..82ce8459d 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "version": "1.11.34.5", - "date": "2016-05-19T22:53:27.414Z" + "version": "1.11.34.6", + "date": "2016-05-21T17:42:22.761Z" } \ No newline at end of file