Skip to content

Commit 6743ee4

Browse files
jshajsha
committed
Merge branch 'master' into faster-build
2 parents 18baa73 + a77774f commit 6743ee4

File tree

473 files changed

+7166
-4318
lines changed

Some content is hidden

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

473 files changed

+7166
-4318
lines changed

‎chromium/manifest.json‎

Lines changed: 2 additions & 2 deletions
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.28"
44-
}
43+
"version": "2015.7.15"
44+
}

‎https-everywhere-checker‎

‎https-everywhere-tests/README.md‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ implement them as automated tests:
2626
ruleset is disabled.
2727
- Click HTTP Everywhere icon, click ruleset again.
2828
- Reopen HTTPS Everywhere icon menu, verify ruleset shows up in green.
29-
- Click HTTPS Everywhere icon menu, click 'Enable / disable rules'. This will
30-
freeze up the browser for a few seconds. Verify it eventually opens up a
31-
dialog box listing all rules.
3229
- Right-click on a rule, click 'View XML source.' Verify it opens up a dialog
3330
box and shows the rule source.
3431
- Click HTTPS Everywhere icon menu, click 'Block all HTTP requests'. Verify icon

‎src/Changelog‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
Chrome-2015.7.15
2+
* Fix a broken ruleset that caused Chrome version to fail to rewrite all URLs.
3+
4+
Firefox 5.0.6 / Chrome-2015.7.13
5+
* Ruleset fixes
6+
* Move options from "Enable / Disable rules" into icon menu
7+
* EFF 25th birthday edition!
8+
19
Firefox 5.0.5 / Chrome-2015.5.28
210
* Ruleset fixes
311
* Fix ordering of locales to default to English again.

‎src/chrome/content/about.js‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
const CC = Components.classes;
2+
3+
function window_opener(uri) {
4+
// we don't use window.open, because we need to work around TorButton's state control
5+
if(typeof gBrowser == "undefined"){
6+
var window = CC["@mozilla.org/appshell/window-mediator;1"].getService(Components.interfaces.nsIWindowMediator);
7+
var browserWindow = window.getMostRecentWindow("navigator:browser").getBrowser();
8+
var newTab = browserWindow.addTab(uri, null, null);
9+
browserWindow.selectedTab = newTab;
10+
11+
}
12+
else
13+
gBrowser.selectedTab = gBrowser.addTab(uri);
14+
}

‎src/chrome/content/about.xul‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
align="center">
1515

1616
<script type="application/x-javascript"
17-
src="chrome://https-everywhere/content/preferences.js"/>
17+
src="chrome://https-everywhere/content/about.js"/>
1818
<vbox style="overflow:auto" flex="1">
1919
<label style="text-align:center; font-weight:bold; font-size:22px;">&https-everywhere.about.ext_name;</label>
2020
<label style="text-align:center; font-size:18px; margin-bottom:10px;">&https-everywhere.about.ext_description;</label>
@@ -38,7 +38,7 @@
3838

3939
<groupbox>
4040
<caption label="&https-everywhere.about.version;" />
41-
<label>5.0.5</label>
41+
<label>5.0.6</label>
4242
</groupbox>
4343

4444
<groupbox>

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,20 +98,21 @@ ApplicableList.prototype = {
9898
var text = strings.getString("https-everywhere.menu.globalDisable");
9999
if(!https_everywhere.prefs.getBoolPref("globalEnabled"))
100100
text = strings.getString("https-everywhere.menu.globalEnable");
101-
101+
102102
enableLabel.setAttribute('label', text);
103-
enableLabel.setAttribute('command', 'https-everywhere-menuitem-globalEnableToggle');
103+
enableLabel.setAttribute('command', 'https-everywhere-menuitem-globalEnableToggle');
104104
this.prepend_child(enableLabel);
105-
105+
106106
// add the label at the top
107107
var any_rules = false;
108108
for(var x in this.all) {
109109
any_rules = true; // how did JavaScript get this ugly?
110110
break;
111111
}
112+
// This label just describes the fact that the items underneath it enable
113+
// and disable rules.
112114
var label = document.createElement('menuitem');
113115
label.setAttribute('label', strings.getString('https-everywhere.menu.enableDisable'));
114-
label.setAttribute('command', 'https-everywhere-menuitem-preferences');
115116
var label2 = false;
116117
if (!any_rules) {
117118
label2 = document.createElement('menuitem');

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

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

‎src/chrome/content/preferences.css‎

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

‎src/chrome/content/preferences.js‎

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

0 commit comments

Comments
 (0)