aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/resources
Commit message (Collapse)AuthorAgeFilesLines
* Fix license headerDominik Schürmann2016-05-124-0/+68
|
* okhttp3Michal Kepkowski2016-03-143-5/+5
|
* okHttpMichal Kepkowski2016-03-043-43/+59
|
* linked: deprecate unused method, for nowVincent Breitmoser2015-09-101-1/+2
|
* Merge tag 'v3.2.1' into linked-identitiesVincent Breitmoser2015-05-111-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 certVincent Breitmoser2015-05-094-18/+25
|
* linked-ids: rename RawLinkedIdentity to UriAttributeVincent Breitmoser2015-05-091-2/+2
|
* linked-ids: rename "cookie" to "token"Vincent Breitmoser2015-05-094-15/+15
|
* linked-ids: code cleanup, handle all lint errorsVincent Breitmoser2015-05-094-0/+685