| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-05 | 1 | -2/+2 |
| |\ | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java | ||||
| | * | Use master key id instead of fingerprint in sync adapter, use IS_EXPIRED ↵ | Dominik Schürmann | 2015-03-04 | 1 | -2/+2 |
| | | | | | | | | | instead of EXPIRY where possible | ||||
| * | | work more on separation of linked identities and resources, initial ui work | Vincent Breitmoser | 2015-03-04 | 1 | -1/+1 |
| |/ | |||||
| * | Reorder advanced key view | Dominik Schürmann | 2015-02-27 | 1 | -0/+184 |
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvUserIdsFragment.java