aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'v3.2.1' into linked-identitiesVincent Breitmoser2015-05-111-0/+2
|\
| * fixed sync on key import, 'me' linked contact crashAdithya Abraham Philip2015-05-081-0/+2
* | show linked ids card only if unfiltered ids are availableVincent Breitmoser2015-04-261-1/+1
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-241-61/+175
|\|
| * hide linked system contact card if no contact presentAdithya Abraham Philip2015-04-081-9/+23
| * linked system contact auto-refresh added, fixed contact image issueAdithya Abraham Philip2015-04-081-20/+70
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-151-12/+31
|\|
| * -fixed out of bounds crash when retrieving the main profile name with secret ...Daniel Ramos2015-03-151-1/+3
| * added some documentationAdithya Abraham Philip2015-03-131-4/+5
| * added own profile support in linekd system contactAdithya Abraham Philip2015-03-131-7/+25
| * corrected linked system contact display nameAdithya Abraham Philip2015-03-111-11/+12
* | show certificates for secret keys differentlyVincent Breitmoser2015-03-141-1/+1
* | hack loadSystemContact back inVincent Breitmoser2015-03-101-5/+5
* | Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-03-101-1/+67
|\|
| * cleaned up code, added commentsAdithya Abraham Philip2015-03-101-9/+15
| * 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 inst...Dominik Schürmann2015-03-041-2/+2
* | 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
* 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