Skip to content

Add gui dialog when merge makes no changes#2551

Merged
droidmonkey merged 2 commits intokeepassxreboot:developfrom
AlexJoss:feature/add_gui_dialog_merge_no_changes
Jan 21, 2019
Merged

Add gui dialog when merge makes no changes#2551
droidmonkey merged 2 commits intokeepassxreboot:developfrom
AlexJoss:feature/add_gui_dialog_merge_no_changes

Conversation

@AlexJoss
Copy link
Copy Markdown
Contributor

@AlexJoss AlexJoss commented Dec 14, 2018

Type of change

Fixes #2550

  • ✅ New feature (non-breaking change which adds functionality)

Description and Context

Add a gui dialog that notifies the user after a merge operation. This keeps the gui consistent with the cli.

Screenshots

image

image

Testing strategy

Manual testing:

  1. Create and save a database
  2. Open the database using the gui
  3. Duplicate the database file
  4. Merge the duplicate into the current database
  5. Modify the duplicate
  6. Merge the modified duplicate into the current database

Checklist:

  • ✅ I have read the CONTRIBUTING document. [REQUIRED]
  • ✅ My code follows the code style of this project. [REQUIRED]
  • ✅ All new and existing tests passed. [REQUIRED]
  • ❎ I have compiled and verified my code with -DWITH_ASAN=ON. [REQUIRED] (in progress)

@AlexJoss AlexJoss changed the title Add gui dialog when merge makes no changes #2550 Add gui dialog when merge makes no changes Dec 14, 2018
@louib
Copy link
Copy Markdown
Member

louib commented Jan 9, 2019

@droidmonkey this one should be good, we just need to restart the Windows tests

@louib louib added this to the v2.4.0 milestone Jan 9, 2019
@droidmonkey droidmonkey merged commit cbf9259 into keepassxreboot:develop Jan 21, 2019
droidmonkey added a commit that referenced this pull request Mar 19, 2019
- New Database Wizard [#1952]
- Advanced Search [#1797]
- Automatic update checker [#2648]
- KeeShare database synchronization [#2109, #1992, #2738, #2742, #2746, #2739]
- Improve favicon fetching; transition to Duck-Duck-Go [#2795, #2011, #2439]
- Remove KeePassHttp support [#1752]
- CLI: output info to stderr for easier scripting [#2558]
- CLI: Add --quiet option [#2507]
- CLI: Add create command [#2540]
- CLI: Add recursive listing of entries [#2345]
- CLI: Fix stdin/stdout encoding on Windows [#2425]
- SSH Agent: Support OpenSSH for Windows [#1994]
- macOS: TouchID Quick Unlock [#1851]
- macOS: Multiple improvements; include CLI in DMG [#2165, #2331, #2583]
- Linux: Prevent Klipper from storing secrets in clipboard [#1969]
- Linux: Use polling based file watching for NFS [#2171]
- Linux: Enable use of browser plugin in Snap build [#2802]
- TOTP QR Code Generator [#1167]
- High-DPI Scaling for 4k screens [#2404]
- Make keyboard shortcuts more consistent [#2431]
- Warn user if deleting referenced entries [#1744]
- Allow toolbar to be hidden and repositioned [#1819, #2357]
- Increase max allowed database timeout to 12 hours [#2173]
- Password generator uses existing password length by default [#2318]
- Improve alert message box button labels [#2376]
- Show message when a database merge makes no changes [#2551]
- Browser Integration Enhancements [#1497, #2253, #1904, #2232, #1850, #2218, #2391, #2396, #2542, #2622, #2637, #2790]
- Overall Code Improvements [#2316, #2284, #2351, #2402, #2410, #2419, #2422, #2443, #2491, #2506, #2610, #2667, #2709, #2731]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Add gui dialog when merge makes no changes

3 participants