Skip to content
This repository was archived by the owner on Nov 6, 2023. It is now read-only.

Commit 0bad2d5

Browse files
zoraconzoracon
committed
Merge branch 'master' of github.com:EFForg/https-everywhere
2 parents df48bc3 + 0784165 commit 0bad2d5

File tree

13 files changed

+126
-189
lines changed

13 files changed

+126
-189
lines changed

‎chromium/images/banner-red.png‎

-14.1 KB
Binary file not shown.

‎chromium/images/banner-red.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎chromium/pages/cancel/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<body>
1111
<div class="content">
1212
<h1 id="https-everywhere">
13-
<img src="/images/banner-red.png" alt="HTTPS Everywhere">
13+
<img src="/images/banner-red.svg" alt="HTTPS Everywhere">
1414
</h1>
1515

1616
<p data-i18n="cancel_he_blocking_explainer"></p>

‎chromium/pages/cancel/style.css‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,23 @@ button:last-child {
5555
margin: 8px 0;
5656
}
5757
}
58+
59+
@media (prefers-color-scheme: dark) {
60+
body {
61+
background-color: #202023;
62+
color: #f9f9fa;
63+
}
64+
65+
a {
66+
color: #45a1ff;
67+
}
68+
69+
button {
70+
color: #202023;
71+
}
72+
73+
button:hover {
74+
background-color: #202023;
75+
border-color: #ec1e1e;
76+
}
77+
}

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

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,47 @@
11
<!--
2-
For other BBC coverage, see BBC.xml.
2+
Non-functional hosts
3+
Timeout was reached:
4+
- help.store.bbc.com
5+
6+
SSL peer certificate was not OK:
7+
- pages.email.bbc.com
8+
- pages.emails.bbc.com
9+
- pages.storeuk.bbc.com
10+
11+
Incomplete certificate chain error:
12+
- dialin.bbc.com
13+
- meet.bbc.com
14+
- r1.bbc.com
15+
- webmail.bbc.com
16+
17+
Redirect to HTTP:
18+
- www.bbc.com
19+
- /culture/
20+
- /travel/
321
-->
422
<ruleset name="BBC.com (partial)">
523
<target host="bbc.com" />
624
<target host="www.bbc.com" />
25+
<!-- See #19012 -->
26+
<exclusion pattern="^http://www\.bbc\.com/culture/" />
27+
<test url="http://www.bbc.com/culture/story/20200227-japans-unexpected-relationship-with-reggae" />
28+
<test url="http://www.bbc.com/culture/story/20200301-nine-tv-shows-to-watch-in-march" />
29+
<test url="http://www.bbc.com/culture/story/20200309-the-soft-power-roots-of-k-pop" />
30+
<exclusion pattern="^http://www\.bbc\.com/travel/" />
31+
<test url="http://www.bbc.com/travel/" />
32+
<test url="http://www.bbc.com/travel/story/20200308-japans-ancient-way-to-save-the-planet" />
33+
<test url="http://www.bbc.com/travel/story/20200309-ogopogo-the-monster-lurking-in-okanagan-lake" />
34+
<target host="information-syndication.api.bbc.com" />
35+
<target host="ssc.api.bbc.com" />
36+
<target host="beta.bbc.com" />
37+
<target host="developer.bbc.com" />
38+
<target host="emp.bbc.com" />
39+
<target host="player.bbc.com" />
740
<target host="ssl.bbc.com" />
41+
<target host="shop.bbc.com" />
42+
<target host="ca.shop.bbc.com" />
43+
<target host="store.bbc.com" />
44+
<target host="www.test.bbc.com" />
845

946
<rule from="^http:" to="https:" />
1047
</ruleset>

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<!--
2+
Mismatched:
3+
- www
4+
-->
5+
<ruleset name="ImprovedTube.com">
6+
<target host="improvedtube.com" />
7+
<target host="www.improvedtube.com" />
8+
9+
<rule from="^http://www\.improvedtube\.com/" to="https://improvedtube.com/" />
10+
<rule from="^http:" to="https:" />
11+
</ruleset>

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<!--
2+
Non-functional hosts
3+
SSL peer certificate was not OK:
4+
- media.mediapost.com
5+
-->
6+
<ruleset name="MediaPost.com (partial)">
7+
<target host="mediapost.com" />
8+
<target host="www.mediapost.com" />
9+
10+
<rule from="^http:" to="https:" />
11+
</ruleset>

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

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎src/chrome/content/rules/NYTimes-Problematic.xml‎

Lines changed: 0 additions & 140 deletions
This file was deleted.

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

Lines changed: 31 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<!--
22
Other New York Times rulesets:
3-
- NYTimes-Problematic.xml
43
- NewYorkTimes.com.xml
54
- NYT.com.xml
65
- NYT_cn.me.xml
@@ -25,16 +24,15 @@
2524
ʳ Refused
2625
2726
Problematic hosts in *nytimes.com:
28-
- ads ʰ
29-
- assets ¹
30-
- documents ᵐ
27+
- content.api ᶜ
28+
- beta620 ʰ
29+
- developers ᶜ
3130
- elections ᵐ
32-
- jobs ᶜ
31+
- www.global ᵐ
3332
- json8 ʰ
33+
- travels ʰ
3434
- wt.o ᵐ
3535
- pimage.timespeople ¹
36-
- query ²
37-
- travel ᵈ
3836
¹ AmazonAWS / mismatched
3937
ᶜ Missing certificate chain
4038
ᵈ Dropped, preemptable redirect
@@ -45,42 +43,57 @@
4543
4644
Too many redirects:
4745
homedelivery.nytimes.com
48-
regilite.nytimes.com
49-
50-
Problematic hosts in *nytimesathome.com:
51-
- ^ ᵐ
52-
- www ᵐ
5346
5447
-->
5548
<ruleset name="NYTimes">
5649
<target host="nytimes.com" />
50+
<target host="www.nytimes.com" />
51+
52+
<target host="ads.nytimes.com" />
5753
<target host="messaging-notifications.api.nytimes.com" />
5854
<test url="http://messaging-notifications.api.nytimes.com/svc/message/v1/list/global.json" />
59-
<target host="assets-origin.nytimes.com" />
60-
<test url="http://assets-origin.nytimes.com/analytics/tagx-simple.min.js" />
61-
<target host="beta620.nytimes.com" />
55+
56+
<target host="firstlook.blogs.nytimes.com" />
57+
<target host="lens.blogs.nytimes.com" />
58+
<target host="newoldage.blogs.nytimes.com" />
59+
6260
<target host="cn.nytimes.com" />
61+
6362
<target host="dealbook.nytimes.com" />
64-
<target host="developer.nytimes.com" />
6563
<target host="developers.nytimes.com" />
64+
<target host="documents.nytimes.com" />
65+
6666
<target host="et.nytimes.com" />
67-
<target host="global.nytimes.com" />
67+
6868
<target host="graphics.nytimes.com" />
6969
<test url="http://graphics.nytimes.com/subscriptions/components/img/icons/icons_gift.png" />
7070
<target host="graphics8.nytimes.com" />
7171
<test url="http://graphics8.nytimes.com/bi/js/tagx/tagx.js" />
7272
<test url="http://graphics8.nytimes.com/css/common/global.css" />
7373
<test url="http://graphics8.nytimes.com/images/blogs_v5/artsbeat/artsbeat_main.png" />
7474
<test url="http://graphics8.nytimes.com/images/misc/nytlogo153x23.gif" />
75+
7576
<target host="international.nytimes.com" />
77+
78+
<target host="jobs.nytimes.com" />
79+
<target host="jobmarket.nytimes.com" />
80+
7681
<target host="meter-svc.nytimes.com" />
7782
<target host="myaccount.nytimes.com" />
7883
<target host="markets.on.nytimes.com" />
7984
<test url="http://markets.on.nytimes.com/research/Net/SectionFrontAPI/MarketModuleData/jsonp" />
85+
<target host="mwcm.nytimes.com" />
86+
87+
<target host="purr.nytimes.com" />
88+
<target host="query.nytimes.com" />
89+
<target host="regilite.nytimes.com" />
90+
91+
<target host="samizdat-graphql.nytimes.com" />
8092
<target host="static.nytimes.com" />
93+
8194
<target host="typeface.nytimes.com" />
95+
8296
<target host="up.nytimes.com" />
83-
<target host="tagx.nytimes.com" />
8497

8598
<securecookie host=".+" name=".+" />
8699

0 commit comments

Comments
 (0)