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
|
963ac75389
|
Lower the main window after unlock request from extension (#1884)
|
2018-05-04 17:31:17 -04:00 |
|
Sami Vänttinen
|
658298bc31
|
Ignore non-connected databases from search with Browser Integration (#1810)
|
2018-05-04 16:06:07 -04:00 |
|
Sami Vänttinen
|
3a92e4aab9
|
Socket buffer size fix (#1720)
|
2018-04-02 22:13:07 -04:00 |
|
Louis-Bertrand Varin
|
8324d03f0a
|
Formatting the code.
|
2018-03-31 16:01:30 -04:00 |
|
varjolintu
|
8ac909b0eb
|
Multiple browser related fixes
|
2018-01-20 00:47:26 +01:00 |
|
varjolintu
|
06518c5736
|
keepassxc-browser
|
2018-01-04 21:42:20 +01:00 |
|