Merge tag 'v2.8.1' into feat/brave-build-with-chrome-sockets

add-on/_locales/no/messages.json

@@ -8,7 +8,7 @@
     "description": "A label for IPFS icon (panel_headerIpfsNodeIconLabel)"
   },
   "panel_headerActiveToggleTitle": {
-    "message": "Toggle all IPFS integrations",
+    "message": "Toggle alle IPFS integrasjoner",
     "description": "A label for an embedded IPFS node (panel_headerActiveToggleTitle)"
   },
   "panel_statusOffline": {

add-on/manifest.common.json

@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "__MSG_manifest_extensionName__",
   "short_name": "__MSG_manifest_shortExtensionName__",
-  "version": "2.8.0",
+  "version": "2.8.1",
   "description": "__MSG_manifest_extensionDescription__",
   "homepage_url": "https://github.com/ipfs-shipyard/ipfs-companion",
   "author": "IPFS Community",

ci/firefox/update.json

@@ -41,6 +41,16 @@
                     },
                     "update_hash": "sha256:e85272bed95c522217149eea2eca230b4cd01ee6e5f093dec50561dc4678e28c",
                     "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"
+                },
+                {
+                    "version": "2.8.0.770",
+                    "applications": {
+                        "gecko": {
+                            "strict_min_version": "60"
+                        }
+                    },
+                    "update_hash": "sha256:c67fa3bc2b96d9c11dc35be15a0aee076fced751e771ec106b67a2d756cde1c1",
+                    "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"
                 }
             ]
         }

docs/developer-notes.md

@@ -77,6 +77,8 @@ Each `npm` task can be run separately, but for most of time `dev-build`, `test`
 - `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))
 - `npm run lint:web-ext` -- run [addons-linter](https://github.com/mozilla/addons-linter) shipped with `web-ext` tool
 - `npm run firefox` -- run as temporary add-on in Firefox
+- `npm run get-firefox-nightly` -- fetch latest Firefox Nightly to `./firefox/`
+- `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
 
 Release build shortcuts:
 - `npm run dev-build` -- all-in-one: fast dependency install, build with yarn (updates yarn.lock if needed)

package.json

@@ -50,6 +50,7 @@
     "precommit": "run-s lint:standard",
     "prepush": "run-s clean build lint test",
     "firefox": "web-ext run --url about:debugging",
+    "firefox:beta:add": "faauv --update ci/firefox/update.json ",
     "get-firefox-nightly": "shx test -e ./firefox/firefox || get-firefox -b nightly -e",
     "changelog": "npx conventional-changelog-cli -p angular -i CHANGELOG.md -s",
     "ci": "run-s ci:*",
@@ -65,10 +66,11 @@
   "private": true,
   "preferGlobal": false,
   "resolutions": {
-    "stream-http": "3.0.0",
-    "multiaddr": "6.0.3",
     "hapi": "https://github.com/lidel/hapi/tarball/0961606e2c7dca8eceda765bd31ec2cb58358382/hapi.tar.gz",
-    "pino": "https://github.com/pinojs/pino/tarball/d4d291cd271af969716ac40afce2ddecc7f3d9fa/pino.tar.gz"
+    "pino": "https://github.com/pinojs/pino/tarball/d4d291cd271af969716ac40afce2ddecc7f3d9fa/pino.tar.gz",
+    "iso-stream-http": "0.1.2",
+    "stream-http": "npm:iso-stream-http@0.1.2",
+    "multiaddr": "6.0.6"
   },
   "devDependencies": {
     "@babel/core": "7.3.4",
@@ -79,6 +81,7 @@
     "cross-env": "5.2.0",
     "download-cli": "1.1.1",
     "fakefile": "0.0.9",
+    "firefox-addons-add-update-version": "https://github.com/lidel/firefox-addons-add-update-version/tarball/7901bf69b4ed122a20cd5e10ed7f8dae9b00dde7/firefox-addons-add-update-version.tar.gz",
     "fs-promise": "2.0.3",
     "get-firefox": "2.2.1",
     "husky": "1.3.1",