aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure
Commit message (Expand)AuthorAgeFilesLines
* linked: disable DNS resource (for now)Vincent Breitmoser2015-08-312-4/+6
* Show linked identity menu item and linked identities only when feature is ena...Dominik Schürmann2015-08-292-5/+9
* Reword experimental settingsDominik Schürmann2015-08-291-2/+4
* Merge remote-tracking branch 'origin/master'Vincent Breitmoser2015-08-292-70/+145
|\
| * Support OpenPGP API v9Dominik Schürmann2015-08-281-10/+6
| * Cleanup OpenPgpService2 code, update openpgp-api libDominik Schürmann2015-08-281-51/+3
| * Merge branch 'master' of https://github.com/mgeier63/open-keychain into mgeie...Dominik Schürmann2015-08-282-61/+188
| |\
| | * service side support for https://github.com/open-keychain/openpgp-api/pull/3mgeier632015-08-272-61/+188
* | | Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-2951-75/+4152
|\ \ \ | |/ / |/| |
| * | yubikey: don't assume signing key is masterKeyId in ViewKeyActivityVincent Breitmoser2015-05-162-42/+54
| * | fix fragment handling in ViewKeyActivityVincent Breitmoser2015-05-161-37/+12
| * | linked-ids: remove debug uriVincent Breitmoser2015-05-161-1/+1
| * | allow linked token without one colonVincent Breitmoser2015-05-121-3/+2
| * | rename LinkedIdentity to LinkedAttributeVincent Breitmoser2015-05-125-13/+13
| * | Merge tag 'v3.2.1' into linked-identitiesVincent Breitmoser2015-05-1140-384/+692
| |\ \
| * | | linked-ids: small compatibility changesVincent Breitmoser2015-05-112-2/+3
| * | | linked-ids: add certificate pinning, pin twitter api certVincent Breitmoser2015-05-098-27/+53
| * | | linked-ids: rename RawLinkedIdentity to UriAttributeVincent Breitmoser2015-05-097-25/+25
| * | | linked-ids: rename "cookie" to "token"Vincent Breitmoser2015-05-0911-37/+37
| * | | linked-ids: code cleanup, handle all lint errorsVincent Breitmoser2015-05-0922-324/+295
| * | | check for fingerprint of any subkey (arguable?)Vincent Breitmoser2015-05-062-6/+18
| * | | fix crash when moving focus from EncryptKeyCompletionView with unknown textVincent Breitmoser2015-04-281-1/+1
| * | | display unknown keys red rather than orangeVincent Breitmoser2015-04-281-1/+1
| * | | fix "select all" in key list multi-selectVincent Breitmoser2015-04-281-1/+1
| * | | small ui nicetiesVincent Breitmoser2015-04-274-7/+24
| * | | prevent crashes in EncryptKeyCompletionViewVincent Breitmoser2015-04-271-2/+10
| * | | display creation dates for ambiguous user idsVincent Breitmoser2015-04-272-14/+29
| * | | add distinct status for messages signed by "your" keyVincent Breitmoser2015-04-271-0/+13
| * | | profiling says: caching qrCode bitmaps is a good ideaVincent Breitmoser2015-04-272-19/+43
| * | | show linked ids card only if unfiltered ids are availableVincent Breitmoser2015-04-261-1/+1
| * | | Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-04-2627-183/+802
| |\ \ \
| * | | | update uris and cookie patterns, plus some stylingsVincent Breitmoser2015-04-257-17/+53
| * | | | change HttpsEditText to generic PrefixEditTextVincent Breitmoser2015-04-252-6/+13
| * | | | fix encrypt activity layoutVincent Breitmoser2015-04-241-2/+1
| * | | | revamp decrypt uiVincent Breitmoser2015-04-243-149/+347
| * | | | don't show key spinner for a single entryVincent Breitmoser2015-04-242-1/+10
| * | | | use CryptoOperationFragment for linked id fragments, and some warning cleanupVincent Breitmoser2015-04-244-76/+30
| * | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-2497-3441/+4758
| |\ \ \ \
| * \ \ \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-0933-182/+864
| |\ \ \ \ \
| * | | | | | rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-304-393/+400
| * | | | | | even more linked id ui workVincent Breitmoser2015-03-295-28/+29
| * | | | | | more (subtle) ui workVincent Breitmoser2015-03-262-9/+38
| * | | | | | more linked id ui fine tuningVincent Breitmoser2015-03-261-0/+2
| * | | | | | some linked id ui fine tuningVincent Breitmoser2015-03-265-27/+34
| * | | | | | secret/public distinction in LinkedIdViewVincent Breitmoser2015-03-246-25/+18
| * | | | | | work on cookie scanning during creationVincent Breitmoser2015-03-2411-153/+150
| * | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-2484-1005/+1533
| |\ \ \ \ \ \
| * | | | | | | support github resource (ci)Vincent Breitmoser2015-03-243-3/+70
| * | | | | | | support github resource (re)Vincent Breitmoser2015-03-244-0/+263
| * | | | | | | support github resource (pa)Vincent Breitmoser2015-03-244-46/+221
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 01:39:56 +0000