Jonathan White ca27fb06d5

Merge branch 'master' ...

Conflicts:
	INSTALL.md
	release-tool
	src/browser/BrowserOptionDialog.cpp
	src/browser/BrowserService.cpp
	src/browser/BrowserService.h
	src/browser/NativeMessagingBase.h
	src/browser/NativeMessagingHost.h
	src/core/Uuid.cpp
	src/gui/DatabaseTabWidget.cpp
	src/gui/DatabaseWidget.cpp
	src/gui/EditWidget.cpp
	src/gui/MainWindow.cpp
	src/gui/MainWindow.ui
	src/proxy/NativeMessagingHost.h
	src/sshagent/ASN1Key.cpp

2018-08-24 09:42:38 -04:00

..

Add.cpp

fix cli commands, translations and codestyle

2018-02-07 17:35:20 +01:00

Add.h

fix cli commands, translations and codestyle

2018-02-07 17:35:20 +01:00

Clip.cpp

fix cli commands, translations and codestyle

2018-02-07 17:35:20 +01:00

Clip.h

fix cli commands, translations and codestyle

2018-02-07 17:35:20 +01:00

CMakeLists.txt

renamed passgen to generate and use diceware default wordcount

2018-02-07 17:35:20 +01:00

Command.cpp

fix cli commands, translations and codestyle

2018-02-07 17:35:20 +01:00

Command.h

fix cli commands, translations and codestyle

2018-02-07 17:35:20 +01:00

Diceware.cpp

Formatting the code.

2018-03-31 16:01:30 -04:00

Diceware.h

fix cli commands, translations and codestyle

2018-02-07 17:35:20 +01:00

Edit.cpp

Formatting the code.

2018-03-31 16:01:30 -04:00

Edit.h

fix cli commands, translations and codestyle

2018-02-07 17:35:20 +01:00

Estimate.cpp

fix cli commands, translations and codestyle

2018-02-07 17:35:20 +01:00

Estimate.h

fix cli commands, translations and codestyle

2018-02-07 17:35:20 +01:00

Extract.cpp

Formatting the code.

2018-03-31 16:01:30 -04:00

Extract.h

fix cli commands, translations and codestyle

2018-02-07 17:35:20 +01:00

Generate.cpp

Add advanced password generator features (#1841)

2018-06-10 22:37:09 -04:00

Generate.h

fix cli commands, translations and codestyle

2018-02-07 17:35:20 +01:00

keepassxc-cli.1

Corrects ordering of command/opts in cli manpage

2018-07-25 12:59:55 +02:00

keepassxc-cli.cpp

Feature : --key-file option for CLI (#816)

2017-07-25 13:41:52 -04:00

List.cpp

fix cli commands, translations and codestyle

2018-02-07 17:35:20 +01:00

List.h

fix cli commands, translations and codestyle

2018-02-07 17:35:20 +01:00

Locate.cpp

fix cli commands, translations and codestyle

2018-02-07 17:35:20 +01:00

Locate.h

fix cli commands, translations and codestyle

2018-02-07 17:35:20 +01:00

Merge.cpp

fix cli commands, translations and codestyle

2018-02-07 17:35:20 +01:00

Merge.h

fix cli commands, translations and codestyle

2018-02-07 17:35:20 +01:00

Remove.cpp

fix cli commands, translations and codestyle

2018-02-07 17:35:20 +01:00

Remove.h

fix cli commands, translations and codestyle

2018-02-07 17:35:20 +01:00

Show.cpp

Formatting the code.

2018-03-31 16:01:30 -04:00

Show.h

fix cli commands, translations and codestyle

2018-02-07 17:35:20 +01:00

Utils.cpp

fix cli commands, translations and codestyle

2018-02-07 17:35:20 +01:00

Utils.h

fix cli commands, translations and codestyle

2018-02-07 17:35:20 +01:00