prehistoric-systems/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2026-03-11 09:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #56 from b3rnd/master

Browse source 
prefer https
This commit is contained in:
Raymond Hill 2015-04-15 15:37:37 -04:00
commit a99bc4df42
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assets/ublock/filter-lists.json
View file

@ -213,7 +213,7 @@
"off": true, "off": true,
"title": "FIN: Wiltteri", "title": "FIN: Wiltteri",
"group": "regions", "group": "regions",
"homeURL": "http://raw.githubusercontent.com/wiltteri/wiltteri.txt/master/wiltteri.txt" "homeURL": "https://raw.githubusercontent.com/wiltteri/wiltteri.txt/master/wiltteri.txt"
}, },
"someonewhocares.org/hosts/hosts": { "someonewhocares.org/hosts/hosts": {
"off": true, "off": true,
@ -225,7 +225,7 @@
"off": true, "off": true,
"title": "Spam404", "title": "Spam404",
"group": "malware", "group": "malware",
"homeURL": "http://spam404bl.com/spam404scamlist.txt" "homeURL": "https://spam404bl.com/spam404scamlist.txt"
}, },
"stanev.org/abp/adblock_bg.txt": { "stanev.org/abp/adblock_bg.txt": {
"off": true, "off": true,

2
assets/update-3rdparties.sh
View file

@ -42,7 +42,7 @@ assets=(
['thirdparties/raw.githubusercontent.com/tomasko126/easylistczechandslovak/master/filters.txt']='https://raw.githubusercontent.com/tomasko126/easylistczechandslovak/master/filters.txt' ['thirdparties/raw.githubusercontent.com/tomasko126/easylistczechandslovak/master/filters.txt']='https://raw.githubusercontent.com/tomasko126/easylistczechandslovak/master/filters.txt'
['thirdparties/raw.githubusercontent.com/wiltteri/wiltteri.txt/master/wiltteri.txt']='https://raw.githubusercontent.com/wiltteri/wiltteri.txt/master/wiltteri.txt' ['thirdparties/raw.githubusercontent.com/wiltteri/wiltteri.txt/master/wiltteri.txt']='https://raw.githubusercontent.com/wiltteri/wiltteri.txt/master/wiltteri.txt'
['thirdparties/someonewhocares.org/hosts/hosts']='http://someonewhocares.org/hosts/hosts' ['thirdparties/someonewhocares.org/hosts/hosts']='http://someonewhocares.org/hosts/hosts'
['thirdparties/spam404bl.com/spam404scamlist.txt']='http://spam404bl.com/spam404scamlist.txt' ['thirdparties/spam404bl.com/spam404scamlist.txt']='https://spam404bl.com/spam404scamlist.txt'
['thirdparties/stanev.org/abp/adblock_bg.txt']='http://stanev.org/abp/adblock_bg.txt' ['thirdparties/stanev.org/abp/adblock_bg.txt']='http://stanev.org/abp/adblock_bg.txt'
['thirdparties/winhelp2002.mvps.org/hosts.txt']='http://winhelp2002.mvps.org/hosts.txt' ['thirdparties/winhelp2002.mvps.org/hosts.txt']='http://winhelp2002.mvps.org/hosts.txt'
['thirdparties/www.fanboy.co.nz/enhancedstats.txt']='https://www.fanboy.co.nz/enhancedstats.txt' ['thirdparties/www.fanboy.co.nz/enhancedstats.txt']='https://www.fanboy.co.nz/enhancedstats.txt'

3
src/js/background.js
View file

@ -74,8 +74,7 @@ return {
'behind-the-scene', 'behind-the-scene',
'chrome-extension-scheme', 'chrome-extension-scheme',
'chrome-scheme', 'chrome-scheme',
'opera-scheme', 'opera-scheme'
''
].join('\n').trim(), ].join('\n').trim(),
localSettings: { localSettings: {