| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | Use icons in key view | Dominik Schürmann | 2014-07-28 | 1 | -19/+36 | |
| | |/ | ||||||
| * | | Merge branch 'master' into improve-file-more | mar-v-in | 2014-07-01 | 1 | -2/+6 | |
| |\| | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java | |||||
| | * | work on edit key | Dominik Schürmann | 2014-06-30 | 1 | -2/+1 | |
| | | | ||||||
| | * | pass import results through to viewkeyactivity on update | Vincent Breitmoser | 2014-06-28 | 1 | -2/+6 | |
| | | | ||||||
| * | | Improve file more, Part 1 | mar-v-in | 2014-06-22 | 1 | -3/+1 | |
| |/ | | | | | | | | | | | | | | | - Use Uris where it makes sense, Use File class to clarify it's a file (and not whatever else a string could be) - Show sdcard in side menu in storage API #665 - Propose filename with gpg ending when storing it using the storage API #665 - Don't show output dialog on Android 4.4 #665 - Only show filename on Android < 4.4 #665 TODO: - File deletion for Android < 4.4 - Testing (especially with Android < 4.4) - Batch-encryption - UI - Temporary content provider (see #665 discussion) | |||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-06-18 | 1 | -0/+13 | |
| |\ | ||||||
| | * | add more progress info from import routine | Vincent Breitmoser | 2014-06-16 | 1 | -0/+13 | |
| | | | ||||||
| * | | Redesign Import, still some todos and regression bugs | Dominik Schürmann | 2014-06-18 | 1 | -1/+1 | |
| |/ | ||||||
| * | Merge pull request #649 from mar-v-in/automatic-contact-discovery | Dominik Schürmann | 2014-06-06 | 1 | -1/+12 | |
| |\ | | | | | Automatic contact discovery and more | |||||
| | * | Merge branch 'master' into automatic-contact-discovery | mar-v-in | 2014-06-05 | 1 | -2/+2 | |
| | |\ | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | |||||
| | * | | Show keys with android contacts | mar-v-in | 2014-06-05 | 1 | -1/+12 | |
| | | | | | | | | | | | | | This means to sync userid + keyid into contact storage. Android will merge them to normal contacts based on primary userid. | |||||
| * | | | Move SlidingTabLayout and SlidingTabStrip into appropriate subpackage | Dominik Schürmann | 2014-06-06 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Hide subkeys, certs tabs in key view, checkable menu item to show/hide them | Dominik Schürmann | 2014-06-06 | 1 | -10/+77 | |
| | |/ |/| | ||||||
| * | | neatness refactoring | Vincent Breitmoser | 2014-06-04 | 1 | -2/+2 | |
| |/ | ||||||
| * | Merge remote-tracking branch 'origin/master' into wrapped-key-ring | Vincent Breitmoser | 2014-05-14 | 1 | -117/+157 | |
| |\ | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java OpenKeychain/src/main/res/values/strings.xml | |||||
| | * | GET_KEY: also return PendingIntent to key view | Dominik Schürmann | 2014-05-07 | 1 | -1/+1 | |
| | | | ||||||
| | * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-05-07 | 1 | -0/+31 | |
| | |\ | ||||||
| | | * | small fix for 6aafb3, forgot to commit this line | Vincent Breitmoser | 2014-05-07 | 1 | -0/+1 | |
| | | | | ||||||
| | | * | ui: slight edit icon cosmetics in keylist | Vincent Breitmoser | 2014-05-07 | 1 | -0/+4 | |
| | | | | ||||||
| | | * | ui: move revocation/expiry notes above tab slider | Vincent Breitmoser | 2014-05-07 | 1 | -0/+26 | |
| | | | | ||||||
| | * | | Clarify language | Dominik Schürmann | 2014-05-07 | 1 | -1/+1 | |
| | |/ | ||||||
| | * | New key view design, using Android flat buttons and Android icons | Dominik Schürmann | 2014-05-05 | 1 | -116/+125 | |
| | | | ||||||
| * | | wrapped-key-ring: remove more unneeded methods | Vincent Breitmoser | 2014-05-04 | 1 | -4/+4 | |
| |/ | ||||||
| * | Fix more strings | Dominik Schürmann | 2014-04-19 | 1 | -1/+1 | |
| | | ||||||
| * | NotFoundExceptions for all getGeneric-type methods | Vincent Breitmoser | 2014-04-17 | 1 | -40/+48 | |
| | | ||||||
| * | Remove some Ids... | Dominik Schürmann | 2014-04-11 | 1 | -7/+4 | |
| | | ||||||
| * | Refactor ProviderHelper to be non-static using a constructor based on ↵ | Dominik Schürmann | 2014-04-11 | 1 | -18/+21 | |
| | | | | | context (first commit to get context out of pgp classes) | |||||
| * | get rid of more getMasterKeyId usage, work on getKeyRingsAsArmoredString | Vincent Breitmoser | 2014-04-11 | 1 | -11/+13 | |
| | | ||||||
| * | Disable selection of user ids and keys in view key | Dominik Schürmann | 2014-04-10 | 1 | -2/+2 | |
| | | ||||||
| * | Minimize use of class variables in ViewKey | Dominik Schürmann | 2014-04-10 | 1 | -6/+6 | |
| | | ||||||
| * | Cleanup AsyncTask code for NFC | Dominik Schürmann | 2014-04-10 | 1 | -6/+8 | |
| | | ||||||
| * | Cleanup imports | Dominik Schürmann | 2014-04-10 | 1 | -2/+0 | |
| | | ||||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-04-10 | 1 | -7/+8 | |
| |\ | ||||||
| | * | Deleted wrong AppMsg | Daniel Haß | 2014-04-10 | 1 | -3/+0 | |
| | | | ||||||
| | * | Replaced Toasts in ViewKeyActivity | Daniel Haß | 2014-04-09 | 1 | -7/+11 | |
| | | | ||||||
| * | | Integrate NFC functionality into ViewKeyActivity | Dominik Schürmann | 2014-04-10 | 1 | -0/+109 | |
| |/ | ||||||
| * | Introduce ProviderHelper.NotFoundException, remove dead code | Dominik Schürmann | 2014-04-08 | 1 | -23/+38 | |
| | | ||||||
| * | Rename folder structure from OpenPGP Keychain to OpenKeychain | Dominik Schürmann | 2014-04-06 | 1 | -0/+277 | |
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |