Vincent Breitmoser
|
b12aa63cb3
|
use CryptoOperationFragment for linked id fragments, and some warning cleanup
|
2015-04-24 15:44:33 +02:00 |
|
Vincent Breitmoser
|
b4aec3114d
|
Merge branch 'development' into linked-identities
Conflicts:
Graphics/update-drawables.sh
OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java
OpenKeychain/build.gradle
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
|
2015-04-24 14:18:01 +02:00 |
|
Adithya Abraham Philip
|
083cd100ce
|
hide linked system contact card if no contact present
|
2015-04-08 01:11:55 +05:30 |
|
Vincent Breitmoser
|
531697ffe7
|
Merge remote-tracking branch 'origin/development' into linked-identities
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
OpenKeychain/src/main/res/layout/view_key_fragment.xml
|
2015-03-10 04:56:51 +01:00 |
|
Vincent Breitmoser
|
3b7f21d98a
|
add expand item to linked id list
|
2015-03-10 04:27:40 +01:00 |
|
Dominik Schürmann
|
b3257e0ffa
|
Ripple
|
2015-03-10 02:13:36 +01:00 |
|
Adithya Abraham Philip
|
5f0a468d9a
|
changed default drawable for linked system contact
|
2015-03-10 02:49:34 +05:30 |
|
Adithya Abraham Philip
|
f8a6f814dd
|
added contact linking
|
2015-03-10 01:08:09 +05:30 |
|
Adithya Abraham Philip
|
bc43797c32
|
added card
|
2015-03-10 01:08:09 +05:30 |
|
Vincent Breitmoser
|
1f324be243
|
do a TON of UI work
|
2015-03-05 01:58:36 +01:00 |
|
Dominik Schürmann
|
484a9371b7
|
Remove help button for now
|
2015-03-04 20:40:55 +01:00 |
|
Dominik Schürmann
|
2bfe355d44
|
More icon naming fixes and design
|
2015-03-04 20:03:20 +01:00 |
|
Vincent Breitmoser
|
8222315dbd
|
work more on separation of linked identities and resources, initial ui work
|
2015-03-04 12:30:56 +01:00 |
|
Dominik Schürmann
|
54e04f496e
|
Better qr code resizing
|
2015-02-27 22:26:11 +01:00 |
|
Dominik Schürmann
|
27263edda5
|
CardView and more header design
|
2015-02-25 18:37:31 +01:00 |
|
Dominik Schürmann
|
fa92ceeae3
|
Toolbar: qr code in header, cleanup of fragment
|
2015-02-25 13:49:21 +01:00 |
|
Dominik Schürmann
|
430ba2f777
|
Bigger status icon in key view
|
2015-02-25 11:29:46 +01:00 |
|
Dominik Schürmann
|
17a6003edd
|
Remove tabs in view key
|
2015-02-24 11:25:19 +01:00 |
|