Janek Bevendorff
2c00cb555c
Add missing pull request reference
2017-01-22 19:58:22 +01:00
Janek Bevendorff
dcbc7ff217
Merge branch 'meta/release-preparation' into release/2.1.0
2017-01-22 19:52:26 +01:00
Janek Bevendorff
20f42aa2cc
Update CHANGELOG
2017-01-22 19:49:23 +01:00
Jonathan White
19fef019ed
Updated snapcraft file for release
2017-01-22 10:40:24 -08:00
Janek Bevendorff
ea02de0cc9
Add hint about merging back into develop and pushing changes
2017-01-22 19:14:56 +01:00
Janek Bevendorff
1525ffc225
Add release preparation script and AppImage recipe
2017-01-22 18:42:56 +01:00
Janek Bevendorff
5458d77980
Merge pull request #165 from keepassxreboot/test/newtravis
...
Travis builds release and debug using clang and gcc
2017-01-15 06:06:35 +02:00
Jonathan White
a545dc9264
Removed snapcraft and unspecified unique gcc build
2017-01-14 22:53:35 -05:00
Jonathan White
b7c658e8f8
Travis now performs Debug and Release builds
2017-01-14 22:53:31 -05:00
Janek Bevendorff
de69ecc35f
Merge pull request #141 from keepassxreboot/feature/searchui-enhance
...
Enhanced search ui keypress actions
Also resolves #163 : icons gone when running release-compiled binary from the build directory
2017-01-15 05:41:35 +02:00
Jonathan White
b6f754c29a
Changed built-in clear search button with custom one to fix pixelation
2017-01-14 22:29:16 -05:00
Jonathan White
39e0708b3b
Correcting missing icons when running release from build directory
2017-01-14 21:41:18 -05:00
Jonathan White
01464a7860
Added clear text button, accurate down arrow behavior, and fixed sizing
2017-01-14 20:27:34 -05:00
Louis-Bertrand Varin
fd3fefd6f1
Use placeholder for search widget.
2017-01-14 20:07:05 -05:00
Jonathan White
36df21d823
Enhanced search ui keypress actions
...
* Pressing down arrow will always focus on entry view
* Pressing enter opens currently selected entry
* Pressing CTRL+F focuses and selects search text
* Rewrote test cases to cover the new functionality
2017-01-14 19:47:35 -05:00
Janek Bevendorff
9dadafe20a
Merge pull request #160 from louib/feature/updateKdbxExtract
...
Fixes #156 : update kdbx-extract
2017-01-14 22:26:23 +02:00
Janek Bevendorff
6fd7427cae
Merge branch 'develop' into feature/updateKdbxExtract
2017-01-14 22:21:41 +02:00
Louis-Bertrand Varin
9065588a76
Remove unused dependencies.
2017-01-14 15:11:00 -05:00
Janek Bevendorff
b4b47ec8fd
Merge pull request #161 from keepassxreboot/migrate/191-spelling
...
KeePassX PR Migration: #191 Spelling (missing commits)
2017-01-14 21:41:25 +02:00
Janek Bevendorff
ea9f313416
Fix GUI test
2017-01-14 20:33:27 +01:00
Josh Soref
af8e770106
spelling: successfully
2017-01-14 20:13:42 +01:00
Josh Soref
10f03795f9
spelling: transform
2017-01-14 20:13:34 +01:00
Josh Soref
2ad7c5c675
spelling: toggle
2017-01-14 20:13:25 +01:00
Josh Soref
084a1dd7d2
spelling: whose
2017-01-14 20:12:32 +01:00
Janek Bevendorff
d1793d9bcf
Ask PR authors to remove lines that don't apply instead of changing emoji ( #159 )
...
* Ask user to remove lines that don't apply instead of changing emoji
* Replace KeePassXR with KeePassXC
* Add help text how to find KeePassXC version [skip ci]
* Combine documentation requirements into one [skip ci]
2017-01-14 14:09:59 -05:00
Louis-Bertrand Varin
d7ed33809f
Use QCommandLineParser
2017-01-14 14:08:10 -05:00
Louis-Bertrand Varin
798041fe11
Extract readKeyFromLine.
2017-01-14 13:25:30 -05:00
Janek Bevendorff
995420ee87
Merge pull request #158 from keepassxreboot/migrate/191-spelling
...
KeePassX PR Migration: #191 Spelling
2017-01-14 20:09:51 +02:00
Josh Soref
341ff3de37
spelling: recycle
2017-01-14 17:32:03 +01:00
Josh Soref
ce06fcdbe0
spelling: occurred
2017-01-14 17:32:03 +01:00
Josh Soref
b8c93b3572
spelling: finish
2017-01-14 17:32:03 +01:00
Josh Soref
4ea6faae81
spelling: executor
2017-01-14 17:32:03 +01:00
Josh Soref
ca8ddd5f39
spelling: decrypt
2017-01-14 17:31:38 +01:00
Josh Soref
3924f628b4
spelling: full
2017-01-14 17:31:38 +01:00
Josh Soref
53e0893b51
spelling: correct
2017-01-14 17:31:38 +01:00
Josh Soref
d988b9e6d2
spelling: characters
2017-01-14 17:31:38 +01:00
Josh Soref
6060f41458
spelling: available
2017-01-14 17:31:38 +01:00
Josh Soref
569ea3ebdd
spelling: attachments
2017-01-14 17:31:38 +01:00
Josh Soref
40eafa8adc
spelling: associations
2017-01-14 17:31:38 +01:00
Janek Bevendorff
1ca5b72073
Merge pull request #143 from louib/feature/merge_databases_script
...
Feature : merge databases program
2017-01-14 15:09:47 +02:00
Janek Bevendorff
d7c308c688
Merge branch 'develop' into feature/merge_databases_script
2017-01-14 14:49:03 +02:00
Louis-Bertrand Varin
1e0191a37c
Remove unused dependencies.
2017-01-13 19:45:33 -05:00
TheZ3ro
a8d9e8ba7c
Merge pull request #153 from louib/fix/databaseLockTypo
...
Add missing space in messages.
2017-01-12 10:20:14 +01:00
Louis-Bertrand Varin
1a5c18c9bd
Add missing space in messages.
2017-01-11 21:12:43 -05:00
Louis-Bertrand Varin
421e6303ae
Rename merge-databases -> kdbx-merge
2017-01-11 21:05:16 -05:00
Louis-Bertrand Varin
a79366f105
Use QCommandLineParser
...
* Switch to using QCommandLineParser
* Implement the --same-password option
* extract `getKeyFromLine` function
2017-01-11 21:00:11 -05:00
Tarquin Winot
f85198c60f
Replace old-style C conversions in entropy estimator ( #150 )
2017-01-10 17:37:58 -05:00
Louis-Bertrand Varin
2afa1f0dc8
Use 2 passwords for merging.
2017-01-08 22:46:30 -05:00
Louis-Bertrand Varin
a40f84d519
Read the password from stdin.
2017-01-07 15:14:54 -05:00
Louis-Bertrand Varin
bdb49a36bf
Reverting .gitignore
2017-01-07 13:12:30 -05:00