mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2024-09-19 20:02:18 +02:00
c1e9f45df9
* Create history-based merging that keeps older data in history instead of discarding or deleting it * Extract merge logic into the Merger class * Allows special merge behavior * Improve handling of deletion and changes on groups * Enable basic change tracking while merging * Prevent unintended timestamp changes while merging * Handle differences in timestamp precision * Introduce comparison operators to allow for more sophisticated comparisons (ignore special properties, ...) * Introduce Clock class to handle datetime across the app Merge Strategies: * Default (use inherited/fallback method) * Duplicate (duplicate conflicting nodes, apply all deletions) * KeepLocal (use local values, but apply all deletions) * KeepRemote (use remote values, but apply all deletions) * KeepNewer (merge history only) * Synchronize (merge history, newest value stays on top, apply all deletions) |
||
|---|---|---|
| .. | ||
| data | ||
| gui | ||
| mock | ||
| stub | ||
| CMakeLists.txt | ||
| config-keepassx-tests.h.cmake | ||
| FailDevice.cpp | ||
| FailDevice.h | ||
| modeltest.cpp | ||
| modeltest.h | ||
| TestAutoType.cpp | ||
| TestAutoType.h | ||
| TestBase32.cpp | ||
| TestBase32.h | ||
| TestCryptoHash.cpp | ||
| TestCryptoHash.h | ||
| TestCsvExporter.cpp | ||
| TestCsvExporter.h | ||
| TestCsvParser.cpp | ||
| TestCsvParser.h | ||
| TestDatabase.cpp | ||
| TestDatabase.h | ||
| TestDeletedObjects.cpp | ||
| TestDeletedObjects.h | ||
| TestEntry.cpp | ||
| TestEntry.h | ||
| TestEntryModel.cpp | ||
| TestEntryModel.h | ||
| TestEntrySearcher.cpp | ||
| TestEntrySearcher.h | ||
| TestGlobal.h | ||
| TestGroup.cpp | ||
| TestGroup.h | ||
| TestGroupModel.cpp | ||
| TestGroupModel.h | ||
| TestHashedBlockStream.cpp | ||
| TestHashedBlockStream.h | ||
| TestKdbx2.cpp | ||
| TestKdbx2.h | ||
| TestKdbx3.cpp | ||
| TestKdbx3.h | ||
| TestKdbx4.cpp | ||
| TestKdbx4.h | ||
| TestKeePass1Reader.cpp | ||
| TestKeePass1Reader.h | ||
| TestKeePass2Format.cpp | ||
| TestKeePass2Format.h | ||
| TestKeePass2RandomStream.cpp | ||
| TestKeePass2RandomStream.h | ||
| TestKeys.cpp | ||
| TestKeys.h | ||
| TestMerge.cpp | ||
| TestMerge.h | ||
| TestModified.cpp | ||
| TestModified.h | ||
| TestOpenSSHKey.cpp | ||
| TestOpenSSHKey.h | ||
| TestRandom.cpp | ||
| TestRandom.h | ||
| TestSymmetricCipher.cpp | ||
| TestSymmetricCipher.h | ||
| TestTools.cpp | ||
| TestTools.h | ||
| TestTotp.cpp | ||
| TestTotp.h | ||
| TestWildcardMatcher.cpp | ||
| TestWildcardMatcher.h | ||
| TestYkChallengeResponseKey.cpp | ||
| TestYkChallengeResponseKey.h | ||