| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | Revert "Add first time wizard for sync settings" | Dominik Schürmann | 2015-11-23 | 1 | -85/+0 | |
| | | | | | This reverts commit cd601988db41f7651f376ef419be3dd50aaa4e10. | |||||
| * | Add first time wizard for sync settings | Dominik Schürmann | 2015-11-23 | 1 | -0/+85 | |
| | | ||||||
| * | Merge pull request #1543 from rohands/issue_mouseover_hints | Vincent | 2015-11-16 | 2 | -1/+6 | |
| |\ | | | | | mouseover hints | |||||
| | * | Class names and string names are updated | rohands | 2015-09-22 | 2 | -5/+5 | |
| | | | ||||||
| | * | Updated | rohands | 2015-09-20 | 2 | -1/+6 | |
| | | | ||||||
| * | | Merge branch 'master' into v/decrypt-key-lookup | Vincent Breitmoser | 2015-11-15 | 3 | -3/+43 | |
| |\ \ | ||||||
| | * | | keylist: add "search for query" button to empty view | Vincent Breitmoser | 2015-11-02 | 1 | -2/+29 | |
| | | | | ||||||
| | * | | Update android-patternview, materialtabstrip, floatingactionbutton | Dominik Schürmann | 2015-10-26 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Update zxing-android-embedded with new custom activity | Dominik Schürmann | 2015-10-26 | 1 | -0/+13 | |
| | | | | ||||||
| * | | | decryptlist: re-decrypt after key lookup | Vincent Breitmoser | 2015-10-23 | 1 | -0/+2 | |
| | | | | ||||||
| * | | | decryptlist: implement key lookup (wip) | Vincent Breitmoser | 2015-10-23 | 1 | -13/+40 | |
| |/ / | ||||||
| * | | More space for backup code | Dominik Schürmann | 2015-10-22 | 1 | -11/+10 | |
| | | | ||||||
| * | | Remove unnecessary line in keybase fragment | Dominik Schürmann | 2015-10-21 | 1 | -5/+0 | |
| | | | ||||||
| * | | Fix keybase verification | Dominik Schürmann | 2015-10-21 | 1 | -9/+0 | |
| | | | ||||||
| * | | linked: fix colors for dark theme | Vincent Breitmoser | 2015-10-21 | 4 | -4/+3 | |
| | | | ||||||
| * | | UI preparations for yubikey reset | Dominik Schürmann | 2015-10-16 | 2 | -128/+174 | |
| | | | ||||||
| * | | nfc dialog: button placeholder to retain size | Dominik Schürmann | 2015-10-16 | 1 | -2/+24 | |
| | | | ||||||
| * | | Prevent nfc dialog from closing when touching outside of it, add cancel button | Dominik Schürmann | 2015-10-16 | 2 | -1/+11 | |
| | | | ||||||
| * | | Allow choosing of YubiKey PIN | Dominik Schürmann | 2015-10-16 | 2 | -123/+30 | |
| | | | ||||||
| * | | Layout for backup code input | Dominik Schürmann | 2015-10-15 | 1 | -0/+152 | |
| | | | ||||||
| * | | Cleanup, fix advanced sharing | Dominik Schürmann | 2015-10-15 | 1 | -17/+0 | |
| | | | ||||||
| * | | Add restore to backup fragment, cleanup, renamings | Dominik Schürmann | 2015-10-15 | 2 | -0/+22 | |
| | | | ||||||
| * | | Merge branch 'master' into encrypted-export | Vincent Breitmoser | 2015-10-08 | 10 | -21/+21 | |
| |\ \ | ||||||
| | * | | center wizard buttons for other languages | Dominik Schürmann | 2015-10-04 | 10 | -21/+21 | |
| | | | | ||||||
| * | | | decrypt: revise card layout margins | Vincent Breitmoser | 2015-09-30 | 1 | -16/+18 | |
| | | | | ||||||
| * | | | import: simplify ImportKeysActivity, don't display search bar for fixed input | Vincent Breitmoser | 2015-09-30 | 1 | -9/+20 | |
| | | | | ||||||
| * | | | enc-export: localization, and layout compatibility | Vincent Breitmoser | 2015-09-29 | 1 | -329/+0 | |
| | | | | ||||||
| * | | | enc-export: rename fragment to match class | Vincent Breitmoser | 2015-09-29 | 1 | -0/+0 | |
| | | | | ||||||
| * | | | Merge remote-tracking branch 'origin/master' into encrypted-export | Vincent Breitmoser | 2015-09-28 | 2 | -141/+109 | |
| |\| | | ||||||
| | * | | Confirm design | Dominik Schürmann | 2015-09-24 | 1 | -131/+83 | |
| | | | | ||||||
| | * | | Keyservers: Dont follow redirects, pin pgp.mit.edu, check for pinned cert on ↵ | Dominik Schürmann | 2015-09-20 | 1 | -10/+26 | |
| | |/ | | | | | | | add (OKC-01-018) | |||||
| * | | enc-backup: didn't like the check mark icon after all | Vincent Breitmoser | 2015-09-25 | 1 | -2/+0 | |
| | | | ||||||
| * | | enc-backup: use black check icon for button, and some cleanup | Vincent Breitmoser | 2015-09-25 | 1 | -1/+1 | |
| | | | ||||||
| * | | enc-backup: use only one fragment after all | Vincent Breitmoser | 2015-09-25 | 2 | -126/+217 | |
| | | | ||||||
| * | | enc-backup: handle bad code more nicely | Vincent Breitmoser | 2015-09-25 | 1 | -2/+1 | |
| | | | ||||||
| * | | enc-backup: ask for backup code again | Vincent Breitmoser | 2015-09-25 | 3 | -16/+213 | |
| | | | ||||||
| * | | encrypted export WIP | Vincent Breitmoser | 2015-09-19 | 3 | -0/+70 | |
| |/ | ||||||
| * | Use material overflow icon in decrypt list | Dominik Schürmann | 2015-09-17 | 1 | -3/+4 | |
| | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java OpenKeychain/src/main/res/layout/decrypt_list_entry.xml | |||||
| * | multidecrypt: use bottom sheet for longclick options | Vincent Breitmoser | 2015-09-16 | 1 | -1/+3 | |
| | | ||||||
| * | multidecrypt: context menu per card, not per file | Vincent Breitmoser | 2015-09-16 | 2 | -10/+12 | |
| | | ||||||
| * | multidecrypt: display all outputUris as individual items | Vincent Breitmoser | 2015-09-16 | 2 | -62/+66 | |
| | | ||||||
| * | multidecrypt: prepare viewholder for file list | Vincent Breitmoser | 2015-09-16 | 1 | -51/+58 | |
| | | ||||||
| * | linked: ditch create dns fragment (for now) | Vincent Breitmoser | 2015-09-10 | 2 | -290/+0 | |
| | | ||||||
| * | linked: localization for github creation | Vincent Breitmoser | 2015-09-10 | 1 | -6/+6 | |
| | | ||||||
| * | linked: add "retry" | Vincent Breitmoser | 2015-09-08 | 1 | -2/+13 | |
| | | ||||||
| * | linked: fix button margins in select dialog | Vincent Breitmoser | 2015-09-08 | 1 | -3/+6 | |
| | | ||||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2015-09-06 | 5 | -8/+8 | |
| |\ | ||||||
| | * | Fixes open-keychain/open-keychain#1515 | Kaladin Light | 2015-09-03 | 5 | -8/+8 | |
| | | | | | | | | | Move launcher icons to mipmap | |||||
| * | | linked: basic shared element transition | Vincent Breitmoser | 2015-09-06 | 4 | -272/+3 | |
| | | | ||||||
| * | | linked: use webview instead of app, and some minor layoutings | Vincent Breitmoser | 2015-09-02 | 3 | -13/+22 | |
| |/ | ||||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |