Commit Graph

2339 Commits

Author SHA1 Message Date
TheZ3ro
03eda06a38 Merge pull request #910 from Typz/xfce-lock
Detect session lock on Xfce/XUbuntu 16.04
2017-10-25 17:59:38 +02:00
Francois Ferrand
263bee3c09 Detect session lock on Xfce/XUbuntu 16.04
The current code does not work with XUbuntu 16.04, which uses
light-locker to lock the screen.

I am not using a screensaver, but I suspect the screensaver activation
may have been detected by the existing events, and using it could thus
mask the issue.
2017-10-25 17:09:00 +02:00
Janek Bevendorff
0c3f352c63 Merge pull request #1119 from louib/no_reload_prompt_when_locked
Disable reload prompt when db is locked
2017-10-25 16:45:51 +02:00
Louis-Bertrand Varin
055ba4f14e Q_NULLPTR -> nullptr 2017-10-25 10:15:37 -04:00
Louis-Bertrand Varin
ecfbad0443 Disable reload prompt when db is locked 2017-10-24 20:26:02 -04:00
TheZ3ro
8f0e717404 Merge pull request #1116 from keepassxreboot/fix/view_menu
Remove view menu and disable save button
2017-10-24 20:56:00 +02:00
thez3ro
4076b37378
disable the save button if there isn't anything to save 2017-10-24 20:40:53 +02:00
thez3ro
ca59ae4f4f
remove useless View menu 2017-10-24 20:40:53 +02:00
Janek Bevendorff
be88e93820
Merge branch 'release/2.2.3' into develop 2017-10-24 18:00:38 +02:00
Janek Bevendorff
83fd387f2f Fix desktop integration 2017-10-24 17:58:27 +02:00
Janek Bevendorff
cd6aac9acf Remove libdbus and libsystemd blacklisting 2017-10-24 17:58:27 +02:00
Janek Bevendorff
05d02b702a Restrict global menu fix to Qt < 5.9.0, resolves #691 2017-10-24 17:58:27 +02:00
Janek Bevendorff
f6933a8868 Ensure that YubiKey is only polled once, even if showEvent() is called twice 2017-10-24 17:58:27 +02:00
Janek Bevendorff
51b42bc7b8 Move back to Ubuntu 14.04, but with custom libyubikey and libykpers-1 builds, resolves #1114 2017-10-24 17:58:27 +02:00
TheZ3ro
e95f36c725 Merge pull request #1038 from frostasm/resolve-placeholders-in-window-association-title
AutoType: resolve placeholders for title in window associations
2017-10-23 23:38:54 +02:00
frostasm
b6387f7709 AutoType: resolve placeholders in window associations list 2017-10-23 22:55:22 +03:00
frostasm
1f5a0c0130 Add test for resolved placeholders in window association title 2017-10-23 22:55:22 +03:00
frostasm
7f2bd47849 AutoType: resolve placeholders for title in window associations 2017-10-23 22:55:22 +03:00
Janek Bevendorff
4c2bc56d2e Merge pull request #1108 from keepassxreboot/feature/clean-up-dockerfile
Reduce external dependencies and install YubiKey deps from EPEL
2017-10-22 23:09:34 +02:00
Janek Bevendorff
010690a9c7
Reduce external dependencies and install YubiKey deps from EPEL 2017-10-22 21:17:33 +02:00
Jonathan White
1a4303bbce Added tests for retention of entry history after merge 2017-10-21 22:49:20 -04:00
Janek Bevendorff
d4343a5e42
Merge branch 'master' into develop 2017-10-22 00:30:37 +02:00
Janek Bevendorff
6d46717cfc
Release 2.2.2
- Fixed entries with empty URLs being reported to KeePassHTTP clients [#1031]
- Fixed YubiKey detection and enabled CLI tool for AppImage binary [#1100]
- Added AppStream description [#1082]
- Improved TOTP compatibility and added new Base32 implementation [#1069]
- Fixed error handling when processing invalid cipher stream [#1099]
- Fixed double warning display when opening a database [#1037]
- Fixed unlocking databases with --pw-stdin [#1087]
- Added ability to override QT_PLUGIN_PATH environment variable for AppImages [#1079]
- Fixed transform seed not being regenerated when saving the database [#1068]
- Fixed only one YubiKey slot being polled [#1048]
- Corrected an issue with entry icons while merging [#1008]
- Corrected desktop and tray icons in Snap package [#1030]
- Fixed screen lock and Google fallback settings [#1029]
2017-10-22 00:28:08 +02:00
Janek Bevendorff
3088371631
Update translations 2017-10-22 00:28:04 +02:00
Janek Bevendorff
880a8da68a
Bump version to 2.2.2 and update changelog 2017-10-22 00:27:26 +02:00
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
Janek Bevendorff
e2c6f50108 Support starting keepassxc-cli via 'cli' argument 2017-10-21 22:05:13 +02:00
Janek Bevendorff
51ed7a59da Fix Exec replacement 2017-10-21 22:05:13 +02:00
Janek Bevendorff
94ea91ec63 Switch from Ubuntu 14.04 to CentOS 7 2017-10-21 22:05:13 +02:00
Janek Bevendorff
76ac8dda54 Fix missing semicolon 2017-10-21 22:05:13 +02:00
Janek Bevendorff
fe77360874 Merge pull request #1076 from adolfogc/cmake-fixes
Improve CMakeLists.txt
2017-10-21 20:01:23 +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
fdc7471a7b Make QtMacExtras optional 2017-10-21 10:12:28 -06:00
Adolfo E. García
7198f20d69 Improve building of macOS target 2017-10-21 10:12:28 -06:00
Adolfo E. García
de065c728f Enable option WITH_ASAN for macOS builds 2017-10-21 10:12:28 -06:00
Adolfo E. García
2fa3f5072d Simplify the ZLIB version check 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
Janek Bevendorff
a298d2976f Merge pull request #1097 from keepassxreboot/meta/contributing
Remove emoji in commit messages from style guide
2017-10-21 13:40:16 +02:00
Janek Bevendorff
09e94397aa
Remove emoji in commit messages from style guide 2017-10-21 13:27:25 +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