Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | linked: disable DNS resource (for now) | Vincent Breitmoser | 2015-08-31 | 1 | -4/+4 |
| | |||||
* | allow linked token without one colon | Vincent Breitmoser | 2015-05-12 | 1 | -3/+2 |
| | |||||
* | rename LinkedIdentity to LinkedAttribute | Vincent Breitmoser | 2015-05-12 | 2 | -4/+4 |
| | |||||
* | Merge tag 'v3.2.1' into linked-identities | Vincent Breitmoser | 2015-05-11 | 1 | -3/+3 |
| | | | | | | | | | | | | | Version 3.2.1 Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/values/strings.xml | ||||
* | linked-ids: small compatibility changes | Vincent Breitmoser | 2015-05-11 | 1 | -1/+2 |
| | |||||
* | linked-ids: add certificate pinning, pin twitter api cert | Vincent Breitmoser | 2015-05-09 | 5 | -24/+49 |
| | |||||
* | linked-ids: rename RawLinkedIdentity to UriAttribute | Vincent Breitmoser | 2015-05-09 | 3 | -11/+11 |
| | |||||
* | linked-ids: rename "cookie" to "token" | Vincent Breitmoser | 2015-05-09 | 6 | -24/+24 |
| | |||||
* | linked-ids: code cleanup, handle all lint errors | Vincent Breitmoser | 2015-05-09 | 8 | -0/+1103 |