Skip to content

Commit 1282253

Browse files
jshajsha
committed
Merge tag '5.0.5' into stable
5.0.5
2 parents 07365c6 + 01a5961 commit 1282253

135 files changed

Lines changed: 2590 additions & 479 deletions

File tree

Some content is hidden

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

‎Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ prerelease: pkg
99
pkg:
1010
mkdir pkg
1111
clean:
12+
rm -rf pkg/xpi-amo/ pkg/xpi-eff/
1213
rm -f pkg/*.xpi
1314
rm -f src/chrome/content/rules/default.rulesets
1415
rm -f src/defaults/rulesets.sqlite

‎chromium/manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,5 @@
4040
"<all_urls>"
4141
],
4242
"update_url": "https://www.eff.org/files/https-everywhere-chrome-updates.xml",
43-
"version": "2015.5.12"
43+
"version": "2015.5.28"
4444
}

‎src/Changelog‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
Firefox 5.0.5 / Chrome-2015.5.28
2+
* Ruleset fixes
3+
* Fix ordering of locales to default to English again.
4+
5+
Firefox 5.0.4 / Chrome-2015.5.12
6+
* Ruleset fixes
7+
18
Firefox 5.0.3 / Chrome-2015.4.23
29
* Ruleset fixes
310

‎src/chrome.manifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
content https-everywhere chrome/content/
22
override chrome://https-everywhere/content/rulesets.sqlite defaults/rulesets.sqlite
33

4+
locale https-everywhere en chrome/locale/en/
45
locale https-everywhere ar chrome/locale/ar/
56
locale https-everywhere bg chrome/locale/bg/
67
locale https-everywhere ca chrome/locale/ca/
78
locale https-everywhere cs chrome/locale/cs/
89
locale https-everywhere da chrome/locale/da/
910
locale https-everywhere de chrome/locale/de/
1011
locale https-everywhere el chrome/locale/el/
11-
locale https-everywhere en chrome/locale/en/
1212
locale https-everywhere en-GB chrome/locale/en_GB/
1313
locale https-everywhere es chrome/locale/es/
1414
locale https-everywhere et chrome/locale/et/

‎src/chrome/content/about.xul‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
<groupbox>
2323
<caption label="&https-everywhere.about.version;" />
24-
<label>5.0.4</label>
24+
<label>5.0.5</label>
2525
</groupbox>
2626

2727
<groupbox>

‎src/chrome/content/code/X509ChainWhitelist.js‎

Lines changed: 136 additions & 136 deletions
Large diffs are not rendered by default.

‎src/chrome/content/rules/AFUL.org.xml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<!--
2+
Fully covered hosts in *aful.org:
3+
4+
- (www.)?
5+
- listes
6+
7+
-->
8+
<ruleset name="AFUL.org">
9+
10+
<!-- Direct rewrites:
11+
-->
12+
<target host="aful.org" />
13+
<target host="listes.aful.org" />
14+
<target host="www.aful.org" />
15+
16+
17+
<rule from="^http:"
18+
to="https:" />
19+
20+
</ruleset>

‎src/chrome/content/rules/Aarhus.dk.xml‎

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

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

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,22 @@
11
<!--
2+
Fully covered hosts in *addtoany.com:
3+
4+
- (www.)?
5+
- static
6+
7+
28
These altnames don't exist:
39
410
- www.static.addtoany.com
511
612
-->
7-
<ruleset name="AddToAny">
13+
<ruleset name="AddToAny.com">
814

15+
<!-- Direct rewrites:
16+
-->
917
<target host="addtoany.com" />
10-
<target host="*.addtoany.com" />
18+
<target host="static.addtoany.com" />
19+
<target host="www.addtoany.com" />
1120

1221

1322
<!-- Set by static:
@@ -17,7 +26,7 @@
1726
<securecookie host="^(?:\.static)?\.addtoany\.com$" name=".+" />
1827

1928

20-
<rule from="^http://(static\.|www\.)?addtoany\.com/"
21-
to="https://$1addtoany.com/" />
29+
<rule from="^http:"
30+
to="https:" />
2231

2332
</ruleset>

‎src/chrome/content/rules/Adme.ru.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<!--
2+
Fully covered hosts in *adme.ru:
3+
4+
- ^
5+
- files8
6+
7+
-->
8+
<ruleset name="adme.ru (partial)">
9+
10+
<!-- Direct rewrites:
11+
-->
12+
<target host="adme.ru" />
13+
<target host="files8.adme.ru" />
14+
15+
16+
<rule from="^http:"
17+
to="https:" />
18+
19+
</ruleset>

0 commit comments

Comments
 (0)