aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* work on dns resource, working (dummy) verificationVincent Breitmoser2015-01-1410-79/+686
* fix ambiguous column name in advanced key infoVincent Breitmoser2015-01-141-1/+1
* involve user attributes in unit tests for merge and canonicalize!Vincent Breitmoser2015-01-143-15/+73
* small fixes to user attribute handlingVincent Breitmoser2015-01-144-3/+28
* add basic tests for addition of user attributesVincent Breitmoser2015-01-141-0/+66
* fix log entry for addition of user attributesVincent Breitmoser2015-01-141-3/+3
* actually import user attributes (though they are not shown anywhere yet)Vincent Breitmoser2015-01-148-17/+202
* make user_ids table typed, with attribute_data supportVincent Breitmoser2015-01-139-88/+120
* update spongycastle with more public methods for WrappedUserAttributeVincent Breitmoser2015-01-131-0/+0
* certification of the first linked identity packet!Vincent Breitmoser2015-01-138-45/+189
* add support for user attributes in merge() routineVincent Breitmoser2015-01-131-2/+28
* hack to make WrappedUserAttribute serializableVincent Breitmoser2015-01-131-2/+47
* add back button to wizard fragmentsVincent Breitmoser2015-01-1312-12/+66
* some work on twitter resourceVincent Breitmoser2015-01-1312-15/+1297
* forgot to commit WrappedUserAttributeVincent Breitmoser2015-01-121-0/+47
* add dns button to linked identity selectionVincent Breitmoser2015-01-123-1/+39
* support addition of user attributesVincent Breitmoser2015-01-124-9/+61
* work on affirmations (begin rename to LinkedIdentityVincent Breitmoser2015-01-125-176/+10
* add support for user attributes (during canonicalization)Vincent Breitmoser2015-01-125-1/+366
* even more intermediate resultVincent Breitmoser2015-01-1213-271/+435
* intermediate state, nothing really working yetVincent Breitmoser2015-01-1220-0/+1570
* Test new iconDominik Schürmann2015-01-0710-3603/+3868
* OpenPGP instead of PGPDominik Schürmann2015-01-071-5/+5
* PIn not pin passphraseDominik Schürmann2015-01-071-1/+1
* OpenPGP not PGPDominik Schürmann2015-01-072-2/+2
* Clearup after lockpattern experimentsDominik Schürmann2015-01-062-31/+26
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-01-0641-339/+1418
|\
| * tests: add a couple of CertifyOperation test casesVincent Breitmoser2015-01-031-0/+238
| * minor stuffVincent Breitmoser2015-01-033-3/+6
| * make certify routines more robust (#1016)Vincent Breitmoser2015-01-034-0/+14
| * add more descriptive string about non-mdc encrypted dataVincent Breitmoser2015-01-033-1/+3
| * encapsulate high level edit key into new operation classVincent Breitmoser2015-01-0314-167/+294
| * deal with non-existent user ids during import (#994)Vincent Breitmoser2015-01-023-9/+13
| * tests: add multiple keys with signature test caseVincent Breitmoser2015-01-021-0/+75
| * throw exception if no data is found in getGenericDataVincent Breitmoser2015-01-021-0/+3
| * get rid of RuntimeException control flow in UncachedKeyRing.fromStreamVincent Breitmoser2015-01-024-33/+24
| * fix and test for bad certificate version numbers (#1012)Vincent Breitmoser2015-01-024-7/+47
| * tests: for export, check that a token local cert actually exists before exportVincent Breitmoser2015-01-021-10/+22
| * tests: add test for key exportVincent Breitmoser2015-01-021-0/+211
| * extend canonicalize to strip local certificates on exportVincent Breitmoser2015-01-0212-71/+123
| * small improvements regarding pin tests and loggingVincent Breitmoser2015-01-014-6/+33
| * add empty notation data packet only if necessaryVincent Breitmoser2015-01-011-16/+35
| * tests: be less verbose about inserting keyrings for encrypt/decryptVincent Breitmoser2015-01-011-2/+15
| * tests: add multi key encryption/decryption test, new way for fake passphrase ...Vincent Breitmoser2015-01-013-45/+125
| * fix unit tests (canonicalize after create)Vincent Breitmoser2015-01-012-0/+5
| * fix small merge conflict oversightVincent Breitmoser2014-12-301-3/+0
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-12-3025-62/+129
| |\
| * | some small notation data fixesVincent Breitmoser2014-12-302-10/+10
| * | add test case for PIN unlockVincent Breitmoser2014-12-301-2/+28
| * | add PIN as a SecretKeyTypeVincent Breitmoser2014-12-308-5/+38