Janek Bevendorff
067da8223d
Fix build after merge
2017-10-21 22:38:24 +02:00
Janek Bevendorff
b510243dd8
Merge branch 'release/2.2.2' into develop
2017-10-21 22:23:27 +02:00
Peter Nirschl
a895729b9e
🐛 Fix result propagation in SymmetricCipherGcrypt::process
...
The boolean 'ok' has always been set to true, regardless of possible errors.
2017-10-21 20:00:28 +02:00
Adolfo E. García
7198f20d69
Improve building of macOS target
2017-10-21 10:12:28 -06:00
Janek Bevendorff
aba2acb062
Use QSharedPointer
2017-10-21 14:19:00 +02:00
Louis-Bertrand Varin
a1aad5d165
Using QScopedPointer
2017-10-21 14:19:00 +02:00
Louis-Bertrand Varin
0fe06b3fbb
Fix double warning display for database open
2017-10-21 14:19:00 +02:00
Janek Bevendorff
7cc6f6f2a3
Merge pull request #1059 from frostasm/add-auto-hide-functionality-to-inline-message-widget
...
Add auto hide functionality to inline message widget (#1006 )
2017-10-21 13:47:06 +02:00
Adolfo E. García
86cd2c09a4
Improve readability of code
2017-10-21 13:15:02 +02:00
Adolfo E. García
f1d99dd0ed
Improve testing of Base32
2017-10-21 13:15:02 +02:00
Adolfo E. García
c731f8e5c0
Fix bug in Base32::decode and add bounds check
...
The bug that was fixed, was affecting how the number of bytes of decoded data was calculated and thus, even though it didn't truncate the result, it was causing the array to be resized unnecessarily.
2017-10-21 13:15:02 +02:00
Adolfo E. García
24f560aaa2
Replace Optional with QVariant
2017-10-21 13:15:02 +02:00
Adolfo E. García
905e104ba2
Revert formatting change
2017-10-21 13:15:02 +02:00
Adolfo E. García
d21ae0f94a
Fix for loop's variable increment style
2017-10-21 13:15:02 +02:00
Adolfo E. García
95b0ad15ef
Fix code style
2017-10-21 13:15:02 +02:00
Adolfo E. García
19eb6a8a60
Add new Base32 implementation
2017-10-21 13:15:02 +02:00
Janek Bevendorff
f634f20ccc
Merge branch 'release/2.2.2' into develop
2017-10-20 23:08:04 +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
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
bae9dbc407
Add distribution information to debug info screen
2017-10-19 15:52:46 +02:00
rockihack
c6f83b9ca6
Fix: Regenerate transform seed and transform master key on save.
2017-10-18 23:04:37 -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
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
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
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
de5f8082de
Check for mismatched passwords BEFORE saving to prevent data loss
2017-09-29 18:11:53 -04:00
Jonathan White
59786d7bd7
Mask passwords in URL column in Entry View
2017-09-29 16:14:41 -04:00
Jonathan White
cb0b948603
Multiple fixes to custom icon downloading
...
* Fixes #904 , icons are saved at or below 128x128
* Fixes #403 , crash occurs due to dialog on non-gui thread
* Fixes #232 , icon hashes calculated and compared against
2017-09-29 09:01:55 -04:00
