Commit Graph

2440 Commits

Author SHA1 Message Date
Janek Bevendorff
f634f20ccc
Merge branch 'release/2.2.2' into develop 2017-10-20 23:08:04 +02:00
thez3ro
feb6baad05 add KeePassHTTP-Connector 2017-10-20 21:59:15 +02:00
Jonathan White
37aa4f0257 Unlock previously opened databases with --pw-stdin 2017-10-20 01:21:32 +02:00
Janek Bevendorff
190d3a1da9 Merge pull request #1078 from frostasm/implement-recursive-resolving-for-placeholders
Implement recursive resolving for placeholders
2017-10-19 21:50:57 +02:00
Janek Bevendorff
8592f7e672 Merge branch 'release/2.2.2' into develop 2017-10-19 21:45:49 +02:00
frostasm
f0fcc19915 Implement recursive resolving for placeholders 2017-10-19 22:40:26 +03:00
frostasm
e81d8beb19 Refactor Entry::resolvePlaceholder function 2017-10-19 22:40:26 +03:00
frostasm
5e0df62d7a Add processing of the url placeholders 2017-10-19 22:40:26 +03:00
Janek Bevendorff
d3208bddb0 Enhance lupdate-qt5 check 2017-10-19 21:24:31 +02:00
Janek Bevendorff
eb977b8021 Check AppStream info file before merging releases 2017-10-19 21:24:31 +02:00
Janek Bevendorff
b30eb59791 Extend desktop file and name it according to the freedesktop specification 2017-10-19 21:24:31 +02:00
Janek Bevendorff
72a6c34450 Add AppStream AppData file, resolves #1066 2017-10-19 21:24:31 +02:00
frostasm
f38fe5a9dd Disable automatic hiding of an information message for YubiKey 2017-10-19 22:22:10 +03:00
frostasm
75cfe1c5dd Add the auto hide functionality to the MessageWidget 2017-10-19 22:22:10 +03:00
Janek Bevendorff
ec8c99c3b2 Fix remaining uses of KEEPASSXC_SNAP_BUILD 2017-10-19 15:52:46 +02:00
Janek Bevendorff
6d433fecef Set KEEPASSXC_DIST_TYPE when building AppImages and Snaps 2017-10-19 15:52:46 +02:00
Janek Bevendorff
bae9dbc407 Add distribution information to debug info screen 2017-10-19 15:52:46 +02:00
Janek Bevendorff
1cbbcc0d87 Allow starting AppImage with custom extended QT_PLUGIN_PATH, resolves #1077 2017-10-19 15:52:46 +02:00
Janek Bevendorff
c0182df05e Add CLion build directories 2017-10-19 15:52:46 +02:00
Jonathan White
7d6baf53fa Merge pull request #1047 from aidanhs/aphs-fix-dockerfile
Fix builds in Docker
2017-10-18 23:05:32 -04:00
rockihack
c6f83b9ca6 Fix: Regenerate transform seed and transform master key on save. 2017-10-18 23:04:37 -04:00
Adolfo E. García
1374c68274 Add .DS_Store (mac os) to .gitignore 2017-10-15 06:56:52 -04:00
alterratz
6c3d6b7c28 Merge branch 'develop' into feature/autoopen 2017-10-13 22:38:51 +02:00
Bernhard Rieder
0fc8c37f23 changed file:/ to file:// 2017-10-12 23:30:51 +02:00
Janek Bevendorff
ab21f718ba Merge branch 'release/2.2.2' into develop 2017-10-12 14:10:20 +02:00
Janek Bevendorff
42c7256a55 Merge pull request #1056 from frostasm/add-auto-type-action-in-toolbar
Add button for auto-type in the toolbar (#1026)
2017-10-12 11:25:55 +02:00
frostasm
24333d0a19 Add toolbar button for copy url to clipboard 2017-10-12 11:46:01 +03:00
frostasm
60215cf2cf Add button for auto-type in the toolbar (#1026) 2017-10-12 11:46:01 +03:00
Jonathan White
3bc8a79b9b Both slots on Yubikey are now polled for challenge/response 2017-10-09 09:39:47 -04:00
Bernhard Rieder
6d569a86f9 added autoopen functionality (#477) 2017-10-09 13:26:24 +02:00
Aidan Hobson Sayers
84508e91da Disable apparmor to use fuse
Necessary for an Ubuntu 16.04, Docker 17.09.0-ce host
See https://github.com/moby/moby/issues/9448#issuecomment-289950103
2017-10-07 23:37:39 +01:00
Aidan Hobson Sayers
38cbb42b58 Use the renamed QT ppa (with packages named the same) 2017-10-07 23:37:34 +01:00
TheZ3ro
549fef8eb5 Merge pull request #992 from guzzard/middle-mouse-click-status-icon
Toggle main window by middle mouse clicking tray icon
2017-10-07 18:30:55 +02:00
TheZ3ro
e9dd6e6c90 Merge branch 'develop' into middle-mouse-click-status-icon 2017-10-07 17:57:38 +02:00
Louis-Bertrand Varin
2e81751131 Backporting #1008 2017-10-07 11:03:24 -04:00
louib
242faa138b Add custom icons when merging. (#1008)
* Adding missing custom icons on merge.
* qDebug when adding icon
* Adding test for merge custom icons.
2017-10-07 10:40:29 -04:00
Jonathan White
157f1134bf
Select custom icon radio button after successful download 2017-10-07 08:49:14 -04:00
Jonathan White
4277364e91 Fixed cast warning 2017-10-07 07:36:25 -04:00
Weslly
0d5fec6dfc Merge pull request #1039 from weslly/fix/macos-man-dir
Fix macOS man path
2017-10-06 20:59:04 -03:00
Weslly
8a8eecbe8b Fix macOS man path 2017-10-06 00:15:23 -03:00
frostasm
4e903e4c50
Fix memory leak in DatabaseTabWidget::openDatabase function 2017-10-05 18:03:01 -04:00
frostasm
2481367ab4 Fix memory leak in DatabaseTabWidget::openDatabase function 2017-10-05 18:01:54 -04:00
Jonathan White
5098866413 Rewrote resolveUrl function to conform to various test cases 2017-10-03 18:40:32 -04:00
Jonathan White
91d746c5c0 Corrected issues with desktop and tray icons in snap build 2017-10-03 15:43:52 -04:00
rockihack
e53754d202
Fix build on mac os with qt 5.9.1 2017-10-03 15:01:54 -04:00
thez3ro
eb21eeb214 Fix GoogleFallback/Screnlock settings 2017-10-03 17:37:26 +02:00
Jonathan White
14e3d9d576
Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	src/core/Group.cpp
2017-10-01 11:10:10 -04:00
Jonathan White
2bce9c8add
Release 2.2.1
- Corrected multiple snap issues [#934, #1011]
- Corrected multiple custom icon issues [#708, #719, #994]
- Corrected multiple Yubikey issues [#880]
- Fixed single instance preventing load on occasion [#997]
- Keep entry history when merging databases [#970]
- Prevent data loss if passwords were mismatched [#1007]
- Fixed crash after merge [#941]
- Added configurable auto-type default delay [#703]
- Unlock database dialog window comes to front [#663]
- Translation and compiling fixes
2017-10-01 11:01:17 -04:00
Jonathan White
c8f5824554
Update translations 2017-10-01 10:59:14 -04:00
Jonathan White
7d3c18e1fb
Version number bump 2017-10-01 10:58:00 -04:00