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
Jonathan White
53a17c2355
Reduce use of static vars in browser plugin
...
* Convert BrowserSettings into instanced class
* Moved HostInstaller init into class constructor
2018-09-15 12:10:15 -04:00
varjolintu
57e60681f2
Fix Match URL scheme setting
2018-09-11 09:49:33 -04:00
Jonathan White
ca27fb06d5
Merge branch 'master'
...
Conflicts:
INSTALL.md
release-tool
src/browser/BrowserOptionDialog.cpp
src/browser/BrowserService.cpp
src/browser/BrowserService.h
src/browser/NativeMessagingBase.h
src/browser/NativeMessagingHost.h
src/core/Uuid.cpp
src/gui/DatabaseTabWidget.cpp
src/gui/DatabaseWidget.cpp
src/gui/EditWidget.cpp
src/gui/MainWindow.cpp
src/gui/MainWindow.ui
src/proxy/NativeMessagingHost.h
src/sshagent/ASN1Key.cpp
2018-08-24 09:42:38 -04:00
varjolintu
057cf6aed3
Handle URL port and scheme when requesting credentials
2018-07-14 17:09:41 -04:00
varjolintu
c67f7afa49
Deny expired credentials
2018-07-13 09:15:22 -04:00
pasdam
b4d806ad41
Fixed issues with initial commit
2018-07-06 22:23:52 -04:00
varjolintu
fc8e0e7b19
Remove title matching
2018-06-16 08:44:08 +03:00
varjolintu
e825b55a99
Fix entry sorting by title
2018-06-15 19:52:28 -04:00
Jonathan White
aae6d09fd3
Merge branch 'master' into develop
...
Conflicts:
src/CMakeLists.txt
src/autotype/xcb/AutoTypeXCB.cpp
src/browser/BrowserAction.cpp
src/browser/BrowserService.cpp
src/browser/BrowserService.h
src/browser/BrowserSettings.h
src/browser/NativeMessagingHost.cpp
src/browser/NativeMessagingHost.h
src/gui/EditWidgetIcons.cpp
src/gui/EditWidgetIcons.h
src/gui/MainWindow.cpp
src/proxy/NativeMessagingHost.cpp
tests/TestOpenSSHKey.cpp
2018-05-07 23:24:30 -04:00
Sami Vänttinen
48295efe0d
Implement best matches only option with browser integration ( #1822 )
2018-05-05 17:51:03 -04:00
Sami Vänttinen
963ac75389
Lower the main window after unlock request from extension ( #1884 )
2018-05-04 17:31:17 -04:00
Sami Vänttinen
635d6fe82c
Bring browser credentials messagebox to the front ( #1830 )
2018-05-04 16:56:19 -04:00
Sami Vänttinen
658298bc31
Ignore non-connected databases from search with Browser Integration ( #1810 )
2018-05-04 16:06:07 -04:00
varjolintu
2110ae4d33
Create KPH attribute for browser integration
2018-04-27 11:19:02 +03:00
Louis-Bertrand Varin
8324d03f0a
Formatting the code.
2018-03-31 16:01:30 -04:00
Edward Jones
3def6a3bc4
Fix weird base strings and reduce concatenation
2018-03-13 20:40:39 +00:00
Matthew Thode
78e962e30a
Fix keepass-browser based popups on tiling WMs
...
If we set the window flags after showing/activating the window the
window will not pop up.
Fixes: https://github.com/keepassxreboot/keepassxc/issues/1452
2018-02-04 15:43:45 -06:00
varjolintu
8ac909b0eb
Multiple browser related fixes
2018-01-20 00:47:26 +01:00
Janek Bevendorff
7665bc6c63
Properly active key association dialog and main window upon unlock request
2018-01-15 01:16:32 +01:00
Janek Bevendorff
48ac3790c2
Show "key already exists" warning only if key really exists
2018-01-15 01:16:32 +01:00
varjolintu
06518c5736
keepassxc-browser
2018-01-04 21:42:20 +01:00
