Skip to content

Commit 049b909

Browse files
jshajsha
committed
Merge branch 'master' into merge-4.0b
2 parents 895e535 + af3e2ef commit 049b909

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+1001
-94
lines changed

‎checkout‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎src/chrome/content/rules/8chan.co.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<ruleset name="8chan">
2+
<target host="8chan.co" />
3+
<target host="jp.8chan.co" />
4+
<target host="media.8chan.co" />
5+
6+
<rule from="^http://(www\.)?8chan\.co/" to="https://8chan.co/"/>
7+
<rule from="^http://jp\.8chan\.co/" to="https://jp.8chan.co/"/>
8+
<rule from="^http://media\.8chan\.co/" to="https://media.8chan.co/"/>
9+
</ruleset>

‎src/chrome/content/rules/American-Chemical-Society.xml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<!--
2+
American Chemical Society
3+
24
For problematic rules, see American_Chemical_Society-problematic.xml.
35
46
@@ -10,6 +12,9 @@
1012
Nonfunctional domains:
1113
1214
- cenm.ag (replies with http)
15+
- tog ²
16+
17+
² Shows another domain
1318
1419
1520
Problematic subdomains:
@@ -26,6 +31,7 @@
2631
Fully covered subdomains:
2732
2833
- (www.)
34+
- acswebcontent
2935
- assets
3036
- www.awards
3137
- www.awardstest
@@ -60,7 +66,7 @@
6066
- www.yellowbook
6167
6268
-->
63-
<ruleset name="American Chemical Society (partial)">
69+
<ruleset name="ACS.org (partial)">
6470

6571
<target host="acs.org" />
6672
<target host="*.acs.org" />
@@ -70,7 +76,7 @@
7076
<securecookie host="^(?!pu)(?:.*\.)?acs\.org$" name=".+" />
7177

7278

73-
<rule from="^http://((?:cen|communities(?:test)?|eweb|(?:www\.)?(?:emailpref|join)|portal|pubs|www(?:(?:(?:awards|fellowselection|giving|nominate|profed|register)(?:test)?|akzonobel|ccedlookup|donate|meetings|membernumberlookup|ncwlookup|nominatefellow|pubsbenefits|renew|store|yellowbook)\.)?)\.)?acs\.org/"
79+
<rule from="^http://((?:acswebcontent|cen|communities(?:test)?|eweb|(?:www\.)?(?:emailpref|join)|portal|pubs|www(?:(?:(?:awards|fellowselection|giving|nominate|profed|register)(?:test)?|akzonobel|ccedlookup|donate|meetings|membernumberlookup|ncwlookup|nominatefellow|pubsbenefits|renew|store|yellowbook)\.)?)\.)?acs\.org/"
7480
to="https://$1acs.org/" />
7581

7682
<rule from="^https?://assets(?:test)?\.acs\.org/"
@@ -79,4 +85,4 @@
7985
<rule from="^https?://(?:www\.)?ewebtest\.acs\.org/"
8086
to="https://www.ewebtest.acs.org/" />
8187

82-
</ruleset>
88+
</ruleset>

‎src/chrome/content/rules/American_Chemical_Society-problematic.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
Cookies are handled there.
66
77
-->
8-
<ruleset name="American Chemistry Society (problematic)" default_off="mismatched">
8+
<ruleset name="ACS.org (problematic)" default_off="mismatched">
99

1010
<target host="chemistryjobs.acs.org" />
1111

1212

1313
<rule from="^http://chemistryjobs\.acs\.org/"
1414
to="https://chemistryjobs.acs.org/" />
1515

16-
</ruleset>
16+
</ruleset>

‎src/chrome/content/rules/Angular-Gantt.com.xml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<!--
2+
NB: Tor users cannot view* this website due to CloudFlare settings.
3+
4+
See:
5+
6+
- https://blog.torproject.org/blog/call-arms-helping-internet-services-accept-anonymous-users
7+
- https://support.cloudflare.com/hc/en-us/articles/203306930-Does-CloudFlare-block-Tor-
8+
- https://support.cloudflare.com/hc/en-us/articles/200170206-How-do-I-turn-I-m-Under-Attack-mode-on-
9+
10+
* without enabling javascript, for security and privacy implications see e.g.:
11+
12+
- https://www.mozilla.org/security/known-vulnerabilities/firefox.html
13+
- https://trac.torproject.org/projects/tor/query?status=!closed&keywords=~tbb-fingerprinting
14+
- https://panopticlick.eff.org
15+
16+
-->
17+
<ruleset name="Angular-Gantt.com">
18+
19+
<target host="angular-gantt.com" />
20+
<target host="*.angular-gantt.com" />
21+
22+
23+
<securecookie host="^\.angular-gantt\.com$" name=".+" />
24+
25+
26+
<rule from="^http://(www\.)?angular-gantt\.com/"
27+
to="https://$1angular-gantt.com/" />
28+
29+
</ruleset>

‎src/chrome/content/rules/BTC-E.xml‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
<!--
2+
NB: Tor users cannot view* this website due to CloudFlare settings.
3+
4+
See:
5+
6+
- https://blog.torproject.org/blog/call-arms-helping-internet-services-accept-anonymous-users
7+
- https://support.cloudflare.com/hc/en-us/articles/203306930-Does-CloudFlare-block-Tor-
8+
- https://support.cloudflare.com/hc/en-us/articles/200170206-How-do-I-turn-I-m-Under-Attack-mode-on-
9+
10+
* without enabling javascript, for security and privacy implications see e.g.:
11+
12+
- https://www.mozilla.org/security/known-vulnerabilities/firefox.html
13+
- https://trac.torproject.org/projects/tor/query?status=!closed&keywords=~tbb-fingerprinting
14+
- https://panopticlick.eff.org
15+
16+
-->
117
<ruleset name="BTC-E">
218

319
<target host="btc-e.com" />
@@ -10,4 +26,4 @@
1026
<rule from="^http://(www\.)?btc-e\.com/"
1127
to="https://$1btc-e.com/" />
1228

13-
</ruleset>
29+
</ruleset>

‎src/chrome/content/rules/BeautifulDecay.com.xml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
<!--
2+
Nonfunctional subdomains:
3+
4+
- shop *
5+
6+
* Redirects to http
7+
8+
29
Mixed content:
310
411
- css, from:
@@ -13,7 +20,7 @@
1320
* Secured by us
1421
1522
-->
16-
<ruleset name="BeautifulDecay.com">
23+
<ruleset name="BeautifulDecay.com (partial)">
1724

1825
<target host="beautifuldecay.com" />
1926
<target host="*.beautifuldecay.com" />

‎src/chrome/content/rules/Bellingcat.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<ruleset name="Bellingcat">
2+
<target host="bellingcat.com" />
3+
<target host="www.bellingcat.com" />
4+
5+
<rule from="^https?://bellingcat\.com/"
6+
to="https://www.bellingcat.com/" />
7+
<rule from="^http://([^/:@]+)\.bellingcat\.com/"
8+
to="https://$1.bellingcat.com/" />
9+
</ruleset>

‎src/chrome/content/rules/Bettershopping.eu.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<ruleset name="Bettershopping.eu">
2+
<target host="bettershopping.eu" />
3+
<target host="www.bettershopping.eu" />
4+
5+
<rule from="^http://(www\.)?bettershopping\.eu/" to="https://www.bettershopping.eu/" />
6+
</ruleset>

‎src/chrome/content/rules/Bit.ly_vanity_domains.xml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@
1010
<target host="www.buff.ly" />
1111
<target host="bzfd.it" />
1212
<target host="www.bzfd.it" />
13+
<target host="cbsn.ws" />
14+
<target host="www.cbsn.ws" />
1315
<target host="on.cfr.org" />
1416
<target host="cnb.cx" />
1517
<target host="www.cnb.cx" />
1618
<!--
1719
$ redirects to custom domain:
1820
-->
19-
<exclusion pattern="^http://(?:www\.)?(?:bzfd\.it|cnb\.cx|glo\.bo|reut\.rs|zd\.net)/+(?!$|\?)" />
21+
<exclusion pattern="^http://(?:www\.)?(?:bzfd\.it|cbsn\.ws|cnb\.cx|glo\.bo|reut\.rs|zd\.net)/+(?!$|\?)" />
2022
<target host="cs.is" />
2123
<target host="curbed.cc" />
2224
<target host="www.curbed.cc" />
@@ -25,6 +27,8 @@
2527
<target host="do.co" />
2628
<target host="glo.bo" />
2729
<target host="www.glo.bo" />
30+
<target host="ift.tt" />
31+
<target host="www.ift.tt" />
2832
<target host="lat.ms" />
2933
<target host="mzl.la" />
3034
<target host="www.mzl.la" />
@@ -59,13 +63,16 @@
5963
<!--rule from="^http://(?:www\.)?bzfd\.it/+(?:$|\?.*)"
6064
to="https://buzzfeed.com/" /-->
6165

66+
<rule from="^http://(?:www\.)?ift\.tt/+(?:$|\?.*)"
67+
to="https://ifttt.com/" />
68+
6269
<rule from="^http://sched\.co/+(?:$|\?.*)"
6370
to="https://sched.org/" />
6471

6572
<rule from="^http://(?:www\.)?stanford\.io/+(?:$|\?.*)"
6673
to="https://www.stanford.edu/" />
6774

68-
<rule from="^http://(?:(?:www\.)?1tw\.org|4mn\.ca|a21\.tv|apne\.ws|bbc\.in|(?:www\.)?buff\.ly|(?:www\.)?bzfd\.it|on\.cfr\.org|(?:www\.)?cnb\.cx|cs\.is|(?:www\.)?curbed\.cc|dico\.im|do\.co|dly\.do|(?:www\.)?glo\.bo|lat\.ms|(?:www\.)?mzl\.la|n\.pr|nyti\.ms|to\.pbs\.org|(?:www\.)?rbl\.ms|(?:www\.)?reut\.rs|seati\.ms|sched\.co|slate\.me|(?:www\.)?stanford\.io|theatln\.tc|ucla\.in|ubm\.io|1\.usa\.gov|usat\.ly|wapo\.st|(?:www\.)?wcas\.nu|on\.wsj\.com|(?:www\.)?zd\.net)/"
75+
<rule from="^http://(?:(?:www\.)?1tw\.org|4mn\.ca|a21\.tv|apne\.ws|bbc\.in|(?:www\.)?buff\.ly|(?:www\.)?bzfd\.it|(?:www\.)?cbsn\.ws|on\.cfr\.org|(?:www\.)?cnb\.cx|cs\.is|(?:www\.)?curbed\.cc|dico\.im|do\.co|dly\.do|(?:www\.)?glo\.bo|(?:www\.)?ift\.tt|lat\.ms|(?:www\.)?mzl\.la|n\.pr|nyti\.ms|to\.pbs\.org|(?:www\.)?rbl\.ms|(?:www\.)?reut\.rs|seati\.ms|sched\.co|slate\.me|(?:www\.)?stanford\.io|theatln\.tc|ucla\.in|ubm\.io|1\.usa\.gov|usat\.ly|wapo\.st|(?:www\.)?wcas\.nu|on\.wsj\.com|(?:www\.)?zd\.net)/"
6976
to="https://bit.ly/" />
7077

7178
</ruleset>

0 commit comments

Comments
 (0)