8 Commits

Author	SHA1	Message	Date
Jonathan White	c1e9f45df9	Introduce synchronize merge method ... * 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)	2018-09-30 09:36:39 -04:00
Janek Bevendorff	114f00e1e8	Add CustomData regression tests	2018-02-21 13:23:14 +01:00
Janek Bevendorff	8dd6cdeb69	Fix history truncation based on max size and extend unit tests	2018-01-23 02:31:29 +01:00
Janek Bevendorff	8d487d31a4	Replace Q_EMIT, Q_SIGNALS and Q_SLOTS macros with MOC keywords	2017-03-10 16:12:02 +01:00
Felix Geyer	6504b6f2bd	Drop Qt module name from include statements. ... This is a preparation to be able to build KeePassX against Qt 5.	2013-10-03 15:18:16 +02:00
Felix Geyer	e026f3d1eb	Create a history item when changing entries. ... Closes #15	2012-04-23 21:20:05 +02:00
Felix Geyer	2e011d5362	Improve code style.	2012-04-18 22:08:22 +02:00
Florian Geyer	ec3cca1f77	Add test for modified signals.	2012-04-18 17:03:58 +02:00