Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3

Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	src/Archive/Redirect.coffee

CHANGELOG.md

@@ -4,6 +4,20 @@
 - Fix flag filtering on /sp/ and /int/.
 - Minor fixes.
 
+### v1.2.19
+*2013-07-14*
+
+**seaweedchan**:
+- Update archives. LoveIsOver is going down permanently until it can find a host, some boards were removed by archivers, and Warosu has been down for 2 days now.
+- Add a new option to hide "4chan X has been updated to ____" notifications for those having issues with them.
+
+### v1.2.18
+*2013-06-27*
+
+**seaweedchan**:
+- Update archives
+>>>>>>> b3db117d714416c4f178c0359372861a1b5bab71
+
 ### v1.2.17
 *2013-06-17*
 **seaweedchan**:

Gruntfile.coffee

@@ -71,9 +71,6 @@ module.exports = (grunt) ->
         dest:   'builds/crx/'
         expand:  true
         flatten: true
-      opera:
-        files:
-          'builds/4chan-X-Opera.nex': 'builds/4chan-X-Chrome.zip'
 
     coffee:
       script:
@@ -170,7 +167,6 @@ module.exports = (grunt) ->
   grunt.registerTask 'release', [
     'default'
     'compress:crx'
-    'copy:opera'
     'shell:commit'
     'shell:push'
   ]

LICENSE

@@ -1,5 +1,5 @@
 /*
-* 4chan X - Version 1.2.17 - 2013-07-21
+* 4chan X - Version 1.2.19 - 2013-07-21
 *
 * Licensed under the MIT license.
 * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE

builds/4chan-X.meta.js

@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.2.17
+// @version      1.2.19
 // @namespace    4chan-X
 // @description  Cross-browser userscript for maximum lurking on 4chan.
 // @license      MIT; https://github.com/seaweedchan/4chan-x/blob/master/LICENSE 

builds/crx/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "4chan X",
-  "version": "1.2.17",
+  "version": "1.2.19",
   "manifest_version": 2,
   "description": "Cross-browser userscript for maximum lurking on 4chan.",
   "icons": {

latest.js

@@ -1 +1 @@
-postMessage({version:'1.2.17'},'*')
+postMessage({version:'1.2.19'},'*')

package.json

@@ -1,6 +1,6 @@
 {
   "name": "4chan-X",
-  "version": "1.2.17",
+  "version": "1.2.19",
   "description": "Cross-browser userscript for maximum lurking on 4chan.",
   "meta": {
     "name": "4chan X",

src/Archive/Redirect.coffee

@@ -67,13 +67,13 @@ Redirect =
       'http':  true
       'https': true
       'software': 'foolfuuka'
-      'boards': ['adv', 'asp', 'cm', 'e', 'i', 'lgbt', 'n', 'o', 'p', 'pol', 's', 's4s', 't', 'trv', 'y']
-      'files':  ['adv', 'asp', 'cm', 'e', 'i', 'lgbt', 'n', 'o', 'p', 's', 's4s', 't', 'trv', 'y']
+      'boards': ['adv', 'asp', 'cm', 'i', 'lgbt', 'n', 'o', 'p', 's4s', 't', 'trv']
+      'files':  ['adv', 'asp', 'cm', 'i', 'lgbt', 'n', 'o', 'p', 's4s', 't', 'trv']
 
     'Install Gentoo':
       'domain': 'archive.installgentoo.net'
-      'http':  true
-      'https': false
+      'http':  false
+      'https': true
       'software': 'fuuka'
       'boards': ['diy', 'g', 'sci']
       'files':  []

src/General/Config.coffee

@@ -59,6 +59,10 @@ Config =
         'Check for updated versions of <%= meta.name %>.'
       ]
       <% } %>
+      'Show Updated Notifications': [
+        true
+        'Show notifications when 4chan X is successfully updated.'
+      ]
       'Emoji': [
         false
         'Adds icons next to names for different emails'

src/General/Settings.coffee

@@ -16,7 +16,8 @@ Settings =
         changelog = '<%= meta.repo %>blob/<%= meta.mainBranch %>/CHANGELOG.md'
         el = $.el 'span',
           innerHTML: "<%= meta.name %> has been updated to <a href='#{changelog}' target=_blank>version #{g.VERSION}</a>."
-        new Notification 'info', el, 30
+        if Conf['Show Updated Notifications']
+          new Notification 'info', el, 30
       else
         $.on d, '4chanXInitFinished', Settings.open
       $.set

src/General/css/style.css

@@ -172,6 +172,9 @@ a {
   height: 10px;
   position: absolute;
 }
+:root:not(.autohide) #scroll-marker {
+  pointer-events: none;
+}
 #header-bar #scroll-marker {
   display: none;
 }