Commit graph

8 commits

Author SHA1 Message Date
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
Jonathan White
3b7e63a773
Bump version number to 2.3.2 & fix Win build 2018-05-07 23:17:32 -04:00
varjolintu
9d7e7c1ca8 Disable STDIN listening when not needed 2018-05-06 20:21:40 -04:00
varjolintu
c773d85876 Change socket location in macOS to temporary dir 2018-04-04 11:16:00 +03:00
Louis-Bertrand Varin
8324d03f0a Formatting the code. 2018-03-31 16:01:30 -04:00
Olivier Le Moal
3353b329fc Fix wrong reply size in NativeMessagingBase
* Using length() on QString won't return correct size in bytes when string
contains UTF-8 chars.
2018-03-13 22:32:31 +01: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