Merge branch 'master' of git://github.com/MayhemYDG/4chan-x into autonoko

Conflicts:
	changelog
	script.coffee

4chan_x.user.js

@@ -3580,6 +3580,10 @@
           return;
       }
       $.ready(options.init);
+      if (conf['Quick Reply'] && conf['Hide Original Post Form']) {
+        Main.css += 'form[name=post] { display: none; }';
+      }
+      Main.addStyle();
       now = Date.now();
       if (conf['Check for Updates'] && $.get('lastUpdate', 0) < now - 6 * HOUR) {
         $.ready(function() {
@@ -3623,10 +3627,6 @@
         quoteIndicators.init();
       }
       if (conf['Fix XXX\'d Post Numbers']) unxify.init();
-      if (conf['Quick Reply'] && conf['Hide Original Post Form']) {
-        Main.css += 'form[name=post] { display: none; }';
-      }
-      Main.addStyle();
       return $.ready(Main.ready);
     },
     ready: function() {

changelog

@@ -1,6 +1,17 @@
 master
+<<<<<<< HEAD
 - ahodesuka
   Add auto noko option for replies from the main board and not dumping.
+=======
+- Mayhem
+  The Filter now has per filter settings:
+    - Filter the OP along its thread, replies only, or both.
+    - Per boards, or global.
+    - Hightlight, or hide.
+  New filter group: Image dimensions.
+  Fix posting on Safari.
+  Fix rare case where the QR would not accept certain image types.
+>>>>>>> 15b7a55fe01b90965f3663202b71d799456ff95e
 
 2.26.4
 - Mayhem