Merge branch 'v3'

Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/css/style.css

CHANGELOG.md

@@ -1,22 +1,27 @@
-zixaphir
+**zixaphir**:
+- Change Custom Board Navigation input into textarea, new lines will convert to spaces
+- Fix auto-scrolling in Chrome
+- Fix wrapping of #dump-list in Chrome
+- Fix (You) not being added in expanded comments
 - bugfixes
 - Some extra changes on top of seaweed's QR changes for our ricey nature
 - New theme, Generigray
 
 ![QR styling rice, generigray](src/General/img/changelog/2.0.2-qr.png)
 
-MayhemYDG:
+**MayhemYDG**:
 - Added Foolzashit archive
 - Added `blink` class to document in preparation for future versions of Chrome and Opera
 - Take advantage of announcement's new `data-utc` value for hiding
   - `data-utc` is a timestamp, this allows us to not have to store the entire text content of the announcement
 
-seaweedchan:
+**seaweedchan**:
 - Turn all brackets into pseudo-elements. Brackets can be changed by overwriting the `content` of `.fourchanx-link::before` (`[`) and `.fourchanx-link::after` (`]`), or removed entirely with ease.
   - Note: This does not change the default brackets around `toggle-all` in the custom navigation. These are up to the user.
 - Fix file input in Opera
 - External link support in Custom Board Navigation!
   - `external-text:"Google","http://www.google.com"`
+- Fix JIDF flag on /pol/ when post is fetched by updater
 - Hide stub link added in menus of stubs
 - #dump-button moved into #qr-filename-container as a simple + link
 - QR with 4chan Pass made a little wider
@@ -25,7 +30,7 @@ seaweedchan:
 ![QR styling changes](src/General/img/changelog/1.1.18.png)
 
 ### 2.0.2 - 2013-05-09
-zixaphir
+**zixaphir**:
 - More mascot and theme editor fixes
 - Fix stubs in reply hiding menu not following stubs config
 - Fix thread hiding
@@ -35,10 +40,10 @@ zixaphir
 - Try to tighten up mascot positions in relation to the post form
 
 ### 2.0.1 - 2013-05-08
-seaweed
+**seaweed**:
 - Fix an issue with custom board navigation catalog links
 
-zixaphir
+**zixaphir**:
 - Fix Fappe Tyme always being enabled
 - Fix z-index issues in Chrome
 - Fix theme creation and deletion
@@ -51,4 +56,4 @@ Completely rebased off https://github.com/seaweedchan/4chan-x/ 1.1.16
 I hate changelogs so I'd rather not talk about it, but rest assured it
 comes with various performance improvements, layout changes, and the
 like. If you don't like it, I'm sorry, but change comes with sacrifice,
-and we've certainly gained more than we've lost.
+and we've certainly gained more than we've lost

Gruntfile.coffee

@@ -220,6 +220,6 @@ module.exports = (grunt) ->
     # i is the number of #s for markdown.
     version = []
     version.length = +i + 1
-    version = version.join('#') + ' ' + pkg.version + ' - ' + grunt.template.today('yyyy-mm-dd')
+    version = version.join('#') + ' v' + pkg.version + '\n*' + grunt.template.today('yyyy-mm-dd') + '*\n'
     grunt.file.write 'CHANGELOG.md', version + '\n' + grunt.file.read('CHANGELOG.md')
     grunt.log.ok     'Changelog updated for v' + pkg.version + '.'

builds/4chan-X.meta.js

@@ -0,0 +1,19 @@
+// ==UserScript==
+// @name         4chan X
+// @version      1.2.0
+// @namespace    4chan-X
+// @description  Cross-browser userscript for maximum lurking on 4chan.
+// @license      MIT; https://github.com/seaweedchan/4chan-x/blob/master/LICENSE 
+// @match        *://api.4chan.org/*
+// @match        *://boards.4chan.org/*
+// @match        *://images.4chan.org/*
+// @match        *://sys.4chan.org/*
+// @grant        GM_getValue
+// @grant        GM_setValue
+// @grant        GM_deleteValue
+// @grant        GM_openInTab
+// @run-at       document-start
+// @updateURL 	 https://github.com/seaweedchan/4chan-x/raw/stable/builds/4chan-X.meta.js
+// @downloadURL  https://github.com/seaweedchan/4chan-x/raw/stable/builds/4chan-X.user.js
+// @icon         data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwAgMAAAAqbBEUAAAACVBMVEUAAGcAAABmzDNZt9VtAAAAAXRSTlMAQObYZgAAAHFJREFUKFOt0LENACEIBdBv4Qju4wgWanEj3D6OcIVMKaitYHEU/jwTCQj8W75kiVCSBvdQ5/AvfVHBin11BgdRq3ysBgfwBDRrj3MCIA+oAQaku/Q1cNctrAmyDl577tOThYt/Y1RBM4DgOHzM0HFTAyLukH/cmRnqAAAAAElFTkSuQmCC
+// ==/UserScript==

src/General/Config.coffee

@@ -783,7 +783,11 @@ http://iqdb.org/?url=%TURL
     'Bottom Board List':       true
     'Custom Board Navigation': true
 
-  boardnav: '[ toggle-all ] [current-title]'
+  boardnav: """
+[ toggle-all ]
+[current-title]
+[external-text:"FAQ","https://github.com/seaweedchan/4chan-x/wiki/Frequently-Asked-Questions"]
+  """
 
   QR:
     'QR.personas': """

src/General/html/Settings/Advanced.html

@@ -8,6 +8,7 @@
 <fieldset>
   <legend>Custom Board Navigation</legend>
   <div><textarea name=boardnav class=field spellcheck=false></textarea></div>
+  <span class=note>New lines will be converted into spaces.</span><br><br>
   <div>In the following, <code>board</code> can translate to a board ID (<code>a</code>, <code>b</code>, etc...), the current board (<code>current</code>), or the Status/Twitter link (<code>status</code>, <code>@</code>).</div>
   <div>
     For example:<br>
@@ -26,7 +27,6 @@
   <div>External link: <code>external-text:"Google","http://www.google.com"</code></div>
   <div>Combinations are possible: <code>board-index-text:"VIP Index"</code></div>
   <div>Full board list toggle: <code>toggle-all</code></div>
-  <div>Line breaks are allowed and will be replaced with spaces</div>
 </fieldset>
 
 <fieldset>

src/Quotelinks/QuoteBacklink.coffee

@@ -27,7 +27,7 @@ QuoteBacklink =
     a = $.el 'a',
       href: "/#{@board}/res/#{@thread}#p#{@}"
       className: if @isHidden then 'filtered backlink' else 'backlink'
-      textContent: (QuoteBacklink.funk @ID) + (if Conf['Mark Quotes of You'] and @info.yours then QuoteYou.text else '')
+      textContent: (QuoteBacklink.funk @ID) + (if Conf['Mark Quotes of You'] and @info.yours then '\u00A0(You)' else '')
     for quote in @quotes
       containers = [QuoteBacklink.getContainer quote]
       if (post = g.posts[quote]) and post.nodes.backlinkContainer