aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | 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-05525-1403/+1150
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0211-288/+345
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-02860-9738/+15723
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | small fixes to user attribute handlingVincent Breitmoser2015-01-144-3/+28
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | 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-122-1/+36
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Make keybase an experimental featureDominik Schürmann2015-08-2812-213/+213
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Add missing scrim drawableDominik Schürmann2015-08-281-0/+8
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | introduce text protection and fix color change after confirmDominik Schürmann2015-08-283-10/+38
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Remove old commentDominik Schürmann2015-08-281-1/+0
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Improve scrolling in key viewDominik Schürmann2015-08-283-5/+1361
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Dont show FAB for expired, revoked keysDominik Schürmann2015-08-282-2/+4
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Improve certify stringsDominik Schürmann2015-08-281-9/+9
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-08-2810-140/+177
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-08-278-10/+12216
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-08-2725-20/+47
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | use nicer filenames during exportVincent Breitmoser2015-08-272-4/+22
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | some cleanup in FileHelper, and allow input of filename during exportVincent Breitmoser2015-08-279-139/+158
| | | | | | | | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-10 08:19:12 +0000