Tamino Bauknecht c0ea6f65f9 Database merge confirmation dialog (#10173) ...

* Add Entry::calculateDifference()

This new function contains the logic that was previously in
EntryHistoryModel::calculateHistoryModifications().
It allows the re-use to display the differences in case of a merge.

* Introduce Database Merge Confirmation Dialog

Adds a dialog allowing a user to review the changes of a merge operation.
This dialog displays the changes and allows the user to abort the merge
without modifying the database.

Fixes #1152

* Added dry run option to Merger
* Changed behavior when actual merge differs from dry run to just output a warning to console
* Fixed KeeShare conflicting with merge operations in the middle of a merge

---------

Co-authored-by: Jonathan White <support@dmapps.us>

2025-09-14 12:02:22 -04:00

..

data

Add Proton Pass importer

2025-01-03 17:45:50 -05:00

gui

Database merge confirmation dialog (#10173)

2025-09-14 12:02:22 -04:00

mock

Improve handling of remote sync saving

2025-03-30 08:14:12 -04:00

util

Remove Config::createTempFileInstance

2025-03-30 08:14:12 -04:00

CMakeLists.txt

Remove Config::createTempFileInstance

2025-03-30 08:14:12 -04:00

config-keepassx-tests.h.cmake

Remove KeePassHttp plugin and qhttp (#1752)

2018-03-31 11:36:18 -04:00

FailDevice.cpp

Formatting the code.

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

FailDevice.h

Make C++11 mandatory.

2015-09-12 13:55:50 +02:00

modeltest.cpp

Fix all Qt 5.15 deprecation warnings (#7783)

2024-06-22 07:22:44 -04:00

modeltest.h

Replace Q_EMIT, Q_SIGNALS and Q_SLOTS macros with MOC keywords

2017-03-10 16:12:02 +01:00

TestAutoType.cpp

Remove Config::createTempFileInstance

2025-03-30 08:14:12 -04:00

TestAutoType.h

Auto-Type support for T-CONV, T-REPLACE-RX, and Comments

2021-02-22 07:41:23 -05:00

TestBase32.cpp

Optimize includes across code base

2021-07-13 22:08:33 -04:00

TestBase32.h

Add new Base32 implementation

2017-10-21 13:15:02 +02:00

TestBrowser.cpp

Fix two problems with URL wildcard matching

2025-07-04 09:06:27 -04:00

TestBrowser.h

Add support for URL wildcards and exact URL (#9835)

2025-02-09 20:03:15 -05:00

TestCli.cpp

Database merge confirmation dialog (#10173)

2025-09-14 12:02:22 -04:00

TestCli.h

CLI: Add Unicode support on Windows (#8618)

2022-10-29 08:07:31 -04:00

TestConfig.cpp

Remove password repeat application setting

2024-04-27 09:49:38 -04:00

TestConfig.h

Change settings checkbox texts to positive phrasing (#4715)

2020-05-10 21:35:08 -04:00

TestCryptoHash.cpp

Optimize includes across code base

2021-07-13 22:08:33 -04:00

TestCryptoHash.h

Replace Q_EMIT, Q_SIGNALS and Q_SLOTS macros with MOC keywords

2017-03-10 16:12:02 +01:00

TestCsvExporter.cpp

Fix multiple TOTP issues

2024-01-06 15:17:13 -05:00

TestCsvExporter.h

Refactor Database and Database widgets (#2491)

2018-11-22 11:47:31 +01:00

TestCsvParser.cpp

Fix various quirks with CSV import widget and parser

2025-03-01 17:14:13 -05:00

TestCsvParser.h

Fix various quirks with CSV import widget and parser

2025-03-01 17:14:13 -05:00

TestDatabase.cpp

Fix issues with reloading and handling of externally modified db file (#10612)

2025-02-01 11:58:45 -05:00

TestDatabase.h

Fix issues with reloading and handling of externally modified db file (#10612)

2025-02-01 11:58:45 -05:00

TestDeletedObjects.cpp

clang-tidy: use auto

2022-05-01 16:02:02 -04:00

TestDeletedObjects.h

Implement KDBX 4.1 extended custom icons

2021-11-22 12:58:04 +01:00

TestEntry.cpp

Implement T-CONV and T-REPLACE-RX entry placeholders

2024-11-13 17:51:21 -05:00

TestEntry.h

Implement T-CONV and T-REPLACE-RX entry placeholders

2024-11-13 17:51:21 -05:00

TestEntryModel.cpp

Fix sorting of advanced attribute list (#10091)

2025-02-01 11:59:53 -05:00

TestEntryModel.h

Replace Q_EMIT, Q_SIGNALS and Q_SLOTS macros with MOC keywords

2017-03-10 16:12:02 +01:00

TestEntrySearcher.cpp

Add predefined search for TOTP entries (#12199)

2025-06-19 09:24:01 -04:00

TestEntrySearcher.h

Add predefined search for TOTP entries (#12199)

2025-06-19 09:24:01 -04:00

TestFdoSecrets.cpp

Fix various typos (#8748)

2023-01-29 09:38:44 -05:00

TestFdoSecrets.h

Replace all crypto libraries with Botan

2021-04-05 22:56:03 -04:00

TestGroup.cpp

Disable entry level Auto-Type

2023-07-30 09:56:09 -04:00

TestGroup.h

Disable entry level Auto-Type

2023-07-30 09:56:09 -04:00

TestGroupModel.cpp

clang-tidy: use auto

2022-05-01 16:02:02 -04:00

TestGroupModel.h

Replace Q_EMIT, Q_SIGNALS and Q_SLOTS macros with MOC keywords

2017-03-10 16:12:02 +01:00

TestHashedBlockStream.cpp

Optimize includes across code base

2021-07-13 22:08:33 -04:00

TestHashedBlockStream.h

Replace Q_EMIT, Q_SIGNALS and Q_SLOTS macros with MOC keywords

2017-03-10 16:12:02 +01:00

TestHibp.cpp

clang-tidy: use auto

2022-05-01 16:02:02 -04:00

TestHibp.h

CLI: add 'analyze' subcommand for offline HIBP breach checks

2019-06-25 15:37:40 -04:00

TestIconDownloader.cpp

Fix unexpected additional resolved urls in testIconDownloader

2024-08-22 00:21:24 -04:00

TestIconDownloader.h

Optimize includes across code base

2021-07-13 22:08:33 -04:00

TestImports.cpp

Add Proton Pass importer

2025-01-03 17:45:50 -05:00

TestImports.h

Add Proton Pass importer

2025-01-03 17:45:50 -05:00

TestKdbx2.cpp

Correctly set KDBX envelope version

2021-11-22 12:58:04 +01:00

TestKdbx2.h

Refactor Database and Database widgets (#2491)

2018-11-22 11:47:31 +01:00

TestKdbx3.cpp

Prevent byte-by-byte and attachment inference side channel attacks

2024-03-09 12:39:00 -05:00

TestKdbx3.h

Prevent byte-by-byte and attachment inference side channel attacks

2024-03-09 12:39:00 -05:00

TestKdbx4.cpp

Refactor: separate GUI sources from core sources

2024-06-29 11:50:23 -04:00

TestKdbx4.h

Prevent byte-by-byte and attachment inference side channel attacks

2024-03-09 12:39:00 -05:00

TestKeePass1Reader.cpp

clang-tidy: use braced init list (#7998)

2023-01-29 10:05:44 -05:00

TestKeePass1Reader.h

Refactor Database and Database widgets (#2491)

2018-11-22 11:47:31 +01:00

TestKeePass2Format.cpp

Fix crash on screen lock or computer sleep

2024-04-13 07:54:18 -04:00

TestKeePass2Format.h

Correctly set KDBX envelope version

2021-11-22 12:58:04 +01:00

TestKeePass2RandomStream.cpp

Optimize includes across code base

2021-07-13 22:08:33 -04:00

TestKeePass2RandomStream.h

Replace Q_EMIT, Q_SIGNALS and Q_SLOTS macros with MOC keywords

2017-03-10 16:12:02 +01:00

TestKeys.cpp

Add key serialization to support Quick Unlock

2022-02-22 17:53:50 -05:00

TestKeys.h

Add MockChallengeResponseKey and additional composite key component test

2018-03-01 19:26:18 -05:00

TestMerge.cpp

Database merge confirmation dialog (#10173)

2025-09-14 12:02:22 -04:00

TestMerge.h

Prevent KeeShare from merging database custom data

2024-04-29 08:50:46 -04:00

TestModified.cpp

Optimize includes across code base

2021-07-13 22:08:33 -04:00

TestModified.h

Properly block modified signal during Database destruction (#6438)

2021-05-27 21:50:15 -04:00

TestOpenSSHKey.cpp

SSH Agent: Add support for generating SSH keys

2023-02-01 23:32:56 -05:00

TestOpenSSHKey.h

SSH Agent: Add support for OpenSSH 8.2 FIDO/U2F keys

2021-10-01 16:25:14 -04:00

TestPasskeys.cpp

Passkeys: Fix ordering of clientDataJSON

2025-05-27 07:09:19 -04:00

TestPasskeys.h

Skip a few Passkeys tests with Botan <= 2.14 (#10360)

2024-03-08 08:43:06 -05:00

TestPassphraseGenerator.cpp

Fix handling of small passphrase wordlists

2025-06-19 16:22:17 -04:00

TestPassphraseGenerator.h

Prevent duplicate entries in passphrase wordlists

2024-08-22 00:21:38 -04:00

TestPasswordGenerator.cpp

Add -i/--include option to "generate" CLI command. (#7112)

2021-12-07 23:40:09 -05:00

TestPasswordGenerator.h

Add -i/--include option to "generate" CLI command. (#7112)

2021-12-07 23:40:09 -05:00

TestPasswordHealth.cpp

Optimize includes across code base

2021-07-13 22:08:33 -04:00

TestPasswordHealth.h

Implement Password Health Report

2020-02-01 09:30:12 -05:00

TestRandomGenerator.cpp

Optimize includes across code base

2021-07-13 22:08:33 -04:00

TestRandomGenerator.h

Replace all crypto libraries with Botan

2021-04-05 22:56:03 -04:00

TestSharing.cpp

Fix code formatting with new clang-format version

2024-07-28 18:25:12 -04:00

TestSharing.h

KeeShare: Remove checking signed container

2021-12-14 23:23:23 -05:00

TestSSHAgent.cpp

Remove Config::createTempFileInstance

2025-03-30 08:14:12 -04:00

TestSSHAgent.h

Remove Config::createTempFileInstance

2025-03-30 08:14:12 -04:00

TestSymmetricCipher.cpp

Optimize includes across code base

2021-07-13 22:08:33 -04:00

TestSymmetricCipher.h

Replace all crypto libraries with Botan

2021-04-05 22:56:03 -04:00

TestTools.cpp

Refactor attachment handling system with enhanced UI (#12085)

2025-06-19 13:27:23 -04:00

TestTools.h

Refactor attachment handling system with enhanced UI (#12085)

2025-06-19 13:27:23 -04:00

TestTotp.cpp

Don't add space to invalid TOTP strings

2025-06-19 16:22:17 -04:00

TestTotp.h

Support KeePass2 TOTP settings

2024-09-04 06:42:31 -04:00

TestUpdateCheck.cpp

Refactor: separate GUI sources from core sources

2024-06-29 11:50:23 -04:00

TestUpdateCheck.h

Ran make format

2019-03-19 18:56:17 -04:00

TestUrlTools.cpp

Fix loose URL comparison

2025-06-15 09:27:12 -04:00

TestUrlTools.h

Add support for URL wildcards and exact URL (#9835)

2025-02-09 20:03:15 -05:00

TestYkChallengeResponseKey.cpp

Show a clear error if no slots on hardware key(s) are configured (#11609)

2025-01-02 23:05:22 -05:00

TestYkChallengeResponseKey.h

Significantly enhance hardware key robustness

2020-05-14 20:19:56 -04:00