diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28262808e..49b246f00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's wor
### v1.11.35
+**v1.11.35.1** *(2016-06-07)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.35.1/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.35.1/builds/4chan-X-noupdate.crx "Chromium version")]
+- Merge v1.11.34.10: Fix blocking of CloudFlare scripts.
+
**v1.11.35.0** *(2016-06-05)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.35.0/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.35.0/builds/4chan-X-noupdate.crx "Chromium version")]
- Based on v1.11.34.9.
- Prefix the `gecko`, `blink`, `webkit`, and `edge` classes added to the document depending on the detected browser engine with `ua-`. The old versions are still available for now, but will be removed in the near future.
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index fcc79299c..f03af0b58 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 ff74f6a1e..780b2cf15 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.11.35.0
+// @version 1.11.35.1
// @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 93cefc6c5..41b909487 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.11.35.0
+// @version 1.11.35.1
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -134,7 +134,7 @@ docSet = function() {
};
g = {
- VERSION: '1.11.35.0',
+ VERSION: '1.11.35.1',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -397,7 +397,7 @@ Config = (function() {
'QR.personas': "#options:\"sage\";boards:jp;always",
sjisPreview: false
},
- jsWhitelist: 'http://s.4cdn.org\nhttps://s.4cdn.org\nhttp://www.google.com\nhttps://www.google.com\nhttps://www.gstatic.com\n\'unsafe-inline\'\n\'unsafe-eval\'',
+ jsWhitelist: 'http://s.4cdn.org\nhttps://s.4cdn.org\nhttp://www.google.com\nhttps://www.google.com\nhttps://www.gstatic.com\n\'self\'\n\'unsafe-inline\'\n\'unsafe-eval\'',
captchaLanguage: '',
time: '%m/%d/%y(%a)%H:%M:%S',
backlink: '>>%id',
@@ -22535,6 +22535,7 @@ Main = (function() {
whitelist = whitelist.split('\n').filter(function(x) {
return x[0] !== "'";
});
+ whitelist.push(location.protocol + "//" + location.host);
oldFun = {};
ref1 = ['createElement', 'write'];
for (k = 0, len1 = ref1.length; k < len1; k++) {
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index 1f5f9b65d..a067e7bd5 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 10e33768b..0d65fb02e 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.11.35.0
+// @version 1.11.35.1
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -134,7 +134,7 @@ docSet = function() {
};
g = {
- VERSION: '1.11.35.0',
+ VERSION: '1.11.35.1',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -397,7 +397,7 @@ Config = (function() {
'QR.personas': "#options:\"sage\";boards:jp;always",
sjisPreview: false
},
- jsWhitelist: 'http://s.4cdn.org\nhttps://s.4cdn.org\nhttp://www.google.com\nhttps://www.google.com\nhttps://www.gstatic.com\n\'unsafe-inline\'\n\'unsafe-eval\'',
+ jsWhitelist: 'http://s.4cdn.org\nhttps://s.4cdn.org\nhttp://www.google.com\nhttps://www.google.com\nhttps://www.gstatic.com\n\'self\'\n\'unsafe-inline\'\n\'unsafe-eval\'',
captchaLanguage: '',
time: '%m/%d/%y(%a)%H:%M:%S',
backlink: '>>%id',
@@ -22535,6 +22535,7 @@ Main = (function() {
whitelist = whitelist.split('\n').filter(function(x) {
return x[0] !== "'";
});
+ whitelist.push(location.protocol + "//" + location.host);
oldFun = {};
ref1 = ['createElement', 'write'];
for (k = 0, len1 = ref1.length; k < len1; k++) {
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index e7ff4ba4c..b9ed0bf5c 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 ecf8f5c33..4a3de7b1a 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.11.35.0
+// @version 1.11.35.1
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 93184c42a..77f921aa7 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.11.35.0
+// @version 1.11.35.1
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -134,7 +134,7 @@ docSet = function() {
};
g = {
- VERSION: '1.11.35.0',
+ VERSION: '1.11.35.1',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -397,7 +397,7 @@ Config = (function() {
'QR.personas': "#options:\"sage\";boards:jp;always",
sjisPreview: false
},
- jsWhitelist: 'http://s.4cdn.org\nhttps://s.4cdn.org\nhttp://www.google.com\nhttps://www.google.com\nhttps://www.gstatic.com\n\'unsafe-inline\'\n\'unsafe-eval\'',
+ jsWhitelist: 'http://s.4cdn.org\nhttps://s.4cdn.org\nhttp://www.google.com\nhttps://www.google.com\nhttps://www.gstatic.com\n\'self\'\n\'unsafe-inline\'\n\'unsafe-eval\'',
captchaLanguage: '',
time: '%m/%d/%y(%a)%H:%M:%S',
backlink: '>>%id',
@@ -22535,6 +22535,7 @@ Main = (function() {
whitelist = whitelist.split('\n').filter(function(x) {
return x[0] !== "'";
});
+ whitelist.push(location.protocol + "//" + location.host);
oldFun = {};
ref1 = ['createElement', 'write'];
for (k = 0, len1 = ref1.length; k < len1; k++) {
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index f8c32d5da..887384ed7 100644
Binary files a/builds/4chan-X.zip and b/builds/4chan-X.zip differ
diff --git a/builds/updates-beta.xml b/builds/updates-beta.xml
index 8a3a3d3ba..c2580d15c 100644
--- a/builds/updates-beta.xml
+++ b/builds/updates-beta.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/builds/updates.xml b/builds/updates.xml
index b66649e46..d6867d9a0 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/version.json b/version.json
index 14ad293b7..3f9fce9d7 100644
--- a/version.json
+++ b/version.json
@@ -1,4 +1,4 @@
{
- "version": "1.11.35.0",
- "date": "2016-06-05T22:14:38.454Z"
+ "version": "1.11.35.1",
+ "date": "2016-06-07T17:54:32.135Z"
}
\ No newline at end of file