diff --git a/CHANGELOG.md b/CHANGELOG.md index c16910dc3..12f2a96c0 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +### v1.2.26 +*2013-08-12* + **MayhemYDG**: - Show dice rolls that were entered into the email field on /tg/. - Fix flag filtering on /sp/ and /int/. diff --git a/Gruntfile.coffee b/Gruntfile.coffee index 146cf7480..ac12b4958 100755 --- a/Gruntfile.coffee +++ b/Gruntfile.coffee @@ -1,5 +1,6 @@ module.exports = (grunt) -> + pkg = grunt.file.readJSON 'package.json' concatOptions = process: Object.create(null, data: get: -> grunt.config 'pkg' @@ -12,7 +13,7 @@ module.exports = (grunt) -> # Project configuration. grunt.initConfig - pkg: grunt.file.readJSON 'package.json' + pkg: pkg concat: coffee: options: concatOptions @@ -174,22 +175,28 @@ module.exports = (grunt) -> ] grunt.registerTask 'patch', [ 'bump' + 'reloadPkg' 'updcl:3' - 'release' ] grunt.registerTask 'minor', [ 'bump:minor' + 'reloadPkg' 'updcl:2' - 'release' ] grunt.registerTask 'major', [ 'bump:major' + 'reloadPkg' 'updcl:1' - 'release' ] + grunt.registerTask 'reloadPkg', 'Reload the package', -> + # Update the `pkg` object with the new version. + pkg = grunt.file.readJSON('package.json') + grunt.config.data.pkg = concatOptions.process.data = pkg + grunt.log.ok('pkg reloaded.') + grunt.registerTask 'updcl', 'Update the changelog', (i) -> # i is the number of #s for markdown. version = [] diff --git a/LICENSE b/LICENSE index 468617e9f..3437f4f80 100755 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* 4chan X - Version 1.2.25 - 2013-08-12 +* 4chan X - Version 1.2.26 - 2013-08-12 * * Licensed under the MIT license. * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js index 6729e9eac..677c44d9b 100755 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.2.25 +// @version 1.2.26 // @namespace 4chan-X // @description Cross-browser userscript for maximum lurking on 4chan. // @license MIT; https://github.com/seaweedchan/4chan-x/blob/master/LICENSE diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 48e699ae8..50d9c8beb 100755 --- 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.2.25 +// @version 1.2.26 // @namespace 4chan-X // @description Cross-browser userscript for maximum lurking on 4chan. // @license MIT; https://github.com/seaweedchan/4chan-x/blob/master/LICENSE @@ -19,7 +19,7 @@ // @icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwAgMAAAAqbBEUAAAACVBMVEUAAGcAAABmzDNZt9VtAAAAAXRSTlMAQObYZgAAAHFJREFUKFOt0LENACEIBdBv4Qju4wgWanEj3D6OcIVMKaitYHEU/jwTCQj8W75kiVCSBvdQ5/AvfVHBin11BgdRq3ysBgfwBDRrj3MCIA+oAQaku/Q1cNctrAmyDl577tOThYt/Y1RBM4DgOHzM0HFTAyLukH/cmRnqAAAAAElFTkSuQmCC // ==/UserScript== /* -* 4chan X - Version 1.2.25 - 2013-08-12 +* 4chan X - Version 1.2.26 - 2013-08-12 * * Licensed under the MIT license. * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE @@ -324,7 +324,7 @@ doc = d.documentElement; g = { - VERSION: '1.2.25', + VERSION: '1.2.26', NAMESPACE: '4chan X.', boards: {}, threads: {}, diff --git a/builds/crx/manifest.json b/builds/crx/manifest.json index 3112aebc5..0f12dca0a 100755 --- a/builds/crx/manifest.json +++ b/builds/crx/manifest.json @@ -1,6 +1,6 @@ { "name": "4chan X", - "version": "1.2.25", + "version": "1.2.26", "manifest_version": 2, "description": "Cross-browser userscript for maximum lurking on 4chan.", "icons": { diff --git a/builds/crx/script.js b/builds/crx/script.js index c17fe44ba..d5f3d8d66 100755 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -1,6 +1,6 @@ // Generated by CoffeeScript /* -* 4chan X - Version 1.2.25 - 2013-08-12 +* 4chan X - Version 1.2.26 - 2013-08-12 * * Licensed under the MIT license. * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE @@ -305,7 +305,7 @@ doc = d.documentElement; g = { - VERSION: '1.2.25', + VERSION: '1.2.26', NAMESPACE: '4chan X.', boards: {}, threads: {}, diff --git a/latest.js b/latest.js index 45ec3a6f9..07573f3f3 100755 --- a/latest.js +++ b/latest.js @@ -1 +1 @@ -postMessage({version:'1.2.25'},'*') +postMessage({version:'1.2.26'},'*') diff --git a/package.json b/package.json index 49e729ff9..5bdf7b1a0 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "4chan-X", - "version": "1.2.25", + "version": "1.2.26", "description": "Cross-browser userscript for maximum lurking on 4chan.", "meta": { "name": "4chan X",