mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2025-12-26 13:44:54 -05:00
e0833e3ddc
* 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> |
||
|---|---|---|
| .. | ||
| autotype | ||
| browser | ||
| cli | ||
| core | ||
| crypto | ||
| fdosecrets | ||
| format | ||
| gui | ||
| keeshare | ||
| keys | ||
| post_install | ||
| proxy | ||
| qrcode | ||
| sshagent | ||
| streams | ||
| thirdparty | ||
| touchid | ||
| updatecheck | ||
| winhello | ||
| CMakeLists.txt | ||
| config-keepassx.h.cmake | ||
| git-info.h.cmake | ||
| main.cpp | ||