diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e318b158..df803808f 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ The attributions below are for work that has been incorporated into the script a The links to individual versions below are to copies of the script with the update URL removed. If you want automatic updates, install the script from the links on the [main page](https://github.com/ccd0/4chan-x). +### v1.9.17.8 +*2014-12-25* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.17.8/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.17.8/builds/4chan-X-noupdate.crx "Chromium version")] + +**ccd0** +- Revert redirect from the native catalog to the 4chan X catalog for now. + ### v1.9.17.7 *2014-12-25* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.17.7/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.17.7/builds/4chan-X-noupdate.crx "Chromium version")] diff --git a/LICENSE b/LICENSE index 30460fc20..de599af46 100755 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* 4chan X - Version 1.9.17.7 +* 4chan X - Version 1.9.17.8 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index 7fd76ee30..b5caa03ca 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 ea73f0b13..739e2a976 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.9.17.7 +// @version 1.9.17.8 // @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 b1854afdc..0cea42417 100644 --- a/builds/4chan-X-beta.user.js +++ b/builds/4chan-X-beta.user.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript // ==UserScript== // @name 4chan X beta -// @version 1.9.17.7 +// @version 1.9.17.8 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -25,7 +25,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.9.17.7 +* 4chan X - Version 1.9.17.8 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -393,7 +393,7 @@ doc = d.documentElement; g = { - VERSION: '1.9.17.7', + VERSION: '1.9.17.8', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -15279,10 +15279,6 @@ }); return; } - if (Conf['JSON Navigation'] && Conf['Use 4chan X Catalog'] && g.VIEW === 'catalog') { - location.replace("//boards.4chan.org/" + g.BOARD + "#catalog"); - return; - } if (Conf['Normalize URL'] && g.VIEW === 'thread') { pathname = location.pathname.split('/'); if (pathname[2] !== 'thread' || pathname.length > 4) { diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index 146ff28a6..17b14b48c 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 56403cdfd..0f81c8c15 100644 --- a/builds/4chan-X-noupdate.user.js +++ b/builds/4chan-X-noupdate.user.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript // ==UserScript== // @name 4chan X -// @version 1.9.17.7 +// @version 1.9.17.8 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -24,7 +24,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.9.17.7 +* 4chan X - Version 1.9.17.8 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -392,7 +392,7 @@ doc = d.documentElement; g = { - VERSION: '1.9.17.7', + VERSION: '1.9.17.8', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -15278,10 +15278,6 @@ }); return; } - if (Conf['JSON Navigation'] && Conf['Use 4chan X Catalog'] && g.VIEW === 'catalog') { - location.replace("//boards.4chan.org/" + g.BOARD + "#catalog"); - return; - } if (Conf['Normalize URL'] && g.VIEW === 'thread') { pathname = location.pathname.split('/'); if (pathname[2] !== 'thread' || pathname.length > 4) { diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index e49e6f19b..4be938a51 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 285d43e67..2bfdb3b9e 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.9.17.7 +// @version 1.9.17.8 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 4817273a3..92a78de5f 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript // ==UserScript== // @name 4chan X -// @version 1.9.17.7 +// @version 1.9.17.8 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -25,7 +25,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.9.17.7 +* 4chan X - Version 1.9.17.8 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -393,7 +393,7 @@ doc = d.documentElement; g = { - VERSION: '1.9.17.7', + VERSION: '1.9.17.8', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -15279,10 +15279,6 @@ }); return; } - if (Conf['JSON Navigation'] && Conf['Use 4chan X Catalog'] && g.VIEW === 'catalog') { - location.replace("//boards.4chan.org/" + g.BOARD + "#catalog"); - return; - } if (Conf['Normalize URL'] && g.VIEW === 'thread') { pathname = location.pathname.split('/'); if (pathname[2] !== 'thread' || pathname.length > 4) { diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index 0a029d8c1..9b0e2b5c9 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 f42aef725..9b88c12a4 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 8b6a1bd49..75dd7181e 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/package.json b/package.json index 0f42b5f28..4ef46171d 100755 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "description": "Cross-browser userscript for maximum lurking on 4chan.", "meta": { "name": "4chan X", - "version": "1.9.17.7", + "version": "1.9.17.8", "repo": "https://github.com/ccd0/4chan-x/", "page": "https://github.com/ccd0/4chan-x", "downloads": "https://ccd0.github.io/4chan-x/builds/",