aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* move stray test file to correct positionVincent Breitmoser2015-08-291-3/+5
* Merge remote-tracking branch 'origin/master'Vincent Breitmoser2015-08-295-74/+163
|\
| * Improve decrypt stringsDominik Schürmann2015-08-281-2/+2
| * Support OpenPGP API v9Dominik Schürmann2015-08-281-10/+6
| * Merge branch 'mgeier63-master'Dominik Schürmann2015-08-284-63/+156
| |\
| | * Cleanup OpenPgpService2 code, update openpgp-api libDominik Schürmann2015-08-282-51/+3
| | * Revert "service side support for https://github.com/open-keychain/openpgp-api...Dominik Schürmann2015-08-281-3/+208
| | * Merge branch 'master' of https://github.com/mgeier63/open-keychain into mgeie...Dominik Schürmann2015-08-284-271/+207
| |/|
| | * service side support for https://github.com/open-keychain/openpgp-api/pull/3mgeier632015-08-271-208/+3
| | * service side support for https://github.com/open-keychain/openpgp-api/pull/3mgeier632015-08-273-63/+204
* | | Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-29115-97/+6277
|\ \ \ | |/ / |/| |
| * | 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-11104-1338/+1597
| |\ \
| * | | linked-ids: small compatibility changesVincent Breitmoser2015-05-113-2/+4
| * | | linked-ids: add certificate pinning, pin twitter api certVincent Breitmoser2015-05-099-27/+54
| * | | linked-ids: rename RawLinkedIdentity to UriAttributeVincent Breitmoser2015-05-097-25/+25
| * | | linked-ids: rename "cookie" to "token"Vincent Breitmoser2015-05-0912-43/+43
| * | | 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-276-13/+30
| * | | prevent crashes in EncryptKeyCompletionViewVincent Breitmoser2015-04-271-2/+10
| * | | display creation dates for ambiguous user idsVincent Breitmoser2015-04-274-17/+44
| * | | add distinct status for messages signed by "your" keyVincent Breitmoser2015-04-272-0/+14
| * | | small changes for performanceVincent Breitmoser2015-04-271-3/+4
| * | | 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-263-140/+0
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-04-2655-238/+1113
| |\ \ \ \
| * | | | | update uris and cookie patterns, plus some stylingsVincent Breitmoser2015-04-2511-33/+65
| * | | | | change HttpsEditText to generic PrefixEditTextVincent Breitmoser2015-04-255-10/+27
| * | | | | fix certification in unit testsVincent Breitmoser2015-04-242-2/+2
| * | | | | fix encrypt activity layoutVincent Breitmoser2015-04-242-3/+4
| * | | | | revamp decrypt uiVincent Breitmoser2015-04-247-230/+391
| * | | | | 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-246-80/+38
| * | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-24257-5089/+7145
| |\ \ \ \ \
| * | | | | | minor ui and wording changesVincent Breitmoser2015-04-092-8/+20
| * | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-09236-8377/+10293
| |\ \ \ \ \ \
| * | | | | | | rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-307-406/+423
| * | | | | | | even more linked id ui workVincent Breitmoser2015-03-298-34/+38
| * | | | | | | more (subtle) ui workVincent Breitmoser2015-03-264-39/+65
| * | | | | | | more linked id ui fine tuningVincent Breitmoser2015-03-2621-958/+10
| * | | | | | | some linked id ui fine tuningVincent Breitmoser2015-03-2644-154/+1116
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 02:32:10 +0000