Commit Graph

3793 Commits

Author SHA1 Message Date
Jonathan White
b07d4efe5f
Allow multiple image selections when adding favicons 2018-06-09 16:58:41 -04:00
Corentin Dancette
959acb7988 update link in readme 2018-06-03 11:41:13 -04:00
Janek Bevendorff
558cb3d0b5
Merge pull request #1957 from michalkaptur/improved_tools_coverage
improved unit test coverage in Tools
2018-05-23 09:48:32 +02:00
Vladimir Svyatski
28d949fa5f Merge remote-tracking branch 'upstream/develop' into develop 2018-05-22 21:42:53 +03:00
Michal Kaptur
486b99b39d Add some unit tests to Tools
Clean up and test 3 methods from Tools:
- humanReadableFileSize
- isHex
- isBase64
2018-05-22 09:28:54 +02:00
Jonathan White
b16447b13d
Fix occasional crash when favicon progress dialog is closed (#1980)
* Changed progress dialog to a true percentage calculation
* Removed some unnecessary code
2018-05-20 21:12:06 -04:00
Janek Bevendorff
b9fa06c890
Merge pull request #1975 from keepassxreboot/hotfix/prevent-locked-merge
Disable merge when database is locked
2018-05-19 07:37:45 +02:00
Jonathan White
2eb3159f8a
Disable merge when database is locked 2018-05-18 17:06:38 -04:00
Janek Bevendorff
8a0aae775a
Merge pull request #1971 from keepassxreboot/fix/snapcraft
Build snaps using custom Docker image
2018-05-18 10:09:27 +02:00
Jonathan White
dbc7593328
Build snaps using custom Docker image
* Added --snapcraft option to release-tool build command
2018-05-16 22:40:36 -04:00
Janek Bevendorff
e5e6e8cbd5
Merge pull request #1964 from maggu2810/qt-5.11
fix missing include for Qt 5.11
2018-05-16 10:32:49 +02:00
Markus Rathgeb
3bbc6ac0e6 fix missing include for Qt 5.11
Qt 5.11 cleanes up the internal headers and so consumers could fail by
missing includes.

See: https://bugs.gentoo.org/655844
Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2018-05-16 10:15:30 +02:00
TheZ3ro
a6486f0adc
Merge pull request #1818 from varjolintu/unix_socket_location
Change Unix socket location
2018-05-16 09:41:44 +02:00
varjolintu
bf5f82ff27 Change Unix socket location 2018-05-16 07:37:25 +03:00
Janek Bevendorff
98131c3e5e
Merge pull request #1948 from yan12125/issue1909
SSH Agent: Don't mark the entry dirty when the public key is changed
2018-05-15 09:18:22 +02:00
Chih-Hsuan Yen
1d499d2f29 SSH Agent: Don't mark the entry dirty when the public key is changed
That occurs when the key is decrypted and/or added to the agent, and
neither of them indicates changes in entry data.

Fixes #1909
2018-05-12 23:01:01 +08:00
Vladimir Svyatski
30ccc102d2 Merge remote-tracking branch 'upstream/develop' into develop 2018-05-10 22:34:38 +03:00
Janek Bevendorff
dee7572c5d
Merge pull request #1927 from keepassxreboot/hotfix/snapcraft
Update snapcraft to use ppa packages
2018-05-09 22:46:02 +02:00
Jonathan White
f524d51624 Update snapcraft to use ppa packages 2018-05-09 13:45:12 -04:00
Janek Bevendorff
b02bd59e0c
Merge branch 'master' into develop 2018-05-09 19:25:58 +02:00
Janek Bevendorff
0a155d89a3
Release 2.3.3
- Fix crash when browser integration is enabled [#1923]
2018-05-09 19:25:19 +02:00
Janek Bevendorff
27b08725fc
Update translations 2018-05-09 19:25:16 +02:00
Janek Bevendorff
34ed6fdd1c
Bump version to 2.3.3 2018-05-09 19:22:16 +02:00
Jonathan White
4f304aa384 Fix Windows 32-bit building with ASLR 2018-05-09 13:03:55 +02:00
varjolintu
3d3bc7a062 Null check 2018-05-09 11:16:08 +02: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
Jonathan White
2bb72eba02
Release 2.3.2
- Enable high entropy ASLR on Windows [#1747]
- Enhance favicon fetching [#1786]
- Fix crash on Windows due to autotype [#1691]
- Fix dark tray icon changing all icons [#1680]
- Fix --pw-stdin not using getPassword function [#1686]
- Fix placeholders being resolved in notes [#1907]
- Enable auto-type start delay to be configurable [#1908]
- Browser: Fix native messaging reply size [#1719]
- Browser: Increase maximum buffer size [#1720]
- Browser: Enhance usability and functionality [#1810, #1822, #1830, #1884, #1906]
- SSH Agent: Parse aes-256-cbc/ctr keys [#1682]
- SSH Agent: Enhance usability and functionality [#1677, #1679, #1681, #1787]
2018-05-07 23:20:10 -04:00
Jonathan White
902584855b
Update translations 2018-05-07 23:20:04 -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
Jonathan White
13a313ff66 Remove resolving placeholders for notes 2018-05-06 15:44:27 -04:00
Jonathan White
9ed2a74421 Configurable global autotype start delay 2018-05-06 20:54:11 +02: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
louib
f25c8d3d2a Adding a GUI test. 2018-04-30 17:07:07 -04:00
TheZ3ro
5c7aaf5754
Merge pull request #1850 from varjolintu/create_totp_attribute
Pass TOTP with credential data to KeePassXC-Browser
2018-04-29 18:12:11 +02:00
louib
64917bd9fb Disable merge button when db is locked. 2018-04-27 21:29:00 -04:00
varjolintu
a910821506 Fix Windows build with socket size 2018-04-27 15:28:12 -04:00
varjolintu
2110ae4d33 Create KPH attribute for browser integration 2018-04-27 11:19:02 +03:00
Jonathan White
062503a903
Fix windows building
Regression occured in 3a92e4
2018-04-26 23:12:10 -04:00
Vladimir Svyatski
bbfac92672 Add requested changes to PR #1819. 2018-04-10 08:27:23 +03:00
Vladimir Svyatski
2df6fd03fb Merge branch 'feature/hide-toolbar' into develop 2018-04-09 22:39:21 +03:00
Vladimir Svyatski
214f4b7dc2 Merge remote-tracking branch 'upstream/develop' into develop 2018-04-09 22:38:02 +03:00
Vladimir Svyatski
57860fc33c Fix to apply "Hide toolbar" without restart 2018-04-09 22:33:08 +03:00
Vladimir Svyatski
d843ad414a Use the "Hide toolbar" setting 2018-04-09 22:07:55 +03:00
Vladimir Svyatski
677b8caa63 Add UI setting "Hide toolbar (icons)" 2018-04-09 21:43:41 +03:00
TheZ3ro
5a84978dab
Merge pull request #1814 from keepassxreboot/fix/mac-build-error
Fix build error on macOS
2018-04-06 23:12:16 +02:00
Vladimir Svyatski
ddc4b9b7d5 Remove empty context menu from the main menu 2018-04-06 23:23:52 +03:00