Keep entry history when merging databases#970
Merged
louib merged 1 commit intorelease/2.2.1from Sep 23, 2017
Merged
Conversation
louib
approved these changes
Sep 19, 2017
064b931 to
d79da82
Compare
TheZ3ro
approved these changes
Sep 20, 2017
Member
|
@droidmonkey this one is gonna be a pain to upport, because the My bad really, I did not expect that much bug fixes to be rolled out in |
Member
Author
|
Ohh... I will back off the tests on this PR (since we know they work) and move that commit to develop. I understand why you split your previous PR's now. |
d79da82 to
9b59363
Compare
louib
approved these changes
Sep 23, 2017
droidmonkey
added a commit
that referenced
this pull request
Oct 1, 2017
- Corrected multiple snap issues [#934, #1011] - Corrected multiple custom icon issues [#708, #719, #994] - Corrected multiple Yubikey issues [#880] - Fixed single instance preventing load on occasion [#997] - Keep entry history when merging databases [#970] - Prevent data loss if passwords were mismatched [#1007] - Fixed crash after merge [#941] - Added configurable auto-type default delay [#703] - Unlock database dialog window comes to front [#663] - Translation and compiling fixes
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Fixes #965. Maintain entry history when merging databases.
Types of changes
Checklist:
-DWITH_ASAN=ON. [REQUIRED]