Merge branch 'master' into Fx10

Conflicts:
	4chan_x.user.js
	script.coffee

Cakefile

@@ -2,9 +2,12 @@
 {exec} = require 'child_process'
 fs     = require 'fs'
 
+VERSION = '2.23.4'
+
 HEADER  = """
 // ==UserScript==
 // @name           4chan x
+// @version        #{VERSION}
 // @namespace      aeosynth
 // @description    Adds various features.
 // @copyright      2009-2011 James Campos <james.r.campos@gmail.com>
@@ -12,12 +15,15 @@ HEADER  = """
 // @include        http://boards.4chan.org/*
 // @include        http://sys.4chan.org/*
 // @run-at         document-start
-// @icon           https://raw.github.com/aeosynth/4chan-x/gh-pages/favicon.png
+// @updateURL      https://raw.github.com/mayhemydg/4chan-x/stable/4chan_x.user.js
+// @icon           https://raw.github.com/mayhemydg/4chan-x/gh-pages/favicon.png
 // ==/UserScript==
 
 /* LICENSE
  *
  * Copyright (c) 2009-2011 James Campos <james.r.campos@gmail.com>
+ * http://mayhemydg.github.com/4chan-x/
+ * 4chan x #{VERSION}
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
@@ -38,27 +44,26 @@ HEADER  = """
  * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/* HACKING
  *
- * 4chan x is written in CoffeeScript[1], and developed on github[2].
+ * HACKING
+ *
+ * 4chan x is written in CoffeeScript[1], and developed on GitHub[2].
  *
  * [1]: http://jashkenas.github.com/coffee-script/
- * [2]: http://github.com/aeosynth/4chan-x
- */
-
-/* CONTRIBUTORS
+ * [2]: http://github.com/mayhemydg/4chan-x
  *
+ * CONTRIBUTORS
+ *
+ * Shou- - pentadactyl fixes
+ * ferongr - new favicons
+ * xat- - new favicons
  * Zixaphir - fix qr textarea - captcha-image gap
- * Mayhem - various features / fixes
  * Ongpot - sfw favicon
  * thisisanon - nsfw + 404 favicons
  * Anonymous - empty favicon
  * Seiba - chrome quick reply focusing
  * herpaderpderp - recaptcha fixes
- * wakimoko - recaptcha tab order http://userscripts.org/scripts/show/82657
- * xat- new favicons
+ * WakiMiko - recaptcha tab order http://userscripts.org/scripts/show/82657
  *
  * All the people who've taken the time to write bug reports.
  *
@@ -71,17 +76,14 @@ HEADER  = """
 INFILE  = 'script.coffee'
 OUTFILE = '4chan_x.user.js'
 
-build = ->
+task 'build', ->
   exec 'coffee --print script.coffee', (err, stdout, stderr) ->
     throw err if err
     fs.writeFile OUTFILE, HEADER + stdout, (err) ->
       throw err if err
 
-task 'build', ->
-  build()
-
 task 'dev', ->
-  build()
+  invoke 'build'
   fs.watchFile INFILE, interval: 250, (curr, prev) ->
     if curr.mtime > prev.mtime
-      build()
+      invoke 'build'

changelog

@@ -1,13 +1,91 @@
 master
+
+2.23.4
+- mayhem
+  thread updater network optimization
+  prevent regexp errors with the filter
+
+2.23.3
+- mayhem
+  fix 2.32.2 regression duplicating new posts in rare cases
+
+2.23.2
+- mayhem
+  hide original posts from inlined backlinks - optional
+  enable autoposting when submitting a captcha while on cooldown
+  fix caret position when quoting on Opera
+
+2.23.1
+- mayhem
+  fix favicon updating on Opera
+  fix compatibility with Tampermonkey
+
+2.23.0
+- mayhem
+  multiple unread favicons to chose in the options
+  quotes are now inserted at the caret position in the QR
+  quotes also replace the text selection in the QR
+  open QR focused when using the `Open QR without post number inserted` keybind
+  fix thread updater for Opera
+- aeosynth
+  update the captcha caching expiration date to 30mins
+
+2.22.2
+- mayhem
+  indicate if the settings require a feature to be enabled
+  fix obscure and continuous prompts to auto update
+
+2.22.1
+- mayhem
+  change 'Duckroll' for 'Cross-thread'
+  fix image expanding fitness with an inlined backlink on Firefox
+
+2.22.0
+- mayhem
+  new Indicate Duckrolls feature
+  put regex.info sauce back - disabled by default
+  fix for auto image reloading in 404'd threads on Firefox
+
+2.21.4
+- mayhem
+  fix 4chan X version updater
+
+2.21.3
+- mayhem
+  fix locked thread icons with fit width/screen enabled on Firefox
+  fix fit width on Opera
+  for userstylers: you can use the rendering engine body class
+
+2.21.2
+- mayhem
+  fix time formatting year in Opera
+  fix QR keybinds
+  fix QR posts getting swallowed by sys.4chan.org
+
+2.21.1
+- mayhem
+  fix Opera
+
+2.21.0
 - mayhem
   initiate 4chan X earlier
-  automatically reload expanded pictures on error
-  update archives redirections for /diy/, /pol/ and /sci/
-  regular expressions based filter
-  handle bans with the thread updater
   performance improvements
+  regular expressions based filter
+  remove image preloading
+  automatically reload expanded pictures on error
+  handle bans with the thread updater
+  use unread favicons by ferongr
+
+2.20.3
+- mayhem
+  fix DST for two days of the year
+
+2.20.2
+- mayhem
+  update archive redirection
 - aeosynth
-  quick reply redesign
+  hopefully fix qr error / update messages
+  rm support throd link
 
 2.20.1
 - mayhem

latest.js

@@ -0,0 +1 @@
+postMessage({version:'2.23.4'},'*');

readme.md

@@ -1,4 +1,4 @@
-# Get 4chan X [HERE](http://aeosynth.github.com/4chan-x/).
+# Get 4chan X [HERE](http://mayhemydg.github.com/4chan-x/).
 
 # Building