aboutsummaryrefslogtreecommitdiffstats
path: root/TODO
diff options
context:
space:
mode:
Diffstat (limited to 'TODO')
-rw-r--r--TODO8
1 files changed, 8 insertions, 0 deletions
diff --git a/TODO b/TODO
index 808980d..9466bfd 100644
--- a/TODO
+++ b/TODO
@@ -24,6 +24,14 @@ Release 0.3.2
- if import failed, because no key was found [DONE]
- if key is already in keyring [DONE]
- BUG: Also show details, when key is really new [DONE]
+<<<<<<< HEAD
+=======
+- Wizard on first start (Create Key, Import from keys older gpg4usb, import from gnupg) [DONE]
+ - import conf from old gpg4usb
+ - only show one import dateil dialog, when importing public/private keys
+ - always activate next button
+ - nextid is not called when clicking finish button
+>>>>>>> a rough new configuration of wizard. Pages are in right order
- option in settingsdialog for enabling steganographic operations [DONE]
- minimal steganography option: remove or add pgp-headers on demand [DONE]
- Add advanced tab to settings dialog [DONE]