Dominik Schürmann
|
67a51cdfe3
|
Target SDK 23 and related fixes
|
2015-10-26 20:53:32 +01:00 |
|
Vincent Breitmoser
|
8a1a62692b
|
linked: deprecate unused method, for now
|
2015-09-10 12:12:35 +02:00 |
|
Vincent Breitmoser
|
ee81018163
|
linked: disable DNS resource (for now)
|
2015-08-31 13:47:00 +02:00 |
|
Vincent Breitmoser
|
df44d9b65c
|
allow linked token without one colon
|
2015-05-12 11:57:07 +02:00 |
|
Vincent Breitmoser
|
6fe0a55522
|
rename LinkedIdentity to LinkedAttribute
|
2015-05-12 11:56:39 +02:00 |
|
Vincent Breitmoser
|
20a6c5ce8a
|
Merge tag 'v3.2.1' into linked-identities
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
|
2015-05-11 17:28:34 +02:00 |
|
Vincent Breitmoser
|
92ac2ded10
|
linked-ids: small compatibility changes
|
2015-05-11 17:00:45 +02:00 |
|
Vincent Breitmoser
|
9aff6c7f85
|
linked-ids: add certificate pinning, pin twitter api cert
|
2015-05-09 19:27:33 +02:00 |
|
Vincent Breitmoser
|
3600cda3bc
|
linked-ids: rename RawLinkedIdentity to UriAttribute
|
2015-05-09 19:09:09 +02:00 |
|
Vincent Breitmoser
|
57f72996e8
|
linked-ids: rename "cookie" to "token"
|
2015-05-09 12:29:43 +02:00 |
|
Vincent Breitmoser
|
4378f8f871
|
linked-ids: code cleanup, handle all lint errors
|
2015-05-09 12:24:48 +02:00 |
|