| Commit message (Expand) | Author | Age | Files | Lines |
* | Fix problems in strings.xml | Dominik Schürmann | 2014-09-07 | 1 | -31/+36 |
* | Put quotes around all strings, should fix transifex consistency problems, als... | Dominik Schürmann | 2014-09-07 | 1 | -646/+646 |
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-07 | 1 | -0/+1 |
|\ |
|
| * | add proper async check for correct passphrase to passphrasedialog | Vincent Breitmoser | 2014-09-07 | 1 | -0/+1 |
* | | Two buttons to encrypt files and text, some fixes | Dominik Schürmann | 2014-09-07 | 1 | -1/+2 |
|/ |
|
* | More UI rework | Dominik Schürmann | 2014-09-07 | 1 | -7/+6 |
* | Add experimental support for yubikey PINs, remove caching of empty passphrases | Dominik Schürmann | 2014-09-05 | 1 | -0/+1 |
* | Add yubikey default PIN preference | Dominik Schürmann | 2014-09-05 | 1 | -0/+2 |
* | Fix strings | Dominik Schürmann | 2014-09-02 | 1 | -2/+2 |
* | Catch security exception, known problem... | Dominik Schürmann | 2014-09-02 | 1 | -0/+1 |
* | cache key s2k type in database, for later use | Vincent Breitmoser | 2014-09-02 | 1 | -3/+8 |
* | split EncryptActivity into Encrypt{Text,File}Activity | Vincent Breitmoser | 2014-09-01 | 1 | -2/+4 |
* | remove "sign" and "verify" from drawer texts | Vincent Breitmoser | 2014-09-01 | 1 | -2/+2 |
* | small ui changes in encrypt | Vincent Breitmoser | 2014-09-01 | 1 | -3/+3 |
* | remove "by holding..." explanation from button text | Vincent Breitmoser | 2014-09-01 | 1 | -1/+1 |
* | Fix transifex linebreaks by adding apostrophs to strings with linebreaks | Dominik Schürmann | 2014-09-01 | 1 | -15/+15 |
* | Prepare API for OpenPgpSignatureResult extensions | Dominik Schürmann | 2014-08-31 | 1 | -3/+3 |
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-31 | 1 | -1/+6 |
|\ |
|
| * | add cancel support to edit key action | Vincent Breitmoser | 2014-08-31 | 1 | -1/+4 |
| * | Add cancelable mechanism and support in key import | Vincent Breitmoser | 2014-08-31 | 1 | -0/+2 |
* | | Better leyout for account settings | Dominik Schürmann | 2014-08-31 | 1 | -0/+2 |
|/ |
|
* | canonicalize: add check for algorithm type | Vincent Breitmoser | 2014-08-30 | 1 | -2/+4 |
* | Merge pull request #796 from open-keychain/develop | Dominik Schürmann | 2014-08-28 | 1 | -3/+23 |
|\ |
|
| * | add ecc support | Vincent Breitmoser | 2014-08-24 | 1 | -3/+21 |
| * | Add ECDH and ECDSA values | Dominik Schürmann | 2014-08-21 | 1 | -0/+2 |
* | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-27 | 1 | -3/+5 |
|\ \ |
|
| * | | small language fixes for previous commit | Vincent Breitmoser | 2014-08-27 | 1 | -3/+5 |
* | | | Strip out duplicate user ids | Dominik Schürmann | 2014-08-27 | 1 | -1/+2 |
|/ / |
|
* | | Abort import of pubkeys where secret keys exist but new pubkey has more subke... | Dominik Schürmann | 2014-08-27 | 1 | -0/+1 |
* | | Cleanup FoldableLinearLayout | Dominik Schürmann | 2014-08-27 | 1 | -2/+0 |
|/ |
|
* | 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 |
* | | improve certs_text | Dominik Schürmann | 2014-08-20 | 1 | -1/+1 |
|/ |
|
* | modifyKey: small logging changes | Vincent Breitmoser | 2014-08-20 | 1 | -2/+2 |
* | consolidate: prevent concurrent calls of step 2 | Vincent Breitmoser | 2014-08-20 | 1 | -1/+2 |
* | consolidate: implement (mostly) recovery mode | Vincent Breitmoser | 2014-08-20 | 1 | -1/+1 |
* | 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 |
* | consolidate: split into two steps, can pick up at second step if anything fails | Vincent Breitmoser | 2014-08-19 | 1 | -0/+3 |
* | Header for certs view | Dominik Schürmann | 2014-08-19 | 1 | -0/+1 |
* | Add subkey: at least one flag should be selected! | Dominik Schürmann | 2014-08-18 | 1 | -0/+1 |
* | consolidate: working implementation, lacking ui | Vincent Breitmoser | 2014-08-17 | 1 | -0/+15 |
* | 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 | 1 | -2/+2 |
* | support for master key modifications, among other stuff | Vincent Breitmoser | 2014-08-16 | 1 | -1/+3 |
* | 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 pr... | Dominik Schürmann | 2014-08-16 | 1 | -2/+3 |
* | merge: check fingerprints on merge operation! (this needs a testcase!) | Vincent Breitmoser | 2014-08-14 | 1 | -1/+1 |