Commit Graph

2083 Commits

Author SHA1 Message Date
TheZ3ro
e6cddf797a Merge branch 'develop' into fix-bugs-link 2017-05-28 10:12:55 +02:00
TheZ3ro
8a1b83048f Merge pull request #601 from keepassxreboot/hotfix/compile-error
Fixed variable naming error that prevented compiling on Windows
2017-05-28 09:31:03 +02:00
Toni Spets
ac5c0c5efa Fix about dialog report bugs link functionality 2017-05-28 08:11:02 +03:00
Jonathan White
bfee734669
Fixed variable naming error that prevented compiling on Windows 2017-05-27 21:33:30 -04:00
TheZ3ro
22d533c451 Merge pull request #510 from antongulenko/single-instance
Single instance
2017-05-27 13:06:23 +02:00
TheZ3ro
adf61d9878 Merge branch 'develop' into single-instance 2017-05-27 09:18:13 +02:00
louib
dcc8094ce4 Add the GUI prompt option to the merge command. (#589) 2017-05-25 13:07:24 -04:00
louib
c3bd5d21aa Adding a GUI prompt for password. (#587) 2017-05-22 17:53:41 -04:00
Janek Bevendorff
a75746c7c1 Merge pull request #588 from louib/find_by_name
Find entry by title.
2017-05-21 21:26:55 +02:00
Louis-Bertrand Varin
eeafe77614 Find entry by title. 2017-05-21 13:51:16 -04:00
louib
54ad927044 Moving print group in Group class. (#586) 2017-05-21 13:05:44 -04:00
louib
a2e82dc883 Feature : clip command (#578) 2017-05-19 14:04:11 -04:00
Janek Bevendorff
6c050c55d9 Merge pull request #583 from keepassxreboot/feature/macos-minimize-onclose
Add trayicon on macOS and enable minimize onClose
2017-05-19 18:51:17 +02:00
Janek Bevendorff
379e17c3bc Merge branch 'develop' into feature/macos-minimize-onclose 2017-05-19 18:08:40 +02:00
thez3ro
c0640e49ee
revert old if structure 2017-05-19 14:30:09 +02:00
TheZ3ro
07d4668670 Merge pull request #582 from weslly/feature/macos-minimize-onclose
Fix quit submenu on macOS tray icon
2017-05-19 14:19:11 +02:00
Weslly
1c54d24962 Fix quit submenu on macOS tray icon 2017-05-19 00:50:24 -03:00
Janek Bevendorff
aa64b2ee69 Merge pull request #580 from keepassxreboot/feature/430-fix-unclean-shutdown
Feature/430 fix unclean shutdown
2017-05-17 23:18:46 +02:00
Janek Bevendorff
00dc4b9ace
Ignore double close event on macOS, resolves #430 2017-05-17 22:44:09 +02:00
Janek Bevendorff
c69a978589 Merge pull request #545 from keepassxreboot/feature/lock-db-on-session-lock-#134
Lock database on ScreenSaver/SessionLock
2017-05-17 22:43:39 +02:00
thez3ro
b69b50c6c6
fix codestyle and use C++11 keywords 2017-05-17 13:04:02 +02:00
Louis-Bertrand Varin
970525cfd4
Styling + CFNotificationName -> CFStringRef 2017-05-17 13:04:02 +02:00
thez3ro
533136fb0e
Add file header, use nullptr instead of NULL, fix code style 2017-05-17 13:04:02 +02:00
Jonathan White
3218cb9ace
Moved locking checkboxes into security settings 2017-05-17 13:04:02 +02:00
Jonathan White
147c000ef1
Corrected nullptr crash on Windows when going to sleep 2017-05-17 13:04:02 +02:00
thez3ro
8ddd0b2f6f
Revert travis settings 2017-05-17 13:04:02 +02:00
thez3ro
1b7b2ff456
Added freedesktop DBus, fixed codestyle 2017-05-17 13:04:02 +02:00
Claudio Bantaloukas
289e98ed5b
remove commented code 2017-05-17 13:04:02 +02:00
Claudio Bantaloukas
d1acd75068
Moved "Lock databases on screen lock" setting to security settings
widget.
Changed wording and preference variable name for conformity with
existing settings.
2017-05-17 13:04:02 +02:00
Claudio Bantaloukas
44085df592
Avoid warning in MacOS implementation 2017-05-17 13:04:02 +02:00
Claudio Bantaloukas
a3af8fc0ea
Fix Linux ScreenLockListener implementation 2017-05-17 13:04:02 +02:00
Claudio Bantaloukas
c6ecf48ccd
enable OS X build with Xcode 8.2 2017-05-17 13:04:02 +02:00
Claudio Bantaloukas
2de5a9d281
Lock database when OS is locked (Windows, DBus, macOS implementations) #134 2017-05-17 13:04:02 +02:00
Janek Bevendorff
a6bc3e9790 Merge pull request #571 from yan12125/feature/allow-disable-app-bundle
Allow disabling .app bundles on Mac
2017-05-14 20:02:19 +02:00
Yen Chi Hsuan
c53f5baceb Merge branch 'develop' into feature/allow-disable-app-bundle 2017-05-14 22:58:17 +08:00
Yen Chi Hsuan
3822625e77 Allow disabling .app bundles on Mac 2017-05-14 22:51:12 +08:00
Louis-Bertrand Varin
00ae123736 Adding .clang-format file. 2017-05-14 09:20:13 -04:00
Robert van Bregt
c167693ae4 add fix for mac qt build environment
Signed-off-by: Robert van Bregt <robert@robertvanbregt.nl>
2017-05-14 09:19:35 -04:00
Jens Rutschmann
9a59a124aa Compare window title with entry URLs during autotype matching. (#556)
* Compare window title with entry URLs during autotype matching.

* Adapted option label to reflect that both entry title and URL are used for auto-type window matching.
2017-05-13 19:02:54 -04:00
TheZ3ro
03f00c5526 Merge pull request #566 from metbril/patch-1
Update README.md
2017-05-12 18:43:49 +02:00
TheZ3ro
bdb6153b3e Merge pull request #562 from keepassxreboot/feature/unlocked-tray-icon
Use a dedicated tray icon when the database is unlocked.
2017-05-12 18:42:48 +02:00
Robert
70357be029 Update README.md
changed reference to new build instructions
2017-05-12 10:54:01 +02:00
thez3ro
8d6db27b34
add tray icon to MacOS X 2017-05-11 13:44:08 +02:00
Jan Hellwig
c06e55df81
Use a dedicated tray icon when the database is unlocked. 2017-05-11 12:27:40 +02:00
Anton Gulenko
58463bc3dc Fixed string literals 2017-05-09 14:13:25 +02:00
VukoDrakkeinen
d1310b3337 Raise existing instance
Closes #193
2017-05-09 14:06:45 +02:00
thez3ro
b3160a17ea
enable minimize on close for macOS 2017-05-08 23:27:54 +02:00
Janek Bevendorff
9f819061cd Merge pull request #550 from keepassxreboot/bugfix/autotype-delay
Added small delays to autotype on Linux
2017-05-07 11:36:51 +02:00
Jonathan White
e4e2e886e8
Added small delays to autotype on Linux 2017-05-06 23:31:28 -04:00
Janek Bevendorff
278baaac80 Merge pull request #549 from keepassxreboot/hotfix/cmake_updates
Cleanup CMake files
2017-05-07 00:56:41 +02:00