Skip to content
This repository was archived by the owner on May 12, 2021. It is now read-only.

Commit a1c123b

Browse files
Merge branch 'master' of github.com:ssbc/patchwork into add-sandbox-docs
2 parents 9d769bb + 28e8a60 commit a1c123b

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

docs/release-notes-template.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@
22

33
## Install
44

5-
- **Windows:** [`ssb-patchwork-setup-$$VERSION.exe`][exe]
6-
- **macOS:** [`Patchwork-$$VERSION.dmg`][dmg] (you may need to [allow apps from "unidentified" developers](https://support.apple.com/kb/PH25088))
7-
- **Linux:** [`ssb-patchwork-$$VERSION-x86_64.AppImage`][appimage] (you will need to [make it executable](https://docs.appimage.org/user-guide/run-appimages.html))
5+
- **Windows:** [`Patchwork-Setup-$$VERSION.exe`][exe]
6+
- **macOS:** [`Patchwork-$$VERSION.dmg`][dmg]
7+
- You must [allow apps from "unidentified" developers](https://support.apple.com/kb/PH25088).
8+
- **Linux:** [`Patchwork-$$VERSION.AppImage`][appimage]
9+
- You must [make it executable](https://docs.appimage.org/user-guide/run-appimages.html): `chmod +x Patchwork-$$VERSION.AppImage`
10+
- You may need to [fix the sandbox](https://github.com/electron/electron/issues/17972): `sudo sysctl kernel.unprivileged_userns_clone=1`
811

912
## Getting started
1013

@@ -21,5 +24,5 @@ $$CHANGES
2124
:sos: [Need help? Please create an issue!](https://github.com/ssbc/patchwork/issues/new)
2225
2326
[dmg]: https://github.com/ssbc/patchwork/releases/download/v$$VERSION/Patchwork-$$VERSION.dmg
24-
[exe]: https://github.com/ssbc/patchwork/releases/download/v$$VERSION/ssb-patchwork-setup-$$VERSION.exe
25-
[appimage]: https://github.com/ssbc/patchwork/releases/download/v$$VERSION/ssb-patchwork-$$VERSION-x86_64.AppImage
27+
[exe]: https://github.com/ssbc/patchwork/releases/download/v$$VERSION/Patchwork-Setup-$$VERSION.exe
28+
[appimage]: https://github.com/ssbc/patchwork/releases/download/v$$VERSION/Patchwork-$$VERSION.AppImage

lib/main-window.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ module.exports = function (config) {
5858
const includeParticipating = api.settings.obs.get('patchwork.includeParticipating', false)
5959
const autoDeleteBlocked = api.settings.obs.get('patchwork.autoDeleteBlocked', false)
6060

61+
electron.remote.globalShortcut.register('CmdOrCtrl+,', () => {
62+
toggleView('/settings')
63+
})
64+
6165
// prompt to setup profile on first use
6266
onceTrue(api.sbot.obs.connection, (ssb) => {
6367
ssb.latestSequence(api.keys.sync.id(), (err, key) => {
@@ -245,6 +249,8 @@ module.exports = function (config) {
245249
views.html
246250
])
247251

252+
const toggleView = view => { if (views.currentView() === view) { views.goBack() } else { navigate(view) } }
253+
248254
const previewElement = api.app.linkPreview(container, 500)
249255

250256
catchLinks(container, (href, external, anchor) => {

0 commit comments

Comments
 (0)