Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix license header | Dominik Schürmann | 2016-05-12 | 4 | -0/+68 |
| | |||||
* | okhttp3 | Michal Kepkowski | 2016-03-14 | 3 | -5/+5 |
| | |||||
* | okHttp | Michal Kepkowski | 2016-03-04 | 3 | -43/+59 |
| | |||||
* | linked: deprecate unused method, for now | Vincent Breitmoser | 2015-09-10 | 1 | -1/+2 |
| | |||||
* | 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: add certificate pinning, pin twitter api cert | Vincent Breitmoser | 2015-05-09 | 4 | -18/+25 |
| | |||||
* | linked-ids: rename RawLinkedIdentity to UriAttribute | Vincent Breitmoser | 2015-05-09 | 1 | -2/+2 |
| | |||||
* | linked-ids: rename "cookie" to "token" | Vincent Breitmoser | 2015-05-09 | 4 | -15/+15 |
| | |||||
* | linked-ids: code cleanup, handle all lint errors | Vincent Breitmoser | 2015-05-09 | 4 | -0/+685 |