Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2026-01-05 02:25:37 -05:00
Code Issues Projects Releases Packages Wiki Activity
keepassxc/src/core
History
Tamino Bauknecht e0833e3ddc
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-10-25 19:52:08 -04:00
..
Alloc.cpp Fix missing include in alloc preventing some secure deallocations 2022-03-07 11:15:59 -05:00
AsyncTask.h Add support for Botan3 (#8994) 2023-05-07 23:19:18 -04:00
AutoTypeAssociations.cpp Properly block modified signal during Database destruction (#6438) 2021-05-27 21:50:15 -04:00
AutoTypeAssociations.h Properly block modified signal during Database destruction (#6438) 2021-05-27 21:50:15 -04:00
Base32.cpp Optimize includes across code base 2021-07-13 22:08:33 -04:00
Base32.h Optimize includes across code base 2021-07-13 22:08:33 -04:00
Bootstrap.cpp Fix wrong DACL memory size on Windows (createWindowsDACL) (#10712) 2024-06-02 07:33:18 -04:00
Bootstrap.h Set test locale to C 2024-03-09 15:21:46 -05:00
Clock.cpp Fix all Qt 5.15 deprecation warnings (#7783) 2025-10-25 19:17:35 -04:00
Clock.h Fix all Qt 5.15 deprecation warnings (#7783) 2025-10-25 19:17:35 -04:00
Compare.h Optimize includes across code base 2021-07-13 22:08:33 -04:00
Config.cpp Add more granular Auto-Type confirmation settings (#12370) 2025-10-25 19:24:46 -04:00
Config.h Add more granular Auto-Type confirmation settings (#12370) 2025-10-25 19:24:46 -04:00
CustomData.cpp Fix renaming extension key name in Database Settings 2025-01-03 18:17:07 -05:00
CustomData.h Prevent KeeShare from merging database custom data 2024-04-29 09:53:20 -04:00
Database.cpp Require Qt >= 5.12 2025-10-25 18:59:21 -04:00
Database.h Fix issues with reloading and handling of externally modified db file (#10612) 2025-02-02 09:43:02 -05:00
DatabaseStats.cpp Add db statistic output to CLI db-info command. 2021-12-08 23:41:05 -05:00
DatabaseStats.h Add db statistic output to CLI db-info command. 2021-12-08 23:41:05 -05:00
Endian.h Optimize includes across code base 2021-07-13 22:08:33 -04:00
Entry.cpp Database merge confirmation dialog (#10173) 2025-10-25 19:52:08 -04:00
Entry.h Database merge confirmation dialog (#10173) 2025-10-25 19:52:08 -04:00
EntryAttachments.cpp Fix all Qt 5.15 deprecation warnings (#7783) 2025-10-25 19:17:35 -04:00
EntryAttachments.h Improve and secure attachment handling (fixes #2400). 2021-08-22 17:09:21 -04:00
EntryAttributes.cpp Fix all Qt 5.15 deprecation warnings (#7783) 2025-10-25 19:17:35 -04:00
EntryAttributes.h Support passkeys with Bitwarden import (#11401) 2024-12-21 23:25:15 -05:00
EntrySearcher.cpp Fix all Qt 5.15 deprecation warnings (#7783) 2025-10-25 19:17:35 -04:00
EntrySearcher.h Add predefined search for TOTP entries (#12199) 2025-06-19 17:44:42 -04:00
Exporter.h Formatting the code. 2018-03-31 16:01:30 -04:00
FileWatcher.cpp Fix issues with reloading and handling of externally modified db file (#10612) 2025-02-02 09:43:02 -05:00
FileWatcher.h Fix issues with reloading and handling of externally modified db file (#10612) 2025-02-02 09:43:02 -05:00
Global.h Fix all Qt 5.15 deprecation warnings (#7783) 2025-10-25 19:17:35 -04:00
Group.cpp Database merge confirmation dialog (#10173) 2025-10-25 19:52:08 -04:00
Group.h refactor: remove unused merge methods 2025-10-25 19:52:07 -04:00
HibpDownloader.cpp Optimize includes across code base 2021-07-13 22:08:33 -04:00
HibpDownloader.h Optimize includes across code base 2021-07-13 22:08:33 -04:00
HibpOffline.cpp Optimize includes across code base 2021-07-13 22:08:33 -04:00
HibpOffline.h Optimize includes across code base 2021-07-13 22:08:33 -04:00
InactivityTimer.cpp Improve inactivity timer 2025-10-25 19:20:35 -04:00
InactivityTimer.h Improve inactivity timer 2025-10-25 19:20:35 -04:00
ListDeleter.h Formatting the code. 2018-03-31 16:01:30 -04:00
MacPasteboard.cpp Formatting the code. 2018-03-31 16:01:30 -04:00
MacPasteboard.h Overhaul Auto-Type Action Handling 2021-02-21 16:33:54 -05:00
Merger.cpp Database merge confirmation dialog (#10173) 2025-10-25 19:52:08 -04:00
Merger.h Database merge confirmation dialog (#10173) 2025-10-25 19:52:08 -04:00
Metadata.cpp Add auto-save delay per database (#9100) 2024-04-28 23:41:45 -04:00
Metadata.h Add auto-save delay per database (#9100) 2024-04-28 23:41:45 -04:00
ModifiableObject.cpp Properly block modified signal during Database destruction (#6438) 2021-05-27 21:50:15 -04:00
ModifiableObject.h Properly block modified signal during Database destruction (#6438) 2021-05-27 21:50:15 -04:00
NetworkManager.cpp Optimize includes across code base 2021-07-13 22:08:33 -04:00
NetworkManager.h Optimize includes across code base 2021-07-13 22:08:33 -04:00
PassphraseGenerator.cpp Fix handling of small passphrase wordlists 2025-06-19 17:56:39 -04:00
PassphraseGenerator.h Fix handling of small passphrase wordlists 2025-06-19 17:56:39 -04:00
PasswordGenerator.cpp Prevent duplicate characters in "Also choose from" field of password generator (#9803) 2024-02-04 11:50:52 -05:00
PasswordGenerator.h Add -i/--include option to "generate" CLI command. (#7112) 2021-12-07 23:40:09 -05:00
PasswordHealth.cpp Fix all Qt 5.15 deprecation warnings (#7783) 2025-10-25 19:17:35 -04:00
PasswordHealth.h Limit zxcvbn entropy estimation length 2022-09-22 06:49:07 -04:00
Resources.cpp Support for wordlists in user configuration directory (#6799) 2021-11-04 23:02:33 -04:00
Resources.h Support for wordlists in user configuration directory (#6799) 2021-11-04 23:02:33 -04:00
SignalMultiplexer.cpp Formatting the code. 2018-03-31 16:01:30 -04:00
SignalMultiplexer.h Optimize includes across code base 2021-07-13 22:08:33 -04:00
TimeDelta.cpp Add 12 hours expiration preset (#7738) 2022-03-31 07:02:28 -04:00
TimeDelta.h Add 12 hours expiration preset (#7738) 2022-03-31 07:02:28 -04:00
TimeInfo.cpp Optimize includes across code base 2021-07-13 22:08:33 -04:00
TimeInfo.h Optimize includes across code base 2021-07-13 22:08:33 -04:00
Tools.cpp Update base translations and improve consistency (#12432) 2025-10-25 19:28:22 -04:00
Tools.h Fix all Qt 5.15 deprecation warnings (#7783) 2025-10-25 19:17:35 -04:00
Totp.cpp Don't add space to invalid TOTP strings 2025-06-19 17:56:41 -04:00
Totp.h Don't add space to invalid TOTP strings 2025-06-19 17:56:41 -04:00
Translator.cpp Set test locale to C 2024-03-09 15:21:46 -05:00
Translator.h Set test locale to C 2024-03-09 15:21:46 -05:00
UrlTools.cpp Fix loose URL comparison 2025-06-19 17:44:32 -04:00
UrlTools.h Add support for URL wildcards and exact URL (#9835) 2025-02-10 19:32:27 -05:00