Wizz 0654ffc117 CLI: Fix keyfile from/to parameter collision in merge command ...

Rename 'k' to 'f' because 'k' is already used to specify the key for the target database of the merge

* Remove short -f option from keepassxc-cli.1
* Remove -f option from keepassxc-cli merge
* Add test cases covering cli options for merge
* Add functional test for merge with keys

2019-12-21 17:39:50 -05:00

..

docs

CLI: Fix keyfile from/to parameter collision in merge command

2019-12-21 17:39:50 -05:00

icons

Add "Statistics" page to Database Settings dialog (#2034)

2019-10-13 12:24:27 -04:00

linux

Bump version and update changelog

2019-11-11 11:37:23 -05:00

macosx

Fix release-tool on macOS and add notarization. (#3827)

2019-11-10 00:08:20 +01:00

translations

Update translations

2019-11-11 20:53:39 +01:00

windows

Correct application shortcut created by MSI Installer (#3296)

2019-06-29 18:34:19 -04:00

wizard

Add a new database settings wizard

2018-09-25 21:12:47 +02:00

wordlists

remove short wordlists

2017-03-22 00:00:23 +01:00

CMakeLists.txt

Add links to docs in the Help menu (#3274)

2019-06-18 20:46:46 -04:00

crushpng.sh

Icon cleanup

2019-02-05 16:09:17 -05:00

demo.kdbx

Add demo kdbx file (password is secret) (#3294)

2019-06-30 11:07:59 -04:00

demo.key

Add demo kdbx file (password is secret) (#3294)

2019-06-30 11:07:59 -04:00

keepassxc.ini

Drop to background on copy feature

2019-06-29 07:34:41 -04:00