aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-292-1/+8
|\
| * Merge tag 'v3.2.1' into linked-identitiesVincent Breitmoser2015-05-112-3/+28
| |\
| * | linked-ids: rename RawLinkedIdentity to UriAttributeVincent Breitmoser2015-05-091-1/+1
| * | linked-ids: code cleanup, handle all lint errorsVincent Breitmoser2015-05-098-1128/+0
| * | check for fingerprint of any subkey (arguable?)Vincent Breitmoser2015-05-061-0/+11
| * | update uris and cookie patterns, plus some stylingsVincent Breitmoser2015-04-253-7/+7
| * | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-249-455/+600
| |\ \
| * \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-091-5/+11
| |\ \ \
| * | | | some linked id ui fine tuningVincent Breitmoser2015-03-264-4/+4
| * | | | secret/public distinction in LinkedIdViewVincent Breitmoser2015-03-245-20/+13
| * | | | work on cookie scanning during creationVincent Breitmoser2015-03-244-138/+117
| * | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-249-86/+150
| |\ \ \ \
| * | | | | support github resource (ci)Vincent Breitmoser2015-03-243-3/+70
| * | | | | support github resource (re)Vincent Breitmoser2015-03-241-0/+11
| * | | | | support github resource (pa)Vincent Breitmoser2015-03-243-46/+220
| * | | | | work on certification uiVincent Breitmoser2015-03-154-0/+26
| * | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-154-29/+31
| |\ \ \ \ \
| * | | | | | remove notiion of nonce/identifierVincent Breitmoser2015-03-138-70/+25
| * | | | | | regenerate twitter tokenVincent Breitmoser2015-03-121-4/+16
| * | | | | | finish implementing twitter resourceVincent Breitmoser2015-03-123-62/+171
| * | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-088-128/+258
| |\ \ \ \ \ \
| * | | | | | | prepare superclass extraction for final linked id creation fragmentVincent Breitmoser2015-03-063-4/+4
| * | | | | | | work on LinkedIdViewFragmentVincent Breitmoser2015-03-055-4/+26
| * | | | | | | make linked identity list homogeneousVincent Breitmoser2015-03-058-28/+102
| * | | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-051-9/+10
| |\ \ \ \ \ \ \
| * | | | | | | | small fixes to the matcherVincent Breitmoser2015-03-051-5/+2
| * | | | | | | | fixed length identifiersVincent Breitmoser2015-03-052-7/+4
| * | | | | | | | do a TON of UI workVincent Breitmoser2015-03-058-131/+211
| * | | | | | | | work more on separation of linked identities and resources, initial ui workVincent Breitmoser2015-03-047-196/+190
| * | | | | | | | nonce is 4 bytesVincent Breitmoser2015-03-021-9/+9
| * | | | | | | | NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-0216-479/+1202
| |\ \ \ \ \ \ \ \
| * | | | | | | | | linked id ui work dns/twitterVincent Breitmoser2015-01-161-0/+4
| * | | | | | | | | dns resource is parametrized by fqdn, class and typeVincent Breitmoser2015-01-161-4/+33
| * | | | | | | | | affirmation -> linked identityVincent Breitmoser2015-01-157-33/+31
| * | | | | | | | | work on dns resource, working (dummy) verificationVincent Breitmoser2015-01-144-52/+79
| * | | | | | | | | small fixes to user attribute handlingVincent Breitmoser2015-01-142-3/+26
| * | | | | | | | | 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-144-5/+52
| * | | | | | | | | certification of the first linked identity packet!Vincent Breitmoser2015-01-133-9/+35
| * | | | | | | | | add support for user attributes in merge() routineVincent Breitmoser2015-01-131-2/+28
| * | | | | | | | | hack to make WrappedUserAttribute serializableVincent Breitmoser2015-01-131-2/+47
| * | | | | | | | | some work on twitter resourceVincent Breitmoser2015-01-131-1/+6
| * | | | | | | | | forgot to commit WrappedUserAttributeVincent Breitmoser2015-01-121-0/+47
| * | | | | | | | | support addition of user attributesVincent Breitmoser2015-01-121-3/+49
| * | | | | | | | | work on affirmations (begin rename to LinkedIdentityVincent Breitmoser2015-01-123-173/+2
| * | | | | | | | | add support for user attributes (during canonicalization)Vincent Breitmoser2015-01-123-0/+335
| * | | | | | | | | even more intermediate resultVincent Breitmoser2015-01-126-77/+290
| * | | | | | | | | intermediate state, nothing really working yetVincent Breitmoser2015-01-126-0/+358
* | | | | | | | | | Remove dead codeDominik Schürmann2015-08-271-2/+2
* | | | | | | | | | apply fixPgpMessage to plaintext/armored decrypt inputVincent Breitmoser2015-08-171-18/+14
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 00:34:30 +0000