Merge branch '1.8.8.x' into 1.8.9.x

Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/4chan-X-beta.crx
	builds/4chan-X-beta.meta.js
	builds/4chan-X-beta.user.js
	builds/4chan-X-noupdate.crx
	builds/4chan-X-noupdate.user.js
	builds/4chan-X.crx
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/4chan-X.zip
	builds/updates-beta.xml
	builds/updates.xml
	package.json

CHANGELOG.md

@@ -21,6 +21,12 @@ Based on v1.8.8.6.
 - Fix some archive features not being possible to disable; unchecking `404 Redirect`, `Archive Link`, and `Resurrect Quotes` is now sufficient to turn all archive features off.
 - Allow `disabled` as an archive choice for every board.
 
+### v1.8.8.8 
+*2014-08-11*
+
+**vidyamoe**
+- Update archive list.
+
 ### v1.8.8.7 
 *2014-08-10*
 

Gruntfile.coffee

@@ -1,4 +1,5 @@
 module.exports = (grunt) ->
+  grunt.util.linefeed = '\n'
 
   importHTML = (filename) ->
     "(innerHTML: #{JSON.stringify grunt.file.read("src/General/html/#{filename}.html").replace(/^\s+|\s+$</gm, '').replace(/\n/g, '')})"
@@ -125,7 +126,7 @@ module.exports = (grunt) ->
         command: """
           git commit -am "Release <%= pkg.meta.name %> v<%= pkg.meta.version %>."
           git tag -a <%= pkg.meta.version %> -m "<%= pkg.meta.name %> v<%= pkg.meta.version %>."
-        """
+        """.split('\n').join('&&')
       beta:
         command: """
           git tag -af beta -m "<%= pkg.meta.name %> v<%= pkg.meta.version %>."
@@ -133,7 +134,7 @@ module.exports = (grunt) ->
           git checkout beta 'builds/*<%= pkg.meta.suffix.beta %>.*'
           git commit -am "Move <%= pkg.meta.name %> v<%= pkg.meta.version %> to beta channel."
           git checkout -
-        """
+        """.split('\n').join('&&')
       stable:
         command: """
           git tag -af stable -m "<%= pkg.meta.name %> v<%= pkg.meta.version %>."
@@ -145,7 +146,7 @@ module.exports = (grunt) ->
           git merge --ff-only tmp
           git branch -d tmp
           git checkout @{-2}
-        """
+        """.split('\n').join('&&')
       push:
         command: 'git push origin --tags -f && git push origin --all'
 

src/Archive/archives.json

@@ -79,6 +79,15 @@
   "software": "foolfuuka",
   "boards": ["t"],
   "files": ["t"]
+}, {
+  "uid": 20,
+  "name": "/v/idya archive",
+  "domain": "archive.vidya.moe",
+  "http": true,
+  "https": true,
+  "software": "foolfuuka",
+  "boards": ["v"],
+  "files": ["v"]
 }, {
   "uid": 19,
   "name": "Deniable Plausibility",
@@ -88,15 +97,6 @@
   "software": "foolfuuka",
   "boards": ["v", "vg"],
   "files": ["v", "vg"]
-}, {
-  "uid": 20,
-  "name": "/v/idya archive",
-  "domain": "archive.vidya.moe",
-  "http": true,
-  "https": false,
-  "software": "foolfuuka",
-  "boards": ["v"],
-  "files": ["v"]
 }, {
   "uid": 13,
   "name": "Foolz Beta",