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
Louis-Bertrand Varin
1458ba6f6f
qInfo -> qDebug and missing imports.
2017-01-06 20:24:50 -05:00
Louis-Bertrand Varin
007073354f
Revert cmake in .gitignore.
2017-01-06 20:19:26 -05:00
Louis-Bertrand Varin
be827211d2
Removing unused imports.
2017-01-06 16:32:18 -05:00
Louis-Bertrand Varin
5bc3924756
Merge databases script.
2017-01-06 16:29:07 -05:00
louib
ff6d78244b
Updated INSTALL documentation. ( #140 )
...
* KeePassCR -> KeePassXC in INSTALL
* Added .md extension to INSTALL.
2017-01-04 18:47:29 -05:00
Jonathan White
5f1b9a17ca
Fix testgui for Windows (PR #137 )
...
Introduces TemporaryFile class to act as a proxy to fix autoreload test cases failing on windows due to the behavior of QTemporaryFile.
2017-01-03 22:27:41 -05:00
Jonathan White
534364454d
Merge branch 'feature/cmake-fix-#50-#123' into develop
...
* Fixes #50 and #123
2017-01-02 22:27:20 -05:00
Jonathan White
0e65b9b9f8
Corrected autotype lib building for Windows
2017-01-02 22:25:37 -05:00
thez3ro
07a41f58d7
Add autotype library linking
...
Added Autotype switch + updated Travis to always test all extension
2017-01-02 22:25:36 -05:00
Jonathan White
5b04e195b0
Merge pull request #132 from keepassxreboot/improve_search_ui
...
Improve UI of the search edit widget
2017-01-02 20:04:21 -05:00
Jonathan White
9fa2dae68c
Merge branch 'develop' into improve_search_ui
2017-01-02 17:51:42 -05:00
Danny Su
9000bc138f
Update Website URL in About Dialog ( #136 )
2017-01-02 17:50:42 -05:00
Jonathan White
9660510cc7
Cleaned up SearchWidget code
2016-12-23 23:14:50 -05:00
thez3ro
298665e32a
Improve UI of the search edit #131
2016-12-23 18:13:08 +01:00
Akinori MUSHA
d0a3c08840
Improve UI of the search edit (resurrecting 5c7c7f54)
...
- The copy action (Control+C) when no text is selected copies the
password of the current entry. This should be reasonable when
Control+B copies the username.
- Down at EOL moves the focus to the entry view. Enter and Tab should
do that, but it would be handy for user to be able to get to the third
entry by hitting Down three times.
2016-12-22 17:16:59 +09:00
Danny Su
63a1b49745
Fix build for 64-bit Windows ( #130 )
...
Building on 64-bit Windows gets to 99% and fails on this particular file due to the `stdafx.h` inclusion.
The macro in `entropy-meter.cpp` is different than `src/zxcvbn/zxcvbn.cpp`.
After copying the macro from `zxcvbn.cpp` and rebuilding, the Windows build succeeded.
2016-12-20 18:41:15 -05:00
