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

Conflicts:
	CHANGELOG.md
	package.json
	src/General/Config.coffee

CHANGELOG.md

@@ -1,4 +1,11 @@
 **MayhemYDG**:
+- **New feature**: `Desktop Notifications`
+ - Enabled by default, but you will have to grant your browser permissions to display them or disable them altogether:<br>
+  ![authorize or disable](img/changelog/3.9.0/0.png)
+ - Clicking on a notification will bring up the relevant tab. (Does not work on Firefox unfortunately, [see bug 874050](https://bugzilla.mozilla.org/show_bug.cgi?id=874050).)
+ - Notifications will appear when someone quotes you, clicking such notification will also scroll the thread to the relevant post.
+ - Notifications will appear for posting errors instead of alert popups.
+ - Opera does *not* support desktop notifications yet.
 
 ![filename editing](img/changelog/3.8.0/0.gif)
 

src/General/Config.coffee

@@ -309,7 +309,6 @@ Config =
         true
         'When disabled, shows a red border on the CAPTCHA input until a key is pressed instead of a notification.'
       ]
-
     'Quote Links':
       'Quote Backlinks': [
         true

src/Posting/QuickReply.coffee

@@ -648,7 +648,7 @@ QR =
         when 'filename'
           return unless @file
           @file.newName = @filename.replace /[/\\]/g, '-'
-          unless /\.(jpe?g|png|gif|pdf|sfw)$/i.test @filename
+          unless /\.(jpe?g|png|gif|pdf|swf)$/i.test @filename
             # 4chan will truncate the filename if it has no extension,
             # but it will always replace the extension by the correct one,
             # so we suffix it with '.jpg' when needed.