Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bstable'

Browse Source
This commit is contained in:
ccd0 2016-06-27 18:17:54 -07:00
commit 3b48c3d07b
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -43,6 +43,10 @@
### v1.11.35 ### v1.11.35
**v1.11.35.9** *(2016-06-28)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.35.9/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.35.9/builds/4chan-X-noupdate.crx)]
- Update default archive list.
- Update cuckchan.org -> desuarchive.org in sauce examples.
**v1.11.35.8** *(2016-06-25)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.35.8/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.35.8/builds/4chan-X-noupdate.crx)] **v1.11.35.8** *(2016-06-25)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.35.8/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.35.8/builds/4chan-X-noupdate.crx)]
- Update default archive list. - Update default archive list.
- Update desustorage.org -> cuckchan.org in sauce examples. - Update desustorage.org -> cuckchan.org in sauce examples.

4
src/Archive/archives.json
View File

@ -36,8 +36,8 @@
"files": ["3", "biz", "cgl", "ck", "diy", "fa", "g", "ic", "jp", "lit", "sci", "tg", "vr"] "files": ["3", "biz", "cgl", "ck", "diy", "fa", "g", "ic", "jp", "lit", "sci", "tg", "vr"]
}, { }, {
"uid": 23, "uid": 23,
"name": "Desustorage", "name": "Desuarchive",
"domain": "cuckchan.org", "domain": "desuarchive.org",
"http": true, "http": true,
"https": true, "https": true,
"software": "foolfuuka", "software": "foolfuuka",

4
src/General/Settings.coffee
View File

@ -390,9 +390,9 @@ Settings =
addCSS '#qr .persona .field {display: block !important;}' if data['Show Name and Subject'] addCSS '#qr .persona .field {display: block !important;}' if data['Show Name and Subject']
addCSS '#shortcut-qr {display: none;}' if data['QR Shortcut'] is false addCSS '#shortcut-qr {display: none;}' if data['QR Shortcut'] is false
addCSS '.qr-link-container-bottom {display: none;}' if data['Bottom QR Link'] is false addCSS '.qr-link-container-bottom {display: none;}' if data['Bottom QR Link'] is false
if compareString < '00001.00012.00000.00005' if compareString < '00001.00012.00000.00006'
if data['sauces']? if data['sauces']?
set 'sauces', data['sauces'].replace(/^(#?\s*)https:\/\/desustorage\.org\//mg, '$1https://cuckchan.org/') set 'sauces', data['sauces'].replace(/^(#?\s*)https:\/\/(?:desustorage|cuckchan)\.org\//mg, '$1https://desuarchive.org/')
changes changes
loadSettings: (data, cb) -> loadSettings: (data, cb) ->

2
src/config/Config.coffee
View File

@ -698,7 +698,7 @@ Config =
# "View Same" in archives: # "View Same" in archives:
http://eye.swfchan.com/search/?q=%name;types:swf http://eye.swfchan.com/search/?q=%name;types:swf
#https://cuckchan.org/_/search/image/%sMD5/ #https://desuarchive.org/_/search/image/%sMD5/
#https://archive.4plebs.org/_/search/image/%sMD5/ #https://archive.4plebs.org/_/search/image/%sMD5/
#https://boards.fireden.net/_/search/image/%sMD5/ #https://boards.fireden.net/_/search/image/%sMD5/
#https://foolz.fireden.net/_/search/image/%sMD5/ #https://foolz.fireden.net/_/search/image/%sMD5/