164 Commits

Author	SHA1	Message	Date
Janek Bevendorff	d4343a5e42	Merge branch 'master' into develop	2017-10-22 00:30:37 +02:00
Janek Bevendorff	880a8da68a	Bump version to 2.2.2 and update changelog	2017-10-22 00:27:26 +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	8592f7e672	Merge branch 'release/2.2.2' into develop	2017-10-19 21:45:49 +02: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
Janek Bevendorff	ab21f718ba	Merge branch 'release/2.2.2' into develop	2017-10-12 14:10:20 +02:00
Weslly	8a8eecbe8b	Fix macOS man path	2017-10-06 00:15:23 -03:00
Jonathan White	91d746c5c0	Corrected issues with desktop and tray icons in snap build	2017-10-03 15:43:52 -04:00
Jonathan White	7d3c18e1fb	Version number bump	2017-10-01 10:58:00 -04:00
Yen Chi Hsuan	ea1554915b	🐛 Use correct ZLib include path ... Fixes #801	2017-08-17 11:09:37 +08:00
Janek Bevendorff	35e86efbce	Require CMake 3.1.0 and update Dockerfile	2017-06-26 16:41:16 +02:00
Jonathan White	a3020b6787	Bumped version to 2.2.0 and populated CHANGELOG	2017-06-20 23:14:44 -04:00
thez3ro	a53b111182	Update and fix copyright headers	2017-06-14 15:54:43 +02:00
TheZ3ro	adf61d9878	Merge branch 'develop' into single-instance	2017-05-27 09:18:13 +02:00
Yen Chi Hsuan	3822625e77	Allow disabling .app bundles on Mac	2017-05-14 22:51:12 +08:00
VukoDrakkeinen	d1310b3337	Raise existing instance ... Closes #193	2017-05-09 14:06:45 +02:00
Jonathan White	5c8809e55d	Update cmake files, fixes #331	2017-05-06 11:51:43 -04:00
Jonathan White	af4f56abfd	Support vscode	2017-05-05 20:20:27 -04:00
seatedscribe	73b0188126	Substitute deprecated commands with feature_summary	2017-04-10 22:05:53 +02:00
Jonathan White	4cd461f57a	Disable DEP and ASLR for Debug builds. This allows for debugging with GDB.	2017-04-09 18:52:54 -04:00
Jonathan White	3de4395d5e	Merge remote-tracking branch 'origin/master' into develop	2017-04-09 10:28:15 -04:00
Jonathan White	918db68c52	Bumped version to 2.1.4, updated CHANGELOG	2017-04-09 09:54:55 -04:00
Louis-Bertrand Varin	e1e8f33f67	Install path on Mac.	2017-03-16 10:09:50 -04:00
Louis-Bertrand Varin	992d8a90c7	Migrate entropy-meter to keepassxc-cli	2017-03-16 10:09:50 -04:00
Janek Bevendorff	8b04040d7e	Add WITH_ASAN option to README	2017-03-16 00:20:38 +01:00
Janek Bevendorff	9608464ed1	Show error message when trying to use WITH_ASAN on Windows or OS X	2017-03-15 15:23:55 +01:00
Janek Bevendorff	2587bac300	Enable ASAN option in Travis build	2017-03-15 15:23:52 +01:00
Janek Bevendorff	504bd40263	Prevent massive end-of-process leak sanitizer dump	2017-03-15 15:23:50 +01:00
Janek Bevendorff	65d4a0a8cd	Add ASAN option to CMake	2017-03-15 15:23:44 +01:00
Janek Bevendorff	bb04144fe8	Merge branch 'develop' into feature/yubikey	2017-03-10 18:53:38 +01:00
Janek Bevendorff	34f037be92	Enable -fstack-protector-strong flag only for GCC >= 4.9 and Clang	2017-03-10 18:42:10 +01:00
Janek Bevendorff	15dd783d2c	Merge branch 'develop' into feature/yubikey	2017-03-10 18:01:14 +01:00
Janek Bevendorff	8a942422da	Harden Linux binary	2017-03-10 17:46:15 +01:00
rockihack	914b848e58	Enable DEP+ASLR for cmake modules (autotype dll).	2017-03-10 17:46:12 +01:00
rockihack	1984595d0d	Enable DEP and ASLR.	2017-03-10 17:46:08 +01:00
Janek Bevendorff	5df7b9aa85	Merge branch 'develop' into feature/yubikey	2017-03-03 22:04:55 +01:00
Jonathan White	7ec8d4c3f6	Fixed WITH_XC_AUTOTYPE and WITH_XC_HTTP descriptions	2017-03-02 22:07:42 -05:00
Jonathan White	3139ae1528	WITH_XC_AUTOTYPE defaults to ON and WITH_XC_HTTP includes ALL networking	2017-03-02 18:44:01 -05:00
Janek Bevendorff	e2d098dd9b	Bump version to 2.1.3, update CHANGELOG	2017-03-02 21:56:22 +01:00
Janek Bevendorff	48366d245c	Add CMake feature description	2017-02-25 17:14:10 +01:00
Janek Bevendorff	b2650c5a96	Hide UI elements when KeePassXC was compiled without -DWITH_XC_YUBIKEY	2017-02-21 01:06:32 +01:00
Janek Bevendorff	a27147a75e	Merge branch 'develop' into feature/yubikey	2017-02-20 20:24:38 +01:00
Janek Bevendorff	217e95e425	Bump version to 2.1.2	2017-02-17 15:56:05 +01:00
Janek Bevendorff	7df6d27900	Fix and clean up CMake files	2017-02-17 02:43:25 +01:00
Jonathan White	5274826e5c	Implemented qhttp in server protocol	2017-02-17 02:43:25 +01:00
Janek Bevendorff	37c7318097	Merge branch 'develop' into feature/yubikey	2017-02-15 00:24:28 +01:00