Skip to content

Commit

Permalink
Merge branch 'main' into feat/ux-protocol-handler
Browse files Browse the repository at this point in the history
  • Loading branch information
hacdias committed Sep 2, 2022
2 parents 270d60d + a4d3e90 commit 9c8b2b9
Show file tree
Hide file tree
Showing 57 changed files with 1,807 additions and 3,700 deletions.
51 changes: 37 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
name: ci
on: [push, pull_request]
on:
workflow_dispatch:
push:
branches:
- main
tags:
- '*'
pull_request:
branches:
- main

env:
XDG_CACHE_HOME: ${{ github.workspace }}/.cache
Expand All @@ -19,15 +28,22 @@ jobs:
with:
node-version: 'lts/*'

- name: Read ipfs-webui CID from package.json
id: read-webui-version
run: |
echo '::echo::on'
echo "::set-output name=cid::$(grep "build:webui:download" package.json | grep -Eio "bafy[a-z0-9]+")"
echo '::echo::off'
shell: bash
- name: Cache webui
uses: actions/cache@v2
uses: actions/cache@v3
id: webui-cache
with:
path: assets/webui
key: ${{ hashFiles('package.json') }} # webui CID is defined in this file
key: ${{ steps.read-webui-version.outputs.cid }}

- name: Cache bigger downloads
uses: actions/cache@v2
uses: actions/cache@v3
id: cache
if: steps.webui-cache.outputs.cache-hit != 'true'
with:
Expand All @@ -40,11 +56,10 @@ jobs:
- uses: ipfs/download-ipfs-distribution-action@v1
if: steps.webui-cache.outputs.cache-hit != 'true'
with:
name: go-ipfs
name: kubo
- uses: ipfs/start-ipfs-daemon-action@v1
if: steps.webui-cache.outputs.cache-hit != 'true'


- name: Install dependencies and fetch ipfs-webui
if: steps.webui-cache.outputs.cache-hit != 'true'
run: |
Expand Down Expand Up @@ -76,15 +91,19 @@ jobs:
with:
node-version: 'lts/*'

- name: Read ipfs-webui CID from package.json
id: read-webui-version
run: echo "::set-output name=cid::$(grep "build:webui:download" package.json | grep -Eio "bafy[a-z0-9]+")"
shell: bash
- name: Cache webui
uses: actions/cache@v2
uses: actions/cache@v3
id: webui-cache
with:
path: assets/webui
key: ${{ hashFiles('package.json') }}
key: ${{ steps.read-webui-version.outputs.cid }}

- name: Cache bigger downloads
uses: actions/cache@v2
uses: actions/cache@v3
id: cache
with:
path: ${{ github.workspace }}/.cache
Expand All @@ -96,7 +115,7 @@ jobs:
- uses: ipfs/download-ipfs-distribution-action@v1
if: steps.webui-cache.outputs.cache-hit != 'true'
with:
name: go-ipfs
name: kubo
- uses: ipfs/start-ipfs-daemon-action@v1
if: steps.webui-cache.outputs.cache-hit != 'true'

Expand Down Expand Up @@ -139,15 +158,19 @@ jobs:
with:
node-version: 'lts/*'

- name: Read ipfs-webui CID from package.json
id: read-webui-version
run: echo "::set-output name=cid::$(grep "build:webui:download" package.json | grep -Eio "bafy[a-z0-9]+")"
shell: bash
- name: Cache webui
uses: actions/cache@v2
uses: actions/cache@v3
id: webui-cache
with:
path: assets/webui
key: ${{ hashFiles('package.json') }}
key: ${{ steps.read-webui-version.outputs.cid }}

- name: Cache bigger downloads
uses: actions/cache@v2
uses: actions/cache@v3
id: cache
with:
path: ${{ github.workspace }}/.cache
Expand All @@ -159,7 +182,7 @@ jobs:
- uses: ipfs/download-ipfs-distribution-action@v1
if: steps.webui-cache.outputs.cache-hit != 'true'
with:
name: go-ipfs
name: kubo
- uses: ipfs/start-ipfs-daemon-action@v1
if: steps.webui-cache.outputs.cache-hit != 'true'

Expand Down
43 changes: 43 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,49 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [v0.23.0] - 2022-08-30

## What's Changed
* chore: i18n, CI, and dep updates by @lidel in https://github.com/ipfs/ipfs-desktop/pull/2214
* fix: quit if repository is part of private network by @hacdias in https://github.com/ipfs/ipfs-desktop/pull/2223
* chore(maintenance): remove addedApiPort after go-ipfs 0.13 by @hacdias in https://github.com/ipfs/ipfs-desktop/pull/2226
* fix: log correct error on spawn by @hacdias in https://github.com/ipfs/ipfs-desktop/pull/2225
* fix: use constants for withAnalytics keys by @hacdias in https://github.com/ipfs/ipfs-desktop/pull/2224
* Change 'Go-ipfs' to 'Kubo' in tray menu by @bertrandfalguiere in https://github.com/ipfs/ipfs-desktop/pull/2246
* feat: jsdoc and improvements to daemon logic by @hacdias in https://github.com/ipfs/ipfs-desktop/pull/2227
* feat: Kubo 0.15.0 by @ajnavarro in https://github.com/ipfs/ipfs-desktop/pull/2240

## New Contributors
* @bertrandfalguiere made their first contribution in https://github.com/ipfs/ipfs-desktop/pull/2246
* @ajnavarro made their first contribution in https://github.com/ipfs/ipfs-desktop/pull/2240

**Full Changelog**: https://github.com/ipfs/ipfs-desktop/compare/v0.22.0...v0.23.0

## [v0.22.0] - 2022-07-21

- IPFS: [`kubo v0.14.0`](https://github.com/ipfs/go-ipfs/releases/tag/v0.14.0) :sparkles:
- UI: [`v2.15.1`](https://github.com/ipfs-shipyard/ipfs-webui/releases/v2.15.1) :sparkles:

* feat: ipfs-webui v2.15.1 by @SgtPooki in https://github.com/ipfs/ipfs-desktop/pull/2190
* feat: kubo 0.14 by @lidel in https://github.com/ipfs/ipfs-desktop/pull/2210
* docs: update manual QA script by @lidel in https://github.com/ipfs/ipfs-desktop/pull/2176
* docs: add network error troubleshoot by @hacdias in https://github.com/ipfs/ipfs-desktop/pull/2178
* chore: remove unused auto-project triggers by @galargh in https://github.com/ipfs/ipfs-desktop/pull/2207
* chore: use official github action in auto-project by @galargh in https://github.com/ipfs/ipfs-desktop/pull/2208
* chore: create enum for ipcMain eventNames by @noliveira95 in https://github.com/ipfs/ipfs-desktop/pull/2189

## [v0.21.0] - 2022-06-13

- IPFS: [`go-ipfs v0.13.0`](https://github.com/ipfs/go-ipfs/releases/tag/v0.13.0) :sparkles:
- UI: [`v2.15.0`](https://github.com/ipfs-shipyard/ipfs-webui/releases/v2.15.0)

* docs: v0.20.6 by @SgtPooki in https://github.com/ipfs/ipfs-desktop/pull/2137
* Remove hardcoded DHT client routing by @2color in https://github.com/ipfs/ipfs-desktop/pull/2152
* chore: remove deprecated ipfs-on-path, npm-on-ipfs by @hacdias in https://github.com/ipfs/ipfs-desktop/pull/2140
* chore(maintenance): move config keys to separate file by @hacdias in https://github.com/ipfs/ipfs-desktop/pull/2143
* go-ipfs v0.13.0 by @guseggert in https://github.com/ipfs/ipfs-desktop/pull/2166
* chore: electron build updates by @lidel in https://github.com/ipfs/ipfs-desktop/pull/2172

## [v0.20.6] - 2021-05-12

* fix: return error instead of throw by @hacdias in https://github.com/ipfs/ipfs-desktop/pull/2074
Expand Down
36 changes: 18 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[![](https://img.shields.io/badge/freenode-%23ipfs-blue.svg?style=flat-square)](http://webchat.freenode.net/?channels=%23ipfs)
[![](https://david-dm.org/ipfs-shipyard/ipfs-desktop.svg?style=flat-square)](https://david-dm.org/ipfs-shipyard/ipfs-desktop)
[![total download count](https://img.shields.io/github/downloads/ipfs-shipyard/ipfs-desktop/total.svg?style=flat-square&label=all%20downloads)](https://github.com/ipfs-shipyard/ipfs-desktop/releases)
[![latest release download count](https://img.shields.io/github/downloads/ipfs-shipyard/ipfs-desktop/v0.21.0/total.svg?style=flat-square)](https://github.com/ipfs-shipyard/ipfs-desktop/releases/tag/v0.21.0)
[![latest release download count](https://img.shields.io/github/downloads/ipfs-shipyard/ipfs-desktop/v0.23.0/total.svg?style=flat-square)](https://github.com/ipfs-shipyard/ipfs-desktop/releases/tag/v0.23.0)

**IPFS Desktop gives you all the power of [IPFS](https://ipfs.io) in a convenient desktop app: a complete IPFS node, plus handy OS menubar/taskbar shortcuts and an all-in-one file manager, peer map, and content explorer.**

Expand All @@ -21,9 +21,9 @@ Use IPFS Desktop to get acquainted with IPFS without needing to touch the termin

When in doubt, pick one of package formats with built-in automatic update mechanism:

- **Mac:** [IPFS-Desktop-0.21.0.dmg](https://github.com/ipfs-shipyard/ipfs-desktop/releases/download/v0.21.0/IPFS-Desktop-0.21.0.dmg)
- **Windows:** [IPFS-Desktop-Setup-0.21.0.exe](https://github.com/ipfs-shipyard/ipfs-desktop/releases/download/v0.21.0/IPFS-Desktop-Setup-0.21.0.exe)
- **Linux:** [ipfs-desktop-0.21.0-linux-x86_64.AppImage](https://github.com/ipfs-shipyard/ipfs-desktop/releases/download/v0.21.0/ipfs-desktop-0.21.0-linux-x86_64.AppImage)
- **Mac:** [IPFS-Desktop-0.23.0.dmg](https://github.com/ipfs-shipyard/ipfs-desktop/releases/download/v0.23.0/IPFS-Desktop-0.23.0.dmg)
- **Windows:** [IPFS-Desktop-Setup-0.23.0.exe](https://github.com/ipfs-shipyard/ipfs-desktop/releases/download/v0.23.0/IPFS-Desktop-Setup-0.23.0.exe)
- **Linux:** [ipfs-desktop-0.23.0-linux-x86_64.AppImage](https://github.com/ipfs-shipyard/ipfs-desktop/releases/download/v0.23.0/ipfs-desktop-0.23.0-linux-x86_64.AppImage)
- If you prefer to manage updates on your own, see [other package formats](#install) below.

### Table of Contents
Expand Down Expand Up @@ -113,28 +113,28 @@ Release notes and older versions of IPFS Desktop can be found on the [releases p
Don't see your favorite package manager? Visit our [package managers page](https://github.com/ipfs-shipyard/ipfs-desktop/issues/691) and help us add support for it!

### Mac
- **Installer:** [IPFS-Desktop-0.21.0.dmg](https://github.com/ipfs-shipyard/ipfs-desktop/releases/download/v0.21.0/IPFS-Desktop-0.21.0.dmg)\
[![](https://img.shields.io/github/downloads/ipfs-shipyard/ipfs-desktop/v0.21.0/IPFS-Desktop-0.21.0.dmg.svg?style=flat-square&label=downloads)](https://github.com/ipfs-shipyard/ipfs-desktop/releases/download/v0.21.0/IPFS-Desktop-0.21.0.dmg)
- **Installer:** [IPFS-Desktop-0.23.0.dmg](https://github.com/ipfs-shipyard/ipfs-desktop/releases/download/v0.23.0/IPFS-Desktop-0.23.0.dmg)\
[![](https://img.shields.io/github/downloads/ipfs-shipyard/ipfs-desktop/v0.23.0/IPFS-Desktop-0.23.0.dmg.svg?style=flat-square&label=downloads)](https://github.com/ipfs-shipyard/ipfs-desktop/releases/download/v0.23.0/IPFS-Desktop-0.23.0.dmg)
- **Homebrew** (community-maintained): `brew install --cask ipfs`

### Windows
- **Installer:** [IPFS-Desktop-Setup-0.21.0.exe](https://github.com/ipfs-shipyard/ipfs-desktop/releases/download/v0.21.0/IPFS-Desktop-Setup-0.21.0.exe)\
[![](https://img.shields.io/github/downloads/ipfs-shipyard/ipfs-desktop/v0.21.0/IPFS-Desktop-Setup-0.21.0.exe.svg?style=flat-square&label=downloads)](https://github.com/ipfs-shipyard/ipfs-desktop/releases/download/v0.21.0/IPFS-Desktop-Setup-0.21.0.exe)
- **Installer:** [IPFS-Desktop-Setup-0.23.0.exe](https://github.com/ipfs-shipyard/ipfs-desktop/releases/download/v0.23.0/IPFS-Desktop-Setup-0.23.0.exe)\
[![](https://img.shields.io/github/downloads/ipfs-shipyard/ipfs-desktop/v0.23.0/IPFS-Desktop-Setup-0.23.0.exe.svg?style=flat-square&label=downloads)](https://github.com/ipfs-shipyard/ipfs-desktop/releases/download/v0.23.0/IPFS-Desktop-Setup-0.23.0.exe)
- **Chocolatey** (community-maintained): `choco install ipfs-desktop`
- **Scoop** (community-maintained): `scoop bucket add extras; scoop install extras/ipfs-desktop`
- **WinGet** (community-maintained): `winget install IPFS.IPFS-Desktop`

### Linux/FreeBSD
- **AppImage**: [ipfs-desktop-0.21.0-linux-x86_64.AppImage](https://github.com/ipfs-shipyard/ipfs-desktop/releases/download/v0.21.0/ipfs-desktop-0.21.0-linux-x86_64.AppImage)\
[![](https://img.shields.io/github/downloads/ipfs-shipyard/ipfs-desktop/v0.21.0/ipfs-desktop-0.21.0-linux-x86_64.AppImage.svg?style=flat-square&label=downloads)](https://github.com/ipfs-shipyard/ipfs-desktop/releases/download/v0.21.0/ipfs-desktop-0.21.0-linux-x86_64.AppImage)
- **Tarball** (use this for building packages for distros): [ipfs-desktop-0.21.0-linux-x64.tar.xz](https://github.com/ipfs-shipyard/ipfs-desktop/releases/download/v0.21.0/ipfs-desktop-0.21.0-linux-x64.tar.xz)\
[![](https://img.shields.io/github/downloads/ipfs-shipyard/ipfs-desktop/v0.21.0/ipfs-desktop-0.21.0-linux-x64.tar.xz.svg?style=flat-square&label=downloads)](https://github.com/ipfs-shipyard/ipfs-desktop/releases/download/v0.21.0/ipfs-desktop-0.21.0-linux-x64.tar.xz)
- **Debian** (experimental): [ipfs-desktop-0.21.0-linux-amd64.deb](https://github.com/ipfs-shipyard/ipfs-desktop/releases/download/v0.21.0/ipfs-desktop-0.21.0-linux-amd64.deb)\
[![](https://img.shields.io/github/downloads/ipfs-shipyard/ipfs-desktop/v0.21.0/ipfs-desktop-0.21.0-linux-amd64.deb.svg?style=flat-square&label=downloads)](https://github.com/ipfs-shipyard/ipfs-desktop/releases/download/v0.21.0/ipfs-desktop-0.21.0-linux-amd64.deb)
- **Red Hat** (experimental): [ipfs-desktop-0.21.0-linux-x86_64.rpm](https://github.com/ipfs-shipyard/ipfs-desktop/releases/download/v0.21.0/ipfs-desktop-0.21.0-linux-x86_64.rpm)\
[![](https://img.shields.io/github/downloads/ipfs-shipyard/ipfs-desktop/v0.21.0/ipfs-desktop-0.21.0-linux-x86_64.rpm.svg?style=flat-square&label=downloads)](https://github.com/ipfs-shipyard/ipfs-desktop/releases/download/v0.21.0/ipfs-desktop-0.21.0-linux-x86_64.rpm)
- **FreeBSD** (experimental): [ipfs-desktop-0.21.0-linux-x64.freebsd](https://github.com/ipfs-shipyard/ipfs-desktop/releases/download/v0.21.0/ipfs-desktop-0.21.0-linux-x64.freebsd) (requires [Linux Binary Compatibility to be enabled](https://docs.freebsd.org/en/books/handbook/linuxemu/))\
[![](https://img.shields.io/github/downloads/ipfs-shipyard/ipfs-desktop/v0.21.0/ipfs-desktop-0.21.0-linux-x64.freebsd.svg?style=flat-square&label=downloads)](https://github.com/ipfs-shipyard/ipfs-desktop/releases/download/v0.21.0/ipfs-desktop-0.21.0-linux-x64.freebsd)
- **AppImage**: [ipfs-desktop-0.23.0-linux-x86_64.AppImage](https://github.com/ipfs-shipyard/ipfs-desktop/releases/download/v0.23.0/ipfs-desktop-0.23.0-linux-x86_64.AppImage)\
[![](https://img.shields.io/github/downloads/ipfs-shipyard/ipfs-desktop/v0.23.0/ipfs-desktop-0.23.0-linux-x86_64.AppImage.svg?style=flat-square&label=downloads)](https://github.com/ipfs-shipyard/ipfs-desktop/releases/download/v0.23.0/ipfs-desktop-0.23.0-linux-x86_64.AppImage)
- **Tarball** (use this for building packages for distros): [ipfs-desktop-0.23.0-linux-x64.tar.xz](https://github.com/ipfs-shipyard/ipfs-desktop/releases/download/v0.23.0/ipfs-desktop-0.23.0-linux-x64.tar.xz)\
[![](https://img.shields.io/github/downloads/ipfs-shipyard/ipfs-desktop/v0.23.0/ipfs-desktop-0.23.0-linux-x64.tar.xz.svg?style=flat-square&label=downloads)](https://github.com/ipfs-shipyard/ipfs-desktop/releases/download/v0.23.0/ipfs-desktop-0.23.0-linux-x64.tar.xz)
- **Debian** (experimental): [ipfs-desktop-0.23.0-linux-amd64.deb](https://github.com/ipfs-shipyard/ipfs-desktop/releases/download/v0.23.0/ipfs-desktop-0.23.0-linux-amd64.deb)\
[![](https://img.shields.io/github/downloads/ipfs-shipyard/ipfs-desktop/v0.23.0/ipfs-desktop-0.23.0-linux-amd64.deb.svg?style=flat-square&label=downloads)](https://github.com/ipfs-shipyard/ipfs-desktop/releases/download/v0.23.0/ipfs-desktop-0.23.0-linux-amd64.deb)
- **Red Hat** (experimental): [ipfs-desktop-0.23.0-linux-x86_64.rpm](https://github.com/ipfs-shipyard/ipfs-desktop/releases/download/v0.23.0/ipfs-desktop-0.23.0-linux-x86_64.rpm)\
[![](https://img.shields.io/github/downloads/ipfs-shipyard/ipfs-desktop/v0.23.0/ipfs-desktop-0.23.0-linux-x86_64.rpm.svg?style=flat-square&label=downloads)](https://github.com/ipfs-shipyard/ipfs-desktop/releases/download/v0.23.0/ipfs-desktop-0.23.0-linux-x86_64.rpm)
- **FreeBSD** (experimental): [ipfs-desktop-0.23.0-linux-x64.freebsd](https://github.com/ipfs-shipyard/ipfs-desktop/releases/download/v0.23.0/ipfs-desktop-0.23.0-linux-x64.freebsd) (requires [Linux Binary Compatibility to be enabled](https://docs.freebsd.org/en/books/handbook/linuxemu/))\
[![](https://img.shields.io/github/downloads/ipfs-shipyard/ipfs-desktop/v0.23.0/ipfs-desktop-0.23.0-linux-x64.freebsd.svg?style=flat-square&label=downloads)](https://github.com/ipfs-shipyard/ipfs-desktop/releases/download/v0.23.0/ipfs-desktop-0.23.0-linux-x64.freebsd)
- **Snapcraft** is discouraged due to [confinement issues](https://github.com/ipfs/ipfs-desktop/issues/2031), use `.AppImage` instead
- **AUR** (maintained by [@RubenKelevra](https://github.com/RubenKelevra)) Use the [`ipfs-desktop` package](https://aur.archlinux.org/packages/ipfs-desktop/)

Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added assets/icons/tray/others/off-32-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/icons/tray/others/off-32-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
Binary file added assets/icons/tray/others/on-32-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/icons/tray/others/on-32-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
4 changes: 2 additions & 2 deletions assets/locales/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@
"message": "واجهت عقدة IPFS خطأ وتعذر إكمال بدء التشغيل:"
},
"invalidRepositoryDialog": {
"title": "Invalid IPFS Repository or Configuration File",
"message": "The repository at “{ path }” is invalid. The “config” file must be a valid JSON.\n\nBefore starting IPFS Desktop again, please fix the configuration file or rename the old repository to “.ipfs.backup”."
"title": "مستودع IPFS أو ملف التكوين غير صالح",
"message": "المستودع في “{ path }” غير صالح. يجب أن يكون ملف \"config\" بتنسيق JSON صالحًا.\n\nقبل بدء تشغيل IPFS Desktop مرة أخرى، يرجى إصلاح ملف التكوين أو إعادة تسمية المستودع القديم إلى “.ipfs.backup”."
}
}
4 changes: 2 additions & 2 deletions assets/locales/cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@
"message": "Uzel IPFS narazil na chybu a spuštění nebylo možné dokončit:"
},
"invalidRepositoryDialog": {
"title": "Invalid IPFS Repository or Configuration File",
"message": "The repository at “{ path }” is invalid. The “config” file must be a valid JSON.\n\nBefore starting IPFS Desktop again, please fix the configuration file or rename the old repository to “.ipfs.backup."
"title": "Neplatné úložiště IPFS nebo konfigurační soubor",
"message": "Úložiště na adrese \"{ path }\" je neplatné. Soubor \"config\" musí být platný JSON.\n\nPřed opětovným spuštěním systému IPFS Desktop opravte konfigurační soubor nebo přejmenujte staré úložiště na \".ipfs.backup\"."
}
}
Loading

0 comments on commit 9c8b2b9

Please sign in to comment.