| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| | | | |||||
| * | | change keybase hint following pull request #755 | Dominik Schürmann | 2014-08-14 | 12 | -19/+19 |
| | | | |||||
| * | | Automcomplete names and emails in keyserver tab | Dominik Schürmann | 2014-08-14 | 1 | -1/+1 |
| |/ | |||||
| * | move v3 key import prevention into canonicalization method | Dominik Schürmann | 2014-08-14 | 1 | -1/+1 |
| | | |||||
| * | Do not import v3 keys, they are insecure! | Dominik Schürmann | 2014-08-14 | 1 | -1/+2 |
| | | |||||
| * | Remove support for v3 sig generation | Dominik Schürmann | 2014-08-14 | 2 | -10/+3 |
| | | |||||
| * | Dont write version header by default | Dominik Schürmann | 2014-08-14 | 7 | -15/+15 |
| | | |||||
| * | Add user info dialog | Dominik Schürmann | 2014-08-13 | 1 | -0/+8 |
| | | |||||
| * | Move certify action down into actions section | Dominik Schürmann | 2014-08-13 | 1 | -12/+12 |
| | | |||||
| * | API: User interaction when account keys are deleted | Dominik Schürmann | 2014-08-13 | 2 | -2/+3 |
| | | |||||
| * | passphrase instead of pass phrase | Dominik Schürmann | 2014-08-07 | 1 | -2/+2 |
| | | |||||
| * | Pull from transifex | Dominik Schürmann | 2014-08-07 | 75 | -2811/+1509 |
| | | |||||
| * | Readd missing string | Dominik Schürmann | 2014-08-07 | 1 | -0/+1 |
| | | |||||
| * | ModernPGP infos | Dominik Schürmann | 2014-08-06 | 1 | -1/+1 |
| | | |||||
| * | Update changelog and about | Dominik Schürmann | 2014-08-06 | 2 | -89/+104 |
| | | |||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |