Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-09 | 1 | -1/+1 |
| | | | | | | | Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
* | even more linked id ui work | Vincent Breitmoser | 2015-03-29 | 1 | -2/+0 |
| | |||||
* | show certificates for secret keys differently | Vincent Breitmoser | 2015-03-14 | 1 | -8/+12 |
| | |||||
* | minor additions to CertListWidget | Vincent Breitmoser | 2015-03-10 | 1 | -7/+17 |
| | |||||
* | rearrange linked id layouts, add CertListWidget | Vincent Breitmoser | 2015-03-09 | 1 | -0/+131 |