Commit Graph

1615 Commits

Author SHA1 Message Date
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
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
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
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
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
Janek Bevendorff
3e6f76826b
Don't show cmd:// prefix in confirmation dialog 2017-01-28 14:24:33 +01:00
Janek Bevendorff
01e9d39b63
Add 'Remember my choice' checkbox
Allow user to store preference when asked whether to execute command, resolves #51
2017-01-28 14:18:43 +01:00
Janek Bevendorff
0116d4176a Merge pull request #235 from Throne3d/fix/51-prompt-before-cmd
Prompt the user before executing a command in a cmd:// URL
2017-01-28 02:11:17 +02:00
Edward Jones
7ea306a61a Prompt the user before executing a command in a cmd:// URL
Fixes #51.
(Does not have a "don't ask me anymore" option.)
2017-01-28 00:05:14 +00:00
Janek Bevendorff
cdaab550e9 Merge pull request #234 from Throne3d/improve-contributingmd
Update CONTRIBUTING.md
2017-01-28 01:50:16 +02:00
Edward Jones
aa6f617715 Update CONTRIBUTING.md
* Replace instances of 'KeePassX Reboot' with 'KeePassXC'
* Lowercase headers to be consistent with README
* Add more headers to the table of contents
* Make the link to the issue tracker more prominent (preferred over
Google Groups, apparently)
* Add information about the #keepassxc-dev IRC channel on Freenode
* Add 'hotfix' to the branch strategy (seems in the standard and
is also used)
* Rephrase some paragraphs to make them clearer, fix a few typos
2017-01-27 23:32:13 +00:00
Janek Bevendorff
7e4592c1e7 Merge pull request #233 from louib/fix/downloadIconCrash
Fixes #225 : downloading favicon crash
2017-01-27 21:57:35 +02:00
Janek Bevendorff
b97024c8f6
Add more KeePassXC branding to the Windows installer 2017-01-27 20:42:27 +01:00
thez3ro
0f44f6752e
Fix entropy_meter script 2017-01-27 20:39:32 +01:00
Louis-Bertrand Varin
3c9054c36f Fixes #225 : downloading favicon crash 2017-01-27 13:49:33 -05:00
Janek Bevendorff
61379d4e05 Merge pull request #229 from keepassxreboot/hotfix/192-password-generator-button-padding
Use consistent button min-heights, resolves #192
2017-01-27 19:48:42 +02:00
Janek Bevendorff
fd2b779bb8
Use consistent button min-heights, resolves #192 2017-01-27 18:48:12 +01:00
Janek Bevendorff
202e8ac3a1 Merge pull request #230 from keepassxreboot/hotfix/228-password-generator-text-size
Don't make font size of password strength labels smaller than 8pt, resolves #228
2017-01-27 19:47:03 +02:00
Janek Bevendorff
6796f20683
Remove hardcoded font size from UI file 2017-01-27 18:11:17 +01:00
Janek Bevendorff
cdc9fddc44
Don't make font size of password strength labels smaller than 8pt, resolves #228 2017-01-27 17:59:03 +01:00
Janek Bevendorff
6409661a9f Merge pull request #227 from louib/feature/generateButton
Reuse password generator icon.
2017-01-27 18:27:21 +02:00
Louis-Bertrand Varin
4ed03c2db2 Reuse password generator icon. 2017-01-26 21:00:52 -05:00
Janek Bevendorff
7b2a9f7ea8 Merge pull request #226 from louib/fix/generatorCrash
Fixes #199 : Disable buttonGenerate when no classes.
2017-01-27 03:40:09 +02:00
Louis-Bertrand Varin
0d222e138f else on the same line. 2017-01-26 20:35:24 -05:00
Louis-Bertrand Varin
a80c415fc0 Disable buttonGenerate when no classes. 2017-01-26 20:35:17 -05:00
Janek Bevendorff
3f1a75f40a
Merge pull request #222 from rockihack/fix-global-autotype
MacOS: Fix Global Autotype in Google Chrome, resolves #212
2017-01-26 21:50:35 +01:00