Skip to content

Commit 9abb740

Browse files
committed
Merge tag 'v2.8.1' into feat/brave-build-with-chrome-sockets
2 parents b441d27 + 78ff3da commit 9abb740

File tree

7 files changed

+744
-34
lines changed

7 files changed

+744
-34
lines changed

add-on/_locales/no/messages.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"description": "A label for IPFS icon (panel_headerIpfsNodeIconLabel)"
99
},
1010
"panel_headerActiveToggleTitle": {
11-
"message": "Toggle all IPFS integrations",
11+
"message": "Toggle alle IPFS integrasjoner",
1212
"description": "A label for an embedded IPFS node (panel_headerActiveToggleTitle)"
1313
},
1414
"panel_statusOffline": {

add-on/_locales/pt_BR/messages.json

+586
Large diffs are not rendered by default.

add-on/manifest.common.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"manifest_version": 2,
33
"name": "__MSG_manifest_extensionName__",
44
"short_name": "__MSG_manifest_shortExtensionName__",
5-
"version": "2.8.0",
5+
"version": "2.8.1",
66
"description": "__MSG_manifest_extensionDescription__",
77
"homepage_url": "https://github.com/ipfs-shipyard/ipfs-companion",
88
"author": "IPFS Community",

ci/firefox/update.json

+10
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,16 @@
4141
},
4242
"update_hash": "sha256:e85272bed95c522217149eea2eca230b4cd01ee6e5f093dec50561dc4678e28c",
4343
"update_link": "https://github.com/ipfs-shipyard/ipfs-companion/releases/download/v2.7.5.762/ipfs_companion_beta_build-2.7.5.762-an+fx.xpi"
44+
},
45+
{
46+
"version": "2.8.0.770",
47+
"applications": {
48+
"gecko": {
49+
"strict_min_version": "60"
50+
}
51+
},
52+
"update_hash": "sha256:c67fa3bc2b96d9c11dc35be15a0aee076fced751e771ec106b67a2d756cde1c1",
53+
"update_link": "https://github.com/ipfs-shipyard/ipfs-companion/releases/download/v2.8.0.770/ipfs_companion_beta_build-2.8.0.770-an+fx.xpi"
4454
}
4555
]
4656
}

docs/developer-notes.md

+2
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ Each `npm` task can be run separately, but for most of time `dev-build`, `test`
7777
- `npm run lint:standard` -- run [standard](http://standardjs.com) linter ([IPFS JavaScript projects default to standard code style](https://github.com/ipfs/community/blob/master/js-code-guidelines.md#linting--code-style))
7878
- `npm run lint:web-ext` -- run [addons-linter](https://github.com/mozilla/addons-linter) shipped with `web-ext` tool
7979
- `npm run firefox` -- run as temporary add-on in Firefox
80+
- `npm run get-firefox-nightly` -- fetch latest Firefox Nightly to `./firefox/`
81+
- `npm run firefox:beta:add -- --update-link "https://host/path/to/file.xpi" file.xpi` -- add a manifest entry for new self-hosted Beta for Firefox
8082

8183
Release build shortcuts:
8284
- `npm run dev-build` -- all-in-one: fast dependency install, build with yarn (updates yarn.lock if needed)

package.json

+6-3
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
"precommit": "run-s lint:standard",
5151
"prepush": "run-s clean build lint test",
5252
"firefox": "web-ext run --url about:debugging",
53+
"firefox:beta:add": "faauv --update ci/firefox/update.json ",
5354
"get-firefox-nightly": "shx test -e ./firefox/firefox || get-firefox -b nightly -e",
5455
"changelog": "npx conventional-changelog-cli -p angular -i CHANGELOG.md -s",
5556
"ci": "run-s ci:*",
@@ -65,10 +66,11 @@
6566
"private": true,
6667
"preferGlobal": false,
6768
"resolutions": {
68-
"stream-http": "3.0.0",
69-
"multiaddr": "6.0.3",
7069
"hapi": "https://github.com/lidel/hapi/tarball/0961606e2c7dca8eceda765bd31ec2cb58358382/hapi.tar.gz",
71-
"pino": "https://github.com/pinojs/pino/tarball/d4d291cd271af969716ac40afce2ddecc7f3d9fa/pino.tar.gz"
70+
"pino": "https://github.com/pinojs/pino/tarball/d4d291cd271af969716ac40afce2ddecc7f3d9fa/pino.tar.gz",
71+
"iso-stream-http": "0.1.2",
72+
"stream-http": "npm:[email protected]",
73+
"multiaddr": "6.0.6"
7274
},
7375
"devDependencies": {
7476
"@babel/core": "7.3.4",
@@ -79,6 +81,7 @@
7981
"cross-env": "5.2.0",
8082
"download-cli": "1.1.1",
8183
"fakefile": "0.0.9",
84+
"firefox-addons-add-update-version": "https://github.com/lidel/firefox-addons-add-update-version/tarball/7901bf69b4ed122a20cd5e10ed7f8dae9b00dde7/firefox-addons-add-update-version.tar.gz",
8285
"fs-promise": "2.0.3",
8386
"get-firefox": "2.2.1",
8487
"husky": "1.3.1",

0 commit comments

Comments
 (0)