diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a5615432..045a7ca48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## v2.6.0 +*2013-11-27* + **MayhemYDG**: - Tiny posting cooldown adjustment: - You can post an image reply immediately after a non-image reply. diff --git a/LICENSE b/LICENSE index 4b403afc5..1abc6e338 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* appchan x - Version 2.5.1 - 2013-11-26 +* appchan x - Version 2.6.0 - 2013-11-27 * * Licensed under the MIT license. * https://github.com/zixaphir/appchan-x/blob/master/LICENSE diff --git a/builds/appchan-x.meta.js b/builds/appchan-x.meta.js index 4bbd86418..9804611ec 100644 --- a/builds/appchan-x.meta.js +++ b/builds/appchan-x.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name appchan x -// @version 2.5.1 +// @version 2.6.0 // @minGMVer 1.12 // @minFFVer 22 // @namespace zixaphir diff --git a/builds/appchan-x.user.js b/builds/appchan-x.user.js index 85b07a631..7eb679f0d 100644 --- a/builds/appchan-x.user.js +++ b/builds/appchan-x.user.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript // ==UserScript== // @name appchan x -// @version 2.5.1 +// @version 2.6.0 // @minGMVer 1.12 // @minFFVer 22 // @namespace zixaphir @@ -22,7 +22,7 @@ // ==/UserScript== /* -* appchan x - Version 2.5.1 - 2013-11-26 +* appchan x - Version 2.6.0 - 2013-11-27 * * Licensed under the MIT license. * https://github.com/zixaphir/appchan-x/blob/master/LICENSE @@ -135,8 +135,7 @@ 'Show Dice Roll': [true, 'Show dice that were entered into the email field.'], 'Color User IDs': [false, 'Assign unique colors to user IDs on boards that use them'], 'Remove Spoilers': [false, 'Remove all spoilers in text.'], - 'Reveal Spoilers': [false, 'Indicate spoilers if Remove Spoilers is enabled, or make the text appear hovered if Remove Spoiler is disabled.'], - 'Infinite Scrolling': [false, 'Add new posts to the board index upon reaching the bottom of the board.'] + 'Reveal Spoilers': [false, 'Indicate spoilers if Remove Spoilers is enabled, or make the text appear hovered if Remove Spoiler is disabled.'] }, 'Linkification': { 'Linkify': [true, 'Convert text into links where applicable.'], @@ -445,7 +444,7 @@ doc = d.documentElement; g = { - VERSION: '2.5.1', + VERSION: '2.6.0', NAMESPACE: 'appchan_x.', TYPE: 'sfw', boards: {}, diff --git a/builds/appchan-x.zip b/builds/appchan-x.zip index b31cfb4c1..5db745750 100644 Binary files a/builds/appchan-x.zip and b/builds/appchan-x.zip differ diff --git a/builds/crx/manifest.json b/builds/crx/manifest.json index c000ee823..1614b10ea 100644 --- a/builds/crx/manifest.json +++ b/builds/crx/manifest.json @@ -1,6 +1,6 @@ { "name": "appchan x", - "version": "2.5.1", + "version": "2.6.0", "manifest_version": 2, "description": "The most comprehensive 4chan userscript.", "icons": { diff --git a/builds/crx/script.js b/builds/crx/script.js index 527c26f12..5c4eda4c0 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -1,6 +1,6 @@ // Generated by CoffeeScript /* -* appchan x - Version 2.5.1 - 2013-11-26 +* appchan x - Version 2.6.0 - 2013-11-27 * * Licensed under the MIT license. * https://github.com/zixaphir/appchan-x/blob/master/LICENSE @@ -113,8 +113,7 @@ 'Show Dice Roll': [true, 'Show dice that were entered into the email field.'], 'Color User IDs': [false, 'Assign unique colors to user IDs on boards that use them'], 'Remove Spoilers': [false, 'Remove all spoilers in text.'], - 'Reveal Spoilers': [false, 'Indicate spoilers if Remove Spoilers is enabled, or make the text appear hovered if Remove Spoiler is disabled.'], - 'Infinite Scrolling': [false, 'Add new posts to the board index upon reaching the bottom of the board.'] + 'Reveal Spoilers': [false, 'Indicate spoilers if Remove Spoilers is enabled, or make the text appear hovered if Remove Spoiler is disabled.'] }, 'Linkification': { 'Linkify': [true, 'Convert text into links where applicable.'], @@ -424,7 +423,7 @@ doc = d.documentElement; g = { - VERSION: '2.5.1', + VERSION: '2.6.0', NAMESPACE: 'appchan_x.', TYPE: 'sfw', boards: {}, diff --git a/latest.js b/latest.js index 023315043..e609af55b 100644 --- a/latest.js +++ b/latest.js @@ -1 +1 @@ -postMessage({version:'2.5.1'},'*') +postMessage({version:'2.6.0'},'*') diff --git a/package.json b/package.json index 050b84d32..dddd287da 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "appchan-x", - "version": "2.5.1", + "version": "2.6.0", "description": "The most comprehensive 4chan userscript.", "meta": { "name": "appchan x", diff --git a/src/General/Config.coffee b/src/General/Config.coffee index 8a8882708..7fdeb0dd2 100755 --- a/src/General/Config.coffee +++ b/src/General/Config.coffee @@ -65,10 +65,6 @@ Config = false 'Indicate spoilers if Remove Spoilers is enabled, or make the text appear hovered if Remove Spoiler is disabled.' ] - 'Infinite Scrolling': [ - false - 'Add new posts to the board index upon reaching the bottom of the board.' - ] 'Linkification': 'Linkify': [