github.com/keepassxreboot/keepassxc.git - Unnamed repository; edit this file 'description' to name the repository.

Age	Commit message (Collapse)	Author
2018-11-29	Restore correct formatting	Gianluca Recchia
	Many lines were not conformant with the project's formatting rules. This patch should fix all formatting and whitespace issues in the code base. A clang-format directive was put around the connect() calls containing SIGNALs and SLOTs whose signatures would be denormalized because of the formatting rules.
2018-09-30	Introduce synchronize merge method	Jonathan White
	* 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-07-07	Fixed issues with initial commit	pasdam

2018-07-07	Replaced Uuid with QUuid	pasdam

2018-03-31	Formatting the code.	Louis-Bertrand Varin

2018-01-24	Move useful QTest template specializations to global header file	Janek Bevendorff
	Fix KDBX test linker errors on Windows