Commit Graph

1756 Commits

Author SHA1 Message Date
Jonathan White
425427c96c Merge pull request #174 from keepassxreboot/meta/release-preparation
Release preparation script
2017-02-09 19:47:33 -05:00
Janek Bevendorff
ac4346719b Merge pull request #268 from keepassxreboot/fix/custom-attribute
Fix autotype custom-attribute placeholder
2017-02-09 17:21:25 +01:00
Janek Bevendorff
e2c9fe8d12 Merge branch 'develop' into fix/custom-attribute 2017-02-09 17:12:24 +01:00
Janek Bevendorff
423de39ad0 Merge pull request #267 from keepassxreboot/fix/autotype-space
Allow space keyword in autotype sequence
2017-02-08 18:16:33 +01:00
Janek Bevendorff
6c45fcbfc7
Don't try to use theme icons for the system tray, resolves #194
Qt also looks in the program's working directory for icons, but apparently, the Ubuntu system tray doesn't, resulting in missing tray icons
2017-02-08 17:55:50 +01:00
thez3ro
51c668a0fd
fix tests with new CustomAttribute format 2017-02-08 01:14:52 +01:00
thez3ro
8408e7fdb4
fix #218 custom attribute like KeePass interface 2017-02-08 01:04:05 +01:00
thez3ro
2975eb315f
use space from XCB KeySym 2017-02-08 00:33:52 +01:00
thez3ro
0ac05dbb0f
fix #256 space in autotype sequence 2017-02-08 00:11:16 +01:00
Jonathan White
7db7747cb0
Merge remote-tracking branch 'origin/master' into develop 2017-02-06 20:29:21 -05:00
Janek Bevendorff
343a1e2a76
Also build http 2017-02-07 01:24:18 +01:00
Jonathan White
44c58a66d1
Release 2.1.1 2017-02-06 19:04:48 -05:00
Janek Bevendorff
8fc11c0791
Update translations 2017-02-07 00:49:32 +01:00
Jonathan White
db75d94961
Added release version and changelist 2017-02-06 18:43:11 -05:00
Janek Bevendorff
26ff528a85
Merge branch 'meta/release-preparation' into release/2.1.1 2017-02-06 23:27:05 +01:00
Janek Bevendorff
f7e9f85668
Install Qt 5.8 inside Docker container 2017-02-06 21:13:24 +01:00
Janek Bevendorff
75eb0c6951 Properly HTML-escape strings with user-defined contents in message boxes (#247)
* Properly HTML-escape strings with user-defined contents in message boxes, resolves #236

* Also escape group names in EditWidget title
2017-02-06 14:23:51 -05:00
Louis-Bertrand Varin
26fdb19344 Typo is snap description. 2017-02-05 14:08:37 -05:00
Janek Bevendorff
e31638d3dd
Fix formatting and coding style 2017-02-01 01:03:30 +01:00
Janek Bevendorff
e12cd83b80
Check for existence of realpath instead of operating system 2017-02-01 00:53:58 +01:00
Janek Bevendorff
040b476359
Manually implement realpath for OS X 2017-01-31 19:25:15 +01:00
Janek Bevendorff
d7633f40ba
Add Windows installer branding bitmaps 2017-01-30 21:28:59 +01:00
Janek Bevendorff
80fc8d4da9
Replace /bin/bash with /usr/bin/env bash 2017-01-30 18:36:11 +01:00
Janek Bevendorff
9a92d20001
Revert icon patch, because upstream patched fast
See 69bf4718be
2017-01-29 22:19:44 +01:00
Janek Bevendorff
2b18089641
Patch desktop integration script so that it finds the keepassxc.png icons 2017-01-29 21:58:54 +01:00
Janek Bevendorff
1da87d1d19
Only create bin-release dir on Linux 2017-01-29 20:58:09 +01:00
Janek Bevendorff
0c54276fe2
Support building on OS X (untested) 2017-01-29 20:46:57 +01:00
Janek Bevendorff
dda9a95163
Move packages to main release folder instead of bin-release on Windows 2017-01-29 12:53:52 +01:00
Janek Bevendorff
34fa456106
Add summary line to individual help pages 2017-01-29 12:52:05 +01:00
Louis-Bertrand Varin
0091cb3f23 Fixes database modified after discard 2017-01-28 22:21:44 -05:00
Janek Bevendorff
9fe4504623
Fix heredoc 2017-01-29 02:50:44 +01:00
Janek Bevendorff
08d68300bd
Disable GTK2 style again for now, since it seems to cause trouble with the tray icon 2017-01-29 02:46:02 +01:00
Janek Bevendorff
e326e2c6b3
Bundle GTK2 platform style 2017-01-29 02:24:12 +01:00
Janek Bevendorff
e94dc226b5
Downgrade to Ubuntu 14.04 2017-01-29 02:23:55 +01:00
Jonathan White
2afd21c7ba Merge pull request #167 from keepassxreboot/migrate/122-twofish
KeePassX PR Migration: #122 Twofish cypher support
2017-01-28 17:49:20 -05:00
Janek Bevendorff
bd2edea1c9
Ignore .github folder in exports 2017-01-28 23:40:57 +01:00
Janek Bevendorff
00cd0e1ae3
Use correct AppImage-Recipe.sh 2017-01-28 23:24:12 +01:00
Janek Bevendorff
05aefc6489
Show error when invalid command specified 2017-01-28 23:17:48 +01:00
Janek Bevendorff
5652018cde
Merge branch 'develop' into meta/release-preparation 2017-01-28 23:02:57 +01:00
Janek Bevendorff
a63ba6bc4f
Update translations before merging branches 2017-01-28 23:02:26 +01:00
Janek Bevendorff
c043be3aa4
Copy windows binaries to release-bin directory 2017-01-28 22:45:07 +01:00
Janek Bevendorff
b7180893c6
Fix check for Msys 2017-01-28 22:23:51 +01:00
Janek Bevendorff
96ca7a8cbc
Fix CMake options on Windows 2017-01-28 22:19:23 +01:00
Janek Bevendorff
c87c811719
Make release script more modular and useful on other platforms 2017-01-28 22:12:38 +01:00
Janek Bevendorff
4dab30ce6f
Break instead of returning 2017-01-28 17:53:19 +01:00
Janek Bevendorff
75dc21c66d
Implement Twofish CBC encryption and decryption tests 2017-01-28 17:53:17 +01:00
Timothy Redaelli
b0a4d7278a
Add Algorithm label / ComboBox in Database settings form 2017-01-28 17:53:14 +01:00
Timothy Redaelli
a01607e869
Add support for Twofish in KeePass2 code 2017-01-28 17:53:11 +01:00
Janek Bevendorff
a3fd3205a9 KeePassX PR Migration: #190 Search for Group Names (#168)
* Search Group details in addition to entry details; feature parity with KeePass
* Remove assertions to prevent crashes in Debug mode when search result is empty
2017-01-28 11:27:20 -05:00
Janek Bevendorff
55084499ac Merge pull request #237 from keepassxreboot/feature/51-remember-cmd-exec-decision
Add 'Remember my choice' checkbox, resolves #51
2017-01-28 18:08:58 +02:00