Skip to content

Commit 0953898

Browse files
committed
Merge branch 'better-change-detection' into fix-aws
2 parents 2ce49a1 + 54a2274 commit 0953898

Some content is hidden

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

66 files changed

+14925
-84
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,3 @@ env:
1717
- DISPLAY=':99.0'
1818
script:
1919
- ./test.sh
20-
- ./test-ruleset-coverage.sh

chromium/popup.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<h1 i18n="about_ext_name"></h1>
1616
</header>
1717
<section>
18-
<a href="#" id="add-rule-link">Add this site</a>
18+
<a href="#" id="add-rule-link">Add a rule for this site</a>
1919
<div id="add-new-rule-div" style="display:none">
20-
<h3> Add a new rule</h3>
20+
<h3> Add a new rule for this site</h3>
2121
<p>Always use https for this host.
2222
<label for="new-rule-host">Host:</label> <br><input size="50" id="new-rule-host" type="text" disabled><br>
2323

src/chrome/content/rules/0x539-dev-group.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Fetch error: http://gobby.0x539.de/ => https://gobby.0x539.de/: (7, 'Failed to c
1717
(www.)? doesn't exist.
1818
1919
-->
20-
<ruleset name="0x539 dev group (partial)">
20+
<ruleset name="0x539 dev group (partial)" default_off="Needs ruleset tests">
2121

2222
<target host="hosting.0x539.de" />
2323
<target host="gobby.0x539.de" />

src/chrome/content/rules/0xbadc0de.be.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
² Not secured by us <= mismatched
2828
2929
-->
30-
<ruleset name="0xbadc0de.be">
30+
<ruleset name="0xbadc0de.be" default_off="Needs ruleset tests">
3131

3232
<target host="0xbadc0de.be" />
3333
<target host="*.0xbadc0de.be" />

src/chrome/content/rules/123eHost.com.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Fetch error: http://drive7000.station030.com/ => https://drive7000.station030.co
1313
* Secured by us
1414
1515
-->
16-
<ruleset name="123eHost.com (partial)">
16+
<ruleset name="123eHost.com (partial)" default_off="Needs ruleset tests">
1717

1818
<target host="123ehost.com" />
1919
<target host="www.123ehost.com" />

src/chrome/content/rules/123systems.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Secured by us
77
88
-->
9-
<ruleset name="123systems.net (partial)">
9+
<ruleset name="123systems.net (partial)" default_off="Needs ruleset tests">
1010

1111
<target host="123systems.net" />
1212
<target host="www.123systems.net" />

src/chrome/content/rules/1984_Hosting.com.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
- www.1984hosting.com
1111
1212
-->
13-
<ruleset name="1984 Hosting.com">
13+
<ruleset name="1984 Hosting.com" default_off="Needs ruleset tests">
1414
<target host="1984hosting.com" />
1515
<target host="*.1984hosting.com" />
1616

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<!--
2+
A few style sheets are hardcoded as http:// and
3+
considered mixed content in Firefox and friends.
4+
This does not break the design though.
5+
-->
6+
7+
<ruleset name="Alternativet (partial)">
8+
<target host="alternativet.dk" />
9+
<target host="www.alternativet.dk" />
10+
11+
<rule from="^http:"
12+
to="https:"/>
13+
</ruleset>

src/chrome/content/rules/Auto.ro.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
³ Not secured by us <= mismatched
5858
5959
-->
60-
<ruleset name="Auto.ro (partial)">
60+
<ruleset name="Auto.ro (partial)" default_off="Needs ruleset tests">
6161

6262
<target host="auto.ro" />
6363
<target host="www.auto.ro" />

0 commit comments

Comments
 (0)