Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | affirmation -> linked identity | Vincent Breitmoser | 2015-01-15 | 1 | -12/+12 |
| | |||||
* | work on dns resource, working (dummy) verification | Vincent Breitmoser | 2015-01-14 | 1 | -0/+11 |
| | |||||
* | small fixes to user attribute handling | Vincent Breitmoser | 2015-01-14 | 1 | -0/+1 |
| | |||||
* | actually import user attributes (though they are not shown anywhere yet) | Vincent Breitmoser | 2015-01-14 | 1 | -0/+17 |
| | |||||
* | certification of the first linked identity packet! | Vincent Breitmoser | 2015-01-13 | 1 | -0/+1 |
| | |||||
* | some work on twitter resource | Vincent Breitmoser | 2015-01-13 | 1 | -3/+18 |
| | |||||
* | support addition of user attributes | Vincent Breitmoser | 2015-01-12 | 1 | -1/+4 |
| | |||||
* | add support for user attributes (during canonicalization) | Vincent Breitmoser | 2015-01-12 | 1 | -1/+16 |
| | |||||
* | even more intermediate result | Vincent Breitmoser | 2015-01-12 | 1 | -0/+21 |
| | |||||
* | intermediate state, nothing really working yet | Vincent Breitmoser | 2015-01-12 | 1 | -0/+10 |
| | |||||
* | OpenPGP instead of PGP | Dominik Schürmann | 2015-01-07 | 1 | -5/+5 |
| | |||||
* | PIn not pin passphrase | Dominik Schürmann | 2015-01-07 | 1 | -1/+1 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-01-06 | 1 | -13/+31 |
|\ | | | | | | | development | ||||
| * | make certify routines more robust (#1016) | Vincent Breitmoser | 2015-01-03 | 1 | -0/+1 |
| | | |||||
| * | add more descriptive string about non-mdc encrypted data | Vincent Breitmoser | 2015-01-03 | 1 | -0/+1 |
| | | |||||
| * | encapsulate high level edit key into new operation class | Vincent Breitmoser | 2015-01-03 | 1 | -0/+8 |
| | | |||||
| * | deal with non-existent user ids during import (#994) | Vincent Breitmoser | 2015-01-02 | 1 | -6/+7 |
| | | |||||
| * | extend canonicalize to strip local certificates on export | Vincent Breitmoser | 2015-01-02 | 1 | -6/+8 |
| | | |||||
| * | small improvements regarding pin tests and logging | Vincent Breitmoser | 2015-01-01 | 1 | -1/+3 |
| | | |||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-12-30 | 1 | -3/+3 |
| |\ | | | | | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/res/values/strings.xml | ||||
| * | | add PIN as a SecretKeyType | Vincent Breitmoser | 2014-12-30 | 1 | -0/+2 |
| | | | |||||
| * | | introduce handling of notation direct key signatures, and experimental pin ↵ | Vincent Breitmoser | 2014-12-30 | 1 | -1/+3 |
| | | | | | | | | | | | | notation packet | ||||
* | | | Passphrase wizard tests | Dominik Schürmann | 2015-01-06 | 1 | -0/+27 |
| |/ |/| | |||||
* | | New work on PIN and lock pattern UI | Dominik Schürmann | 2014-12-29 | 1 | -2/+3 |
|/ | |||||
* | NFC activity design | Dominik Schürmann | 2014-11-21 | 1 | -4/+5 |
| | |||||
* | Display error on certification attempt with yubikey | Vincent Breitmoser | 2014-10-26 | 1 | -0/+1 |
| | | | | Closes #978 | ||||
* | add descriptive text to safeslinger activity | Vincent Breitmoser | 2014-10-26 | 1 | -0/+1 |
| | |||||
* | Move advanced info into own activity | Dominik Schürmann | 2014-10-26 | 1 | -0/+2 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-26 | 1 | -0/+1 |
|\ | | | | | | | development | ||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-10-26 | 1 | -2/+2 |
| |\ | | | | | | | | | | development | ||||
| * | | Retry canonicalization with pubkey self certs if first attempt failed | Vincent Breitmoser | 2014-10-26 | 1 | -0/+1 |
| | | | | | | | | | | | | Fixes #974 | ||||
* | | | Fixes from transifex | Dominik Schürmann | 2014-10-26 | 1 | -37/+37 |
| |/ |/| | |||||
* | | Move some multi select items in overflow menu, rename import | Dominik Schürmann | 2014-10-26 | 1 | -2/+2 |
|/ | |||||
* | Remove empty layout | Dominik Schürmann | 2014-10-25 | 1 | -5/+1 |
| | |||||
* | shorter certification explanation | Vincent Breitmoser | 2014-10-25 | 1 | -1/+1 |
| | |||||
* | more rewording | Vincent Breitmoser | 2014-10-25 | 1 | -4/+4 |
| | |||||
* | slightly change wording in merge logs | Vincent Breitmoser | 2014-10-25 | 1 | -2/+2 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-10-25 | 1 | -6/+1 |
|\ | | | | | | | development | ||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-25 | 1 | -0/+10 |
| |\ | | | | | | | | | | development | ||||
| * | | Safe slinger activity preps | Dominik Schürmann | 2014-10-25 | 1 | -6/+1 |
| | | | |||||
* | | | change the way merging is logged | Vincent Breitmoser | 2014-10-25 | 1 | -1/+5 |
| |/ |/| | |||||
* | | more work on import logging | Vincent Breitmoser | 2014-10-25 | 1 | -5/+5 |
| | | |||||
* | | add logging to import and change order of import, keyservers first | Vincent Breitmoser | 2014-10-25 | 1 | -0/+10 |
|/ | |||||
* | Qr code button text | Dominik Schürmann | 2014-10-24 | 1 | -1/+1 |
| | |||||
* | reword sync message | Tim Bray | 2014-10-22 | 1 | -1/+1 |
| | |||||
* | Make the Certify screen a little more self-explanatory | Tim Bray | 2014-10-21 | 1 | -3/+3 |
| | |||||
* | Group passphrase cache settings | Dominik Schürmann | 2014-10-13 | 1 | -1/+2 |
| | |||||
* | wording | Dominik Schürmann | 2014-10-13 | 1 | -3/+3 |
| | |||||
* | Added option for num keypad for YubiKey | Jerzy Kołosowski | 2014-10-13 | 1 | -0/+1 |
| | |||||
* | rewrite export with new operation style | Vincent Breitmoser | 2014-10-13 | 1 | -0/+24 |
| |