Merge branch 'bstable'

This commit is contained in:
ccd0 2019-12-29 20:19:42 -08:00
commit 13bc1d563a
4 changed files with 8 additions and 2 deletions

View File

@ -10,6 +10,9 @@
### v1.14.15
**v1.14.15.3** *(2019-12-30)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.15.3/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.15.3/builds/4chan-X-noupdate.crx)]
- Update location of archive list. #2520
**v1.14.15.2** *(2019-12-20)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.15.2/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.15.2/builds/4chan-X-noupdate.crx)]
- Display message when noscript captcha is disabled, and link to open list of alternate imageboards. #1539 #2500

View File

@ -527,6 +527,9 @@ Settings =
vp-replace
[external-text:"FAQ","<%= meta.faq %>"]
"""
if compareString < '00001.00014.00015.00003'
if data['archiveLists']?
set 'archiveLists', data['archiveLists'].replace('https://mayhemydg.github.io/archives.json/archives.json', 'https://nstepien.github.io/archives.json/archives.json')
changes
loadSettings: (data, cb) ->

View File

@ -830,7 +830,7 @@ Config =
'Custom Board Navigation': true
archives:
archiveLists: 'https://mayhemydg.github.io/archives.json/archives.json'
archiveLists: 'https://nstepien.github.io/archives.json/archives.json'
lastarchivecheck: 0
archiveAutoUpdate: true

View File

@ -37,7 +37,7 @@
// @connect 4chan.org
// @connect 4channel.org
// @connect 4cdn.org
// @connect mayhemydg.github.io
// @connect nstepien.github.io
<%=
readJSON('/src/Archive/archives.json').map(function(archive) {
return '// @connect ' + archive.domain;