| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | Merge pull request #796 from open-keychain/develop | Dominik Schürmann | 2014-08-28 | 2 | -4/+42 | |
| |\ | | | | | ECC support | |||||
| | * | add ecc support | Vincent Breitmoser | 2014-08-24 | 2 | -4/+40 | |
| | | | ||||||
| | * | Add ECDH and ECDSA values | Dominik Schürmann | 2014-08-21 | 1 | -0/+2 | |
| | | | ||||||
| * | | Fix RuntimeException in KeyListActivity on tablets | Dominik Schürmann | 2014-08-28 | 6 | -53/+47 | |
| | | | ||||||
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-27 | 6 | -13/+15 | |
| |\ \ | ||||||
| | * | | small language fixes for previous commit | Vincent Breitmoser | 2014-08-27 | 6 | -13/+15 | |
| | | | | ||||||
| * | | | Strip out duplicate user ids | Dominik Schürmann | 2014-08-27 | 5 | -5/+6 | |
| |/ / | ||||||
| * | | Abort import of pubkeys where secret keys exist but new pubkey has more ↵ | Dominik Schürmann | 2014-08-27 | 1 | -0/+1 | |
| | | | | | | | | | subkeys, fix #696 | |||||
| * | | Cleanup FoldableLinearLayout | Dominik Schürmann | 2014-08-27 | 4 | -12/+5 | |
| | | | ||||||
| * | | Pull from transifex | Dominik Schürmann | 2014-08-22 | 19 | -13/+100 | |
| |/ | ||||||
| * | Add sync properties | Dominik Schürmann | 2014-08-21 | 1 | -1/+3 | |
| | | ||||||
| * | Change account type | Dominik Schürmann | 2014-08-21 | 2 | -2/+2 | |
| | | ||||||
| * | XML cleanup | Dominik Schürmann | 2014-08-21 | 7 | -79/+11 | |
| | | ||||||
| * | Pull from transifex | Dominik Schürmann | 2014-08-21 | 6 | -42/+22 | |
| | | ||||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-20 | 1 | -1/+3 | |
| |\ | ||||||
| | * | move key deletion into KeychainIntentHandler | Vincent Breitmoser | 2014-08-20 | 1 | -0/+1 | |
| | | | ||||||
| | * | consolidate: small ui things | Vincent Breitmoser | 2014-08-20 | 1 | -1/+2 | |
| | | | ||||||
| * | | Enable sync adapter, changelog | Dominik Schürmann | 2014-08-20 | 1 | -0/+1 | |
| | | | ||||||
| * | | improve certs_text | Dominik Schürmann | 2014-08-20 | 1 | -1/+1 | |
| |/ | ||||||
| * | modifyKey: small logging changes | Vincent Breitmoser | 2014-08-20 | 1 | -2/+2 | |
| | | ||||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-08-20 | 1 | -1/+1 | |
| |\ | ||||||
| | * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-20 | 1 | -1/+1 | |
| | |\ | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | |||||
| | * | | Fixes and temporary fixes for returning results | Dominik Schürmann | 2014-08-20 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | consolidate: prevent concurrent calls of step 2 | Vincent Breitmoser | 2014-08-20 | 1 | -1/+2 | |
| | |/ |/| | ||||||
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-08-20 | 15 | -76/+135 | |
| |\| | ||||||
| | * | Pull from transifex | Dominik Schürmann | 2014-08-20 | 15 | -76/+135 | |
| | | | ||||||
| * | | consolidate: implement (mostly) recovery mode | Vincent Breitmoser | 2014-08-20 | 1 | -1/+1 | |
| |/ | ||||||
| * | Pull from transifex | Dominik Schürmann | 2014-08-20 | 32 | -338/+1203 | |
| | | ||||||
| * | Fix strings | Dominik Schürmann | 2014-08-19 | 1 | -4/+4 | |
| | | ||||||
| * | consolidate: a lot more log output, better recovery | Vincent Breitmoser | 2014-08-19 | 1 | -5/+23 | |
| | | ||||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-19 | 1 | -0/+3 | |
| |\ | ||||||
| | * | consolidate: split into two steps, can pick up at second step if anything fails | Vincent Breitmoser | 2014-08-19 | 1 | -0/+3 | |
| | | | ||||||
| * | | Scroll fixes for certify activity | Dominik Schürmann | 2014-08-19 | 1 | -7/+5 | |
| |/ | ||||||
| * | certs header design | Dominik Schürmann | 2014-08-19 | 1 | -3/+11 | |
| | | ||||||
| * | Header for certs view | Dominik Schürmann | 2014-08-19 | 3 | -23/+39 | |
| | | ||||||
| * | Add subkey: at least one flag should be selected! | Dominik Schürmann | 2014-08-18 | 1 | -0/+1 | |
| | | ||||||
| * | Fixes for expiry UI | Dominik Schürmann | 2014-08-18 | 1 | -0/+10 | |
| | | ||||||
| * | Merge pull request #772 from mar-v-in/issue-729 | Vincent | 2014-08-17 | 1 | -5/+3 | |
| |\ | | | | | Remove NoSwipeWrapContentViewPager | |||||
| | * | Remove NoSwipeWrapContentViewPager | mar-v-in | 2014-08-17 | 1 | -5/+3 | |
| | | | ||||||
| * | | consolidate: working implementation, lacking ui | Vincent Breitmoser | 2014-08-17 | 2 | -0/+21 | |
| | | | ||||||
| * | | modify*Key: improve handling of passphrase modification (add tests, too) | Vincent Breitmoser | 2014-08-16 | 1 | -1/+5 | |
| | | | ||||||
| * | | typed expected failures and a couple minor things | Vincent Breitmoser | 2014-08-16 | 12 | -17/+6 | |
| | | | ||||||
| * | | support for master key modifications, among other stuff | Vincent Breitmoser | 2014-08-16 | 6 | -6/+8 | |
| | | | ||||||
| * | | modifySecretKey: err out on "use previous" expiry date for (sub)key creation | Vincent Breitmoser | 2014-08-16 | 1 | -0/+2 | |
| | | | ||||||
| * | | modifySecretKey: err out on revocation of nonexistent user id | Vincent Breitmoser | 2014-08-16 | 1 | -0/+1 | |
| | | | ||||||
| * | | API: Allow ACTION_SIGN_AND_ENCRYPT with no key ids or user ids extras, fix ↵ | Dominik Schürmann | 2014-08-16 | 2 | -7/+8 | |
| |/ | | | | pre-selection of key ids (no revoked or expired ones, also select duplicates), refactor text using spannables | |||||
| * | Merge pull request #767 from mar-v-in/issue-763 | Dominik Schürmann | 2014-08-14 | 3 | -9/+5 | |
| |\ | | | | | Use dropdown in CertifyActivity | |||||
| | * | Add and use CertifyKeySpinner | mar-v-in | 2014-08-14 | 1 | -8/+4 | |
| | | | ||||||
| | * | factor KeySpinner out | mar-v-in | 2014-08-14 | 2 | -1/+1 | |
| | | | ||||||
| * | | merge: check fingerprints on merge operation! (this needs a testcase!) | Vincent Breitmoser | 2014-08-14 | 1 | -1/+1 | |
| | | | ||||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |