diff --git a/CHANGELOG.md b/CHANGELOG.md index a5cc6f238..15a238e58 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.19.2 +*2015-01-04* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.19.2/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.19.2/builds/4chan-X-noupdate.crx "Chromium version")] + +**ccd0** +- Merge v1.9.18.8: Revert temporarily hard-enabling captcha on /b/; not necessary. + ### v1.9.19.1 *2015-01-03* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.19.1/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.19.1/builds/4chan-X-noupdate.crx "Chromium version")] diff --git a/LICENSE b/LICENSE index 52e0d2cf3..f371691f6 100755 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* 4chan X - Version 1.9.19.1 +* 4chan X - Version 1.9.19.2 * * 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 3eee0c277..c7cd9d30f 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 cac7a8e13..7cbfe18b2 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.19.1 +// @version 1.9.19.2 // @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 d3faad986..32aab6b5e 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.19.1 +// @version 1.9.19.2 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -25,7 +25,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.9.19.1 +* 4chan X - Version 1.9.19.2 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -395,7 +395,7 @@ doc = d.documentElement; g = { - VERSION: '1.9.19.1', + VERSION: '1.9.19.2', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -7561,7 +7561,7 @@ if (d.cookie.indexOf('pass_enabled=1') >= 0) { return; } - if (!(this.isEnabled = !!$.id('g-recaptcha') || g.BOARD.ID === 'b')) { + if (!(this.isEnabled = !!$.id('g-recaptcha'))) { return; } container = $.el('div', { @@ -7891,7 +7891,7 @@ if (d.cookie.indexOf('pass_enabled=1') >= 0) { return; } - if (!(this.isEnabled = !!$.id('g-recaptcha') || g.BOARD.ID === 'b')) { + if (!(this.isEnabled = !!$.id('g-recaptcha'))) { return; } this.captchas = []; diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index 1092b33df..0b989559a 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 46ee5e37e..f717d0e59 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.19.1 +// @version 1.9.19.2 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -24,7 +24,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.9.19.1 +* 4chan X - Version 1.9.19.2 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -394,7 +394,7 @@ doc = d.documentElement; g = { - VERSION: '1.9.19.1', + VERSION: '1.9.19.2', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -7560,7 +7560,7 @@ if (d.cookie.indexOf('pass_enabled=1') >= 0) { return; } - if (!(this.isEnabled = !!$.id('g-recaptcha') || g.BOARD.ID === 'b')) { + if (!(this.isEnabled = !!$.id('g-recaptcha'))) { return; } container = $.el('div', { @@ -7890,7 +7890,7 @@ if (d.cookie.indexOf('pass_enabled=1') >= 0) { return; } - if (!(this.isEnabled = !!$.id('g-recaptcha') || g.BOARD.ID === 'b')) { + if (!(this.isEnabled = !!$.id('g-recaptcha'))) { return; } this.captchas = []; diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index e906ff8c4..8f07324bb 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 20aa61b80..c699070ad 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.9.19.1 +// @version 1.9.19.2 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index d4aa8eeb7..814a6a8a1 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.19.1 +// @version 1.9.19.2 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -25,7 +25,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.9.19.1 +* 4chan X - Version 1.9.19.2 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -395,7 +395,7 @@ doc = d.documentElement; g = { - VERSION: '1.9.19.1', + VERSION: '1.9.19.2', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -7561,7 +7561,7 @@ if (d.cookie.indexOf('pass_enabled=1') >= 0) { return; } - if (!(this.isEnabled = !!$.id('g-recaptcha') || g.BOARD.ID === 'b')) { + if (!(this.isEnabled = !!$.id('g-recaptcha'))) { return; } container = $.el('div', { @@ -7891,7 +7891,7 @@ if (d.cookie.indexOf('pass_enabled=1') >= 0) { return; } - if (!(this.isEnabled = !!$.id('g-recaptcha') || g.BOARD.ID === 'b')) { + if (!(this.isEnabled = !!$.id('g-recaptcha'))) { return; } this.captchas = []; diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index a0f7245e4..f4ae01a02 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 3cd1fc3fb..fb9d6ce66 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 22c971958..3a312feb8 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/package.json b/package.json index 7d6aa5b25..0a7604ab0 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.19.1", + "version": "1.9.19.2", "repo": "https://github.com/ccd0/4chan-x/", "page": "https://github.com/ccd0/4chan-x", "downloads": "https://ccd0.github.io/4chan-x/builds/",