diff --git a/CHANGELOG.md b/CHANGELOG.md
index b30e94b75..1a0540268 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@
## v1.14.0
+**v1.14.0.7** *(2018-02-09)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.0.7/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.0.7/builds/4chan-X-noupdate.crx)]
+- Merge v1.13.15.9: Fix 404 redirection on error pages without doctype. #1811
+
**v1.14.0.6** *(2018-02-04)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.0.6/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.0.6/builds/4chan-X-noupdate.crx)]
- Fix bug from v1.14.0.0 that broke 404 redirect and other features on image URLs. #1789
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index 89525e47a..d2f6c5219 100644
Binary files a/builds/4chan-X-beta.crx and b/builds/4chan-X-beta.crx differ
diff --git a/builds/4chan-X-beta.meta.js b/builds/4chan-X-beta.meta.js
index 6bc1ab502..4c3771186 100644
--- a/builds/4chan-X-beta.meta.js
+++ b/builds/4chan-X-beta.meta.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X beta
-// @version 1.14.0.6
+// @version 1.14.0.7
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
diff --git a/builds/4chan-X-beta.user.js b/builds/4chan-X-beta.user.js
index f49a90668..fbd3382d4 100644
--- a/builds/4chan-X-beta.user.js
+++ b/builds/4chan-X-beta.user.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X beta
-// @version 1.14.0.6
+// @version 1.14.0.7
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -157,7 +157,7 @@ docSet = function() {
};
g = {
- VERSION: '1.14.0.6',
+ VERSION: '1.14.0.7',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -7323,7 +7323,7 @@ SW = {};
},
isThisPageLegit: function() {
var ref;
- return location.hostname === 'boards.4chan.org' && !$('link[href*="favicon-status.ico"]', d.head) && ((ref = d.title) !== '4chan - Temporarily Offline' && ref !== '4chan - Error' && ref !== '504 Gateway Time-out');
+ return location.hostname === 'boards.4chan.org' && d.doctype && !$('link[href*="favicon-status.ico"]', d.head) && ((ref = d.title) !== '4chan - Temporarily Offline' && ref !== '4chan - Error' && ref !== '504 Gateway Time-out' && ref !== 'MathJax Equation Source');
},
is404: function() {
var ref;
@@ -24469,9 +24469,6 @@ Main = (function() {
return;
}
} catch (_error) {}
- if (location.hostname === 'boards.4chan.org' && d.documentElement && !d.doctype) {
- return;
- }
if (doc && $.hasClass(doc, 'fourchan-x')) {
return;
}
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index b91b5fa99..0d0c06322 100644
Binary files a/builds/4chan-X-noupdate.crx and b/builds/4chan-X-noupdate.crx differ
diff --git a/builds/4chan-X-noupdate.user.js b/builds/4chan-X-noupdate.user.js
index 7593515c9..70ee14c2a 100644
--- a/builds/4chan-X-noupdate.user.js
+++ b/builds/4chan-X-noupdate.user.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.14.0.6
+// @version 1.14.0.7
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -157,7 +157,7 @@ docSet = function() {
};
g = {
- VERSION: '1.14.0.6',
+ VERSION: '1.14.0.7',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -7323,7 +7323,7 @@ SW = {};
},
isThisPageLegit: function() {
var ref;
- return location.hostname === 'boards.4chan.org' && !$('link[href*="favicon-status.ico"]', d.head) && ((ref = d.title) !== '4chan - Temporarily Offline' && ref !== '4chan - Error' && ref !== '504 Gateway Time-out');
+ return location.hostname === 'boards.4chan.org' && d.doctype && !$('link[href*="favicon-status.ico"]', d.head) && ((ref = d.title) !== '4chan - Temporarily Offline' && ref !== '4chan - Error' && ref !== '504 Gateway Time-out' && ref !== 'MathJax Equation Source');
},
is404: function() {
var ref;
@@ -24469,9 +24469,6 @@ Main = (function() {
return;
}
} catch (_error) {}
- if (location.hostname === 'boards.4chan.org' && d.documentElement && !d.doctype) {
- return;
- }
if (doc && $.hasClass(doc, 'fourchan-x')) {
return;
}
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index 72859561c..1a4ab568e 100644
Binary files a/builds/4chan-X.crx and b/builds/4chan-X.crx differ
diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js
index 4e0d7a4a6..e8ee4976f 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.14.0.6
+// @version 1.14.0.7
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index d592b5341..4b3872f13 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.14.0.6
+// @version 1.14.0.7
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -157,7 +157,7 @@ docSet = function() {
};
g = {
- VERSION: '1.14.0.6',
+ VERSION: '1.14.0.7',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -7323,7 +7323,7 @@ SW = {};
},
isThisPageLegit: function() {
var ref;
- return location.hostname === 'boards.4chan.org' && !$('link[href*="favicon-status.ico"]', d.head) && ((ref = d.title) !== '4chan - Temporarily Offline' && ref !== '4chan - Error' && ref !== '504 Gateway Time-out');
+ return location.hostname === 'boards.4chan.org' && d.doctype && !$('link[href*="favicon-status.ico"]', d.head) && ((ref = d.title) !== '4chan - Temporarily Offline' && ref !== '4chan - Error' && ref !== '504 Gateway Time-out' && ref !== 'MathJax Equation Source');
},
is404: function() {
var ref;
@@ -24469,9 +24469,6 @@ Main = (function() {
return;
}
} catch (_error) {}
- if (location.hostname === 'boards.4chan.org' && d.documentElement && !d.doctype) {
- return;
- }
if (doc && $.hasClass(doc, 'fourchan-x')) {
return;
}
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index 53dbb7c5a..bd0d54b68 100644
Binary files a/builds/4chan-X.zip and b/builds/4chan-X.zip differ
diff --git a/builds/updates-beta.json b/builds/updates-beta.json
index 7693cdb5f..294887db5 100644
--- a/builds/updates-beta.json
+++ b/builds/updates-beta.json
@@ -3,7 +3,7 @@
"4chan-x@4chan-x.net": {
"updates": [
{
- "version": "1.14.0.6",
+ "version": "1.14.0.7",
"update_link": "https://www.4chan-x.net/builds/4chan-X-beta.crx"
}
]
diff --git a/builds/updates-beta.xml b/builds/updates-beta.xml
index e0b083f0c..f0762dbc3 100644
--- a/builds/updates-beta.xml
+++ b/builds/updates-beta.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/builds/updates.json b/builds/updates.json
index 1d507ff4f..24d958b8b 100644
--- a/builds/updates.json
+++ b/builds/updates.json
@@ -3,7 +3,7 @@
"4chan-x@4chan-x.net": {
"updates": [
{
- "version": "1.14.0.6",
+ "version": "1.14.0.7",
"update_link": "https://www.4chan-x.net/builds/4chan-X.crx"
}
]
diff --git a/builds/updates.xml b/builds/updates.xml
index f37e36044..7eab451b4 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/version.json b/version.json
index a1e5b99fd..041302a3c 100644
--- a/version.json
+++ b/version.json
@@ -1,4 +1,4 @@
{
- "version": "1.14.0.6",
- "date": "2018-02-04T04:08:30.543Z"
+ "version": "1.14.0.7",
+ "date": "2018-02-09T18:49:55.978Z"
}
\ No newline at end of file