Skip to content

Commit

Permalink
Merge branch 'master' into bumps-version-1.9.22
Browse files Browse the repository at this point in the history
  • Loading branch information
SoraKenji authored Apr 7, 2022
2 parents 7079444 + 27462fc commit 457953d
Show file tree
Hide file tree
Showing 14 changed files with 703 additions and 369 deletions.
19 changes: 19 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"arrowParens": "always",
"bracketSpacing": false,
"endOfLine": "lf",
"htmlWhitespaceSensitivity": "css",
"insertPragma": false,
"jsxBracketSameLine": false,
"jsxSingleQuote": false,
"printWidth": 120,
"proseWrap": "preserve",
"quoteProps": "as-needed",
"requirePragma": false,
"semi": true,
"singleQuote": true,
"tabWidth": 2,
"trailingComma": "none",
"useTabs": false,
"parser": "babel"
}
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,17 @@

**Merged pull requests:**

## [v1.9.21](https://github.com/prey/prey-node-client/tree/v1.9.21) (2022-03-30)
[Full Changelog](https://github.com/prey/prey-node-client/compare/v1.9.20..v1.9.21)

**Merged pull requests:**

- Fix lock errors/index.js import: Fixes an error by importing .../errors/index.js to lock index file [\#564](https://github.com/prey/prey-node-client/pull/564) ([SoraKenji](https://github.com/SoraKenji))
- Wmic and custom wipe: Fixes a problem with WMIC commands, since newer Windows version doesnt admit WMIC commands anymore. Also fixes Custom Wipe not deleting files on MacOS systems [\#563](https://github.com/prey/prey-node-client/pull/563) ([JohaoRosasRosillo](https://github.com/JohaoRosasRosillo))
- Fix/loan exact time: Fixes errors when inserting data with unwanted characters in database [\#573] (https://github.com/prey/prey-node-client/pull/573)

**Merged pull requests:**

## [v1.9.20](https://github.com/prey/prey-node-client/tree/v1.9.20) (2022-02-25)
[Full Changelog](https://github.com/prey/prey-node-client/compare/v1.9.19..v1.9.20)

Expand Down
3 changes: 2 additions & 1 deletion lib/agent/actions/lock/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ var util = require('util'),
is_win = os_name == 'windows',
is_mac = os_name == 'mac',
is_linux = os_name == 'linux',
node_bin = join(system.paths.current, 'bin', 'node'),
node_bin = join(system.paths.current, 'bin', 'node'),
errors = require('./../../errors').status,
release = parseFloat(os.release());

var lock_binary = lock_binary_path(),
Expand Down
Loading

0 comments on commit 457953d

Please sign in to comment.