Jonathan White
|
aba4fa94be
|
Merge remote-tracking branch 'keepassx/master'
# Conflicts:
# README.md
# share/translations/keepassx_de.ts
# src/CMakeLists.txt
# src/gui/MainWindow.h
|
2016-02-27 19:11:09 -05:00 |
|
Felix Geyer
|
4eea7c8297
|
Remove KEEPASSX_EXPORT attribute from Tools::binaryFind().
It's an inline function. Declaring it as KEEPASSX_EXPORT breaks
building on Windows.
Closes #373
|
2016-02-13 11:54:54 +01:00 |
|
Felix Geyer
|
71d4cb781d
|
Merge branch '2.0'
|
2016-01-29 17:22:37 +01:00 |
|
Felix Geyer
|
93585aded7
|
Always display scaled custom icons.
Closes #322
|
2016-01-26 22:44:38 +01:00 |
|
Felix Geyer
|
38245aa2a9
|
Add iconScaledPixmap() convenience functions.
|
2016-01-24 20:12:33 +01:00 |
|
Felix Geyer
|
1f33e6f044
|
Add Metadata::customIconScaledPixmap().
|
2016-01-24 20:12:33 +01:00 |
|
Felix Geyer
|
4752adf9d3
|
Move pixmap caching to Metadata.
|
2016-01-24 20:12:21 +01:00 |
|
Felix Geyer
|
ecfbf72a57
|
Merge branch '2.0'
|
2015-12-15 21:05:00 +01:00 |
|
Felix Geyer
|
17ab438c5a
|
Make sure Windows doesn't load DLLs from the current working directory.
|
2015-12-06 14:32:06 +01:00 |
|
Felix Geyer
|
77b4bfb14e
|
Cleanup string argument numbers.
|
2015-12-06 14:31:23 +01:00 |
|
Felix Geyer
|
2fa531745f
|
Check XML key file for valid base64 before using it.
QByteArray::fromBase64() doesn't validate the input.
Closes #366
|
2015-11-01 18:32:15 +01:00 |
|
Felix Geyer
|
dff3fc0572
|
Coding style fixes.
|
2015-10-15 18:02:31 +02:00 |
|
Felix Geyer
|
5de0ec94e0
|
Stop using deprecated methods from QtAlgorithms.
|
2015-10-13 22:52:07 +02:00 |
|
Felix Geyer
|
3dd98deecc
|
Use QStandardPaths::DataLocation instead of AppDataLocation.
AppDataLocation is only available in Qt >= 5.4.
|
2015-09-12 18:41:48 +02:00 |
|
Paultergeist
|
abacec5787
|
Fixed compile error on Mac
|
2015-09-12 14:00:53 +02:00 |
|
Felix Geyer
|
7fa0eddc5f
|
Make C++11 mandatory.
|
2015-09-12 13:55:50 +02:00 |
|
Felix Geyer
|
0e85c98d02
|
Remove backported definitions from Global.h.
|
2015-09-12 13:51:49 +02:00 |
|
Felix Geyer
|
ba1ca4ec08
|
Rename x11 auto-type plugin to xcb.
This matches what QGuiApplication::platformName() returns.
|
2015-09-12 13:51:49 +02:00 |
|
Felix Geyer
|
460b23b1eb
|
Use QElapsedTimer everywhere.
|
2015-09-12 13:51:49 +02:00 |
|
Felix Geyer
|
9882f16614
|
Remove Tools::currentDateTimeUtc().
|
2015-09-12 13:51:49 +02:00 |
|
Felix Geyer
|
03a330a4dd
|
Port Tools::platform() to Qt 5.
The Q_WS_* definitions are gone.
|
2015-09-12 13:51:49 +02:00 |
|
Felix Geyer
|
5ad9edc3fd
|
QDesktopServices::storageLocation() calls to QStandardPaths.
|
2015-09-12 13:51:49 +02:00 |
|
Felix Geyer
|
c714fc89f1
|
Add missing include statements.
|
2015-09-12 13:51:49 +02:00 |
|
Felix Geyer
|
5a745da07b
|
Remove QCOmmandLineParser.
It is part of Qt >= 5.2.
|
2015-09-12 13:51:49 +02:00 |
|
Felix Geyer
|
531018e58d
|
Remove QSaveFile and QLockFile.
They are part of Qt >= 5.1.
|
2015-09-12 13:51:49 +02:00 |
|
Felix Geyer
|
af3d896bdf
|
Make setNativeLocks() non-fatal on OS X.
|
2015-07-21 23:12:20 +02:00 |
|
Felix Geyer
|
ceeb72a277
|
Pull QLockFile updates from the qtbase repository.
|
2015-07-21 23:11:02 +02:00 |
|
Felix Geyer
|
607007f94f
|
Display country in language list.
But only if the translation specifies one.
|
2015-07-18 18:38:41 +02:00 |
|
Felix Geyer
|
6889cc2f20
|
Another Qt 4.6 compatibility fix.
|
2015-07-16 22:55:50 +02:00 |
|
Felix Geyer
|
8325b20d36
|
Make QElapsedTimer optional in QLockFile.
This restores compatibility with Qt 4.6.
|
2015-07-16 21:52:08 +02:00 |
|
Felix Geyer
|
719ac64851
|
Fix unused variable warning.
|
2015-07-16 19:49:41 +02:00 |
|
Felix Geyer
|
8ad48d6774
|
Protect against emitting inactivityDetected() while it'is still processed.
|
2015-07-13 21:25:48 +02:00 |
|
Felix Geyer
|
154f1673e9
|
QSaveFile: Flush temporary file and fsync before renaming.
Closes #301
|
2015-07-13 21:01:53 +02:00 |
|
Felix Geyer
|
577609b3e3
|
Make calling QSaveFile::commit() non-fatal if it's not open.
|
2015-07-13 21:00:50 +02:00 |
|
denk-mal
|
5982763bed
|
implement a (nonperfect) hide-to-tray on win close
|
2015-06-18 15:23:41 +02:00 |
|
Ivan
|
a115bbdc6f
|
Merge branch 'master' of https://github.com/keepassx/keepassx
|
2015-05-22 21:06:32 -07:00 |
|
Felix Geyer
|
a8bf6a9782
|
Refactor Tools::disableCoreDumps().
- Use all available methods.
- Don't print a warning when no method is implmeneted on the platform.
|
2015-05-14 12:58:00 +02:00 |
|
Felix Geyer
|
eeb940c0dc
|
Fix plugin path detection when installed with DESTDIR.
This is in no way perfect but should cover most common cases.
Closes #291
|
2015-05-12 22:24:59 +02:00 |
|
Felix Geyer
|
05b5446e94
|
Protect opened databases with a file lock.
Closes #18
|
2015-05-12 22:24:45 +02:00 |
|
Ivan
|
33ed4fd7cf
|
Merge branch 'master' of https://github.com/keepassx/keepassx
|
2015-05-12 11:03:48 -07:00 |
|
Felix Geyer
|
a762cef0a9
|
Catch and handle all errors from libgcrypt.
|
2015-05-09 23:21:44 +02:00 |
|
dartraiden
|
3fca61dc24
|
spelling correction, fixed typos
|
2015-05-06 19:38:43 +03:00 |
|
Felix Geyer
|
6411b9bd66
|
Merge remote-tracking branch 'github/pr/82'
https://github.com/keepassx/keepassx/pull/82
Closes #145
|
2015-04-14 23:07:14 +02:00 |
|
Ivan
|
d70ee509b4
|
Merge branch 'master' of https://github.com/keepassx/keepassx
|
2015-04-11 15:41:25 -07:00 |
|
Felix Geyer
|
cf0bc32b27
|
Store icons with a resolution of up to 128x128 px.
Follows what KeePass 2.29 will implement.
|
2015-04-08 18:22:13 +02:00 |
|
Felix Geyer
|
93ab7eb058
|
Use CMAKE_INSTALL_DATADIR to look for the data dir.
|
2015-04-08 18:07:53 +02:00 |
|
Felix Geyer
|
b055d524e8
|
Merge branch 'lockdb'
|
2015-04-05 10:38:58 +02:00 |
|
Ivan
|
e20968bdfe
|
Merge branch 'master' of https://github.com/keepassx/keepassx
|
2015-04-04 23:31:12 -07:00 |
|
Felix Geyer
|
3ab1072e9e
|
Scale new custom icons down to 64x64 if they are larger.
|
2015-03-31 22:31:04 +02:00 |
|
Joe Harvell
|
00df73ced0
|
Issue #270 - turning off key location memory
Add general settting for whether or not to remember last key files
|
2015-03-14 22:06:53 -05:00 |
|