Skip to content

Commit 60700a7

Browse files
zoraconzoracon
committed
Merge branch 'master' of github.com:EFForg/https-everywhere
2 parents 413540c + ac68bb3 commit 60700a7

File tree

142 files changed

+3047
-2927
lines changed

Some content is hidden

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

142 files changed

+3047
-2927
lines changed

‎.github/actions/https-everywhere-labeller/package-lock.json‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎chromium/.eslintignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
external/*
1+
external/

‎chromium/.eslintrc.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"webextensions": true
66
},
77
"parserOptions": {
8-
"ecmaVersion": 2017,
8+
"ecmaVersion": 2019,
99
"sourceType": "script"
1010
},
1111
"rules": {

‎chromium/package-lock.json‎

Lines changed: 116 additions & 75 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎chromium/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
"btoa": "^1.1.2",
1010
"chai": "^4.2.0",
1111
"coveralls": "^3.1.0",
12-
"codemirror": "~5.31.0",
13-
"fetch-mock": "^6.3.0",
12+
"codemirror": "~5.58.1",
13+
"fetch-mock": "^9.10.7",
1414
"mocha": "^8.1.1",
1515
"nan": "^2.14.1",
1616
"node-webcrypto-ossl": "^1.0.49",
1717
"nyc": "^15.1.0",
1818
"pako": "~1.0.5",
1919
"sinon": "^9.0.2",
20-
"sinon-chrome": "^2.3.1",
20+
"sinon-chrome": "^3.0.1",
2121
"text-encoding": "^0.7.0"
2222
},
2323
"scripts": {

‎chromium/pages/cancel/index.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ <h1 id="https-everywhere">
1818
<p id="url-paragraph">
1919
<span id="url-label">URL: </span><span id="url-value"></span>
2020
</p>
21+
<button id="copy-url" data-i18n="cancel_copy_url"></button>
2122

2223
<div class="actions">
2324
<button id="open-url-button" data-i18n="cancel_open_page"></button>

0 commit comments

Comments
 (0)