aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | support backstack for verificationVincent Breitmoser2015-03-091-12/+26
| | | | | | | | | | | |
| * | | | | | | | | | | rearrange linked id layouts, add CertListWidgetVincent Breitmoser2015-03-096-80/+295
| | | | | | | | | | | |
| * | | | | | | | | | | add linked id certs uri to KeychainProviderVincent Breitmoser2015-03-093-59/+15
| | | | | | | | | | | |
| * | | | | | | | | | | fix transition animationVincent Breitmoser2015-03-093-9/+41
| | | | | | | | | | | |
| * | | | | | | | | | | use loader in LinkedIdViewFragmentVincent Breitmoser2015-03-099-110/+275
| | | | | | | | | | | |
| * | | | | | | | | | | successfully certify linked idsVincent Breitmoser2015-03-085-21/+81
| | | | | | | | | | | |
| * | | | | | | | | | | return key ids from PassphraseDialogActivity, accept null useridsVincent Breitmoser2015-03-084-7/+5
| | | | | | | | | | | |
| * | | | | | | | | | | minor changes, add convertFingerprintToKeyId methodVincent Breitmoser2015-03-086-18/+59
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-0854-623/+1317
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * | | | | | | | | | | | work on certification stepVincent Breitmoser2015-03-082-7/+100
| | | | | | | | | | | | |
| * | | | | | | | | | | | finish after linked id creationVincent Breitmoser2015-03-061-12/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | use final fragment superclass for twitterVincent Breitmoser2015-03-061-98/+23
| | | | | | | | | | | | |
| * | | | | | | | | | | | use final fragment superclass for dnsVincent Breitmoser2015-03-062-214/+19
| | | | | | | | | | | | |
| * | | | | | | | | | | | extract linked id create final fragment superclassVincent Breitmoser2015-03-062-221/+275
| | | | | | | | | | | | |
| * | | | | | | | | | | | prepare superclass extraction for final linked id creation fragmentVincent Breitmoser2015-03-065-34/+42
| | | | | | | | | | | | |
| * | | | | | | | | | | | first steps in ui towards confirmation of linked idsVincent Breitmoser2015-03-068-237/+410
| | | | | | | | | | | | |
| * | | | | | | | | | | | work on LinkedIdViewFragmentVincent Breitmoser2015-03-0512-105/+178
| | | | | | | | | | | | |
| * | | | | | | | | | | | make linked identity list homogeneousVincent Breitmoser2015-03-0512-112/+156
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-05598-1502/+1234
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| * | | | | | | | | | | | | 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-0527-246/+672
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | work more on separation of linked identities and resources, initial ui workVincent Breitmoser2015-03-0421-227/+438
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | remove unused bits from projectionVincent Breitmoser2015-03-021-15/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | nonce is 4 bytesVincent Breitmoser2015-03-021-9/+9
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | add linked it to view key context menuVincent Breitmoser2015-03-024-1/+26
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-0225-320/+426
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java
| * | | | | | | | | | | | | | some fixes for compiling (still not working!)Vincent Breitmoser2015-03-027-28/+13
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-021200-13898/+27589
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java OpenKeychain/src/main/res/layout/view_key_main_fragment.xml OpenKeychain/src/main/res/values/strings.xml extern/spongycastle
| * | | | | | | | | | | | | | | small language fixVincent Breitmoser2015-01-162-15/+19
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | linked id ui work dns/twitterVincent Breitmoser2015-01-165-14/+19
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | dns resource is parametrized by fqdn, class and typeVincent Breitmoser2015-01-162-5/+34
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | show notification if KeyListActivity is spawned with an EXTRA_RESULTVincent Breitmoser2015-01-162-1/+9
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | affirmation -> linked identityVincent Breitmoser2015-01-1529-206/+178
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 09:41:16 +0000