Skip to content

Commit

Permalink
Merge branch 'main' into docs/readme-update
Browse files Browse the repository at this point in the history
  • Loading branch information
SgtPooki authored Sep 21, 2023
2 parents c33424b + cc2b58c commit 688ab72
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions DEVELOPER-NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ Manually test a few things that don't transfer well to automated testing:
1. **Mac & Windows (both must to be checked):** Confirm that drag-and-drop file import works:
- Open _Files_ screen
- Drag file(s) into it (PDF, images, or videos)
- Confirm file(s) import was succesful by clicking on newly imported file to preview
- Confirm file(s) import was successful by clicking on newly imported file to preview
2. **Mac & Windows (one check is sufficient):** Confirm that import via _Import_ button works:
- Open _Files_ screen
- Click on _Import_ button and select files(s) (directory, or standalone PDF, images, or videos)
- Confirm file(s) import was succesful by clicking on newly imported file to preview
- Confirm file(s) import was successful by clicking on newly imported file to preview
3. **Mac only:** Drag/drop onto menubar icon behaves as expected when dragging one file, several files, and a combination of files/folders:
- File(s) import correctly
- Correct link is copied to clipboard
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ You can open these files from the IPFS logo menu by selecting `Open Logs Directo

### How does IPFS Desktop select the IPFS repo location?

IPFS Desktop uses [ipfsd-ctl](https://github.com/ipfs/js-ipfsd-ctl), which, by default, checks the `IPFS_PATH` environment variable. If that isn't set, it falls back to `$HOME/.ipfs`. As soon as the first run has succeded, repository location info is saved in the configuration file, which becomes the source of truth.
IPFS Desktop uses [ipfsd-ctl](https://github.com/ipfs/js-ipfsd-ctl), which, by default, checks the `IPFS_PATH` environment variable. If that isn't set, it falls back to `$HOME/.ipfs`. As soon as the first run has succeeded, repository location info is saved in the configuration file, which becomes the source of truth.

To open your repo directory from the IPFS logo menu, select `Open Repository Directory` from the `Advanced` submenu.

Expand Down
2 changes: 1 addition & 1 deletion src/argv-files-handler.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ async function argvHandler (argv) {
}

module.exports = async function () {
// Checks current proccess
// Checks current process
await argvHandler(process.argv)
}

Expand Down
2 changes: 1 addition & 1 deletion src/auto-updater/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ function setup () {
}
if (feedback) {
feedback = false
// when in instant feedback mode, show dialog immediatelly
// when in instant feedback mode, show dialog immediately
feedbackDialog()
} else {
// show unobtrusive notification + dialog on click
Expand Down
2 changes: 1 addition & 1 deletion types/countly-sdk-nodejs.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ declare module 'countly-sdk-nodejs' {
* @description
* This can set the maximum number of characters that is allowed per stack trace line. This also limits the crash message length.
*
* @defualt 200 chars. Lines that exceed this limit will be truncated.
* @default 200 chars. Lines that exceed this limit will be truncated.
*/
max_stack_trace_line_length?: number,
) => void
Expand Down

0 comments on commit 688ab72

Please sign in to comment.