aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
Commit message (Collapse)AuthorAgeFilesLines
* hack loadSystemContact back inVincent Breitmoser2015-03-101-5/+5
|
* Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-03-101-1/+67
|\ | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java OpenKeychain/src/main/res/layout/view_key_fragment.xml
| * cleaned up code, added commentsAdithya Abraham Philip2015-03-101-9/+15
| | | | | | | | optimised imports
| * added contact linkingAdithya Abraham Philip2015-03-101-9/+52
| |
| * added cardAdithya Abraham Philip2015-03-101-0/+18
| |
| * Use master key id instead of fingerprint in sync adapter, use IS_EXPIRED ↵Dominik Schürmann2015-03-041-2/+2
| | | | | | | | instead of EXPIRY where possible
* | add expand item to linked id listVincent Breitmoser2015-03-101-1/+6
| |
* | filter out unknown linked idsVincent Breitmoser2015-03-101-4/+5
| |
* | fix transition animationVincent Breitmoser2015-03-091-7/+24
| |
* | use loader in LinkedIdViewFragmentVincent Breitmoser2015-03-091-1/+1
| |
* | successfully certify linked idsVincent Breitmoser2015-03-081-1/+1
| |
* | first steps in ui towards confirmation of linked idsVincent Breitmoser2015-03-061-58/+38
| |
* | work on LinkedIdViewFragmentVincent Breitmoser2015-03-051-1/+10
| |
* | make linked identity list homogeneousVincent Breitmoser2015-03-051-3/+4
| |
* | do a TON of UI workVincent Breitmoser2015-03-051-4/+32
| |
* | work more on separation of linked identities and resources, initial ui workVincent Breitmoser2015-03-041-7/+29
| |
* | remove unused bits from projectionVincent Breitmoser2015-03-021-15/+1
|/
* forgot to rename a methodVincent Breitmoser2015-03-021-3/+1
|
* some cleanup in ViewKey*Vincent Breitmoser2015-03-021-15/+4
|
* make userattributeadapter superclass of useridsadapterVincent Breitmoser2015-03-021-6/+1
|
* Dont show verification icons in my key view, hide edit button for non-secret ↵Dominik Schürmann2015-02-251-23/+85
| | | | keys
* CardView and more header designDominik Schürmann2015-02-251-2/+3
|
* Toolbar: qr code in header, cleanup of fragmentDominik Schürmann2015-02-251-451/+5
|
* Remove tabs in view keyDominik Schürmann2015-02-241-0/+615