aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'v3.2.1' into linked-identitiesVincent Breitmoser2015-05-112-22/+3
|\
| * Remove time from key creation displayDominik Schürmann2015-04-301-1/+0
| * Fix key creation string and displayDominik Schürmann2015-04-302-17/+2
| * display creation dates for ambiguous user idsVincent Breitmoser2015-04-272-14/+29
* | linked-ids: rename RawLinkedIdentity to UriAttributeVincent Breitmoser2015-05-091-8/+8
* | linked-ids: code cleanup, handle all lint errorsVincent Breitmoser2015-05-091-2/+2
* | small ui nicetiesVincent Breitmoser2015-04-271-0/+9
* | display creation dates for ambiguous user idsVincent Breitmoser2015-04-272-14/+29
* | Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-04-263-6/+6
|\|
| * Switch to new support lib version 22.1Dominik Schürmann2015-04-252-4/+4
| * support for handling keyserver urls from browser, added documentationAdithya Abraham Philip2015-04-201-2/+2
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-242-0/+95
|\|
| * Dont show slinger button in spinnerDominik Schürmann2015-03-301-0/+2
| * Use RecyclerView in EncryptFilesFragmentDominik Schürmann2015-03-301-0/+93
| * rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-301-0/+279
* | rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-301-0/+279
* | even more linked id ui workVincent Breitmoser2015-03-291-3/+0
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-245-36/+35
|\|
| * object oriented split user idDominik Schürmann2015-03-165-36/+35
* | work on certification uiVincent Breitmoser2015-03-151-1/+1
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-153-24/+41
|\|
| * Remove display of key id in other listsDominik Schürmann2015-03-151-6/+26
| * Show main user id instead of key in certify screenDominik Schürmann2015-03-151-10/+15
* | show certificates for secret keys differentlyVincent Breitmoser2015-03-141-6/+5
* | improve error handling in LinkedIdViewFragment, disable unknown identity type...Vincent Breitmoser2015-03-131-1/+3
* | finish implementing twitter resourceVincent Breitmoser2015-03-121-1/+0
* | hack loadSystemContact back inVincent Breitmoser2015-03-101-0/+8
* | add expand item to linked id listVincent Breitmoser2015-03-101-3/+37
* | filter out unknown linked idsVincent Breitmoser2015-03-101-18/+35
* | fix transition animationVincent Breitmoser2015-03-091-1/+1
* | use loader in LinkedIdViewFragmentVincent Breitmoser2015-03-093-19/+73
* | minor changes, add convertFingerprintToKeyId methodVincent Breitmoser2015-03-081-1/+1
* | first steps in ui towards confirmation of linked idsVincent Breitmoser2015-03-061-2/+2
* | work on LinkedIdViewFragmentVincent Breitmoser2015-03-051-9/+18
* | make linked identity list homogeneousVincent Breitmoser2015-03-051-75/+44
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-056-17/+17
|\|
| * Merge pull request #1101 from danielnelz/developmentDominik Schürmann2015-03-043-8/+11
| |\
| | * #1042 replaced some int constants with enumsDaniel Nelz2015-03-043-8/+11
| * | More icon naming fixes and designDominik Schürmann2015-03-041-2/+2
| |/
| * Fixes Issue #1081Ishan Khanna2015-03-031-3/+0
* | do a TON of UI workVincent Breitmoser2015-03-052-79/+123
* | work more on separation of linked identities and resources, initial ui workVincent Breitmoser2015-03-043-6/+166
|/
* forgot to rename a methodVincent Breitmoser2015-03-021-1/+1
* some cleanup in ViewKey*Vincent Breitmoser2015-03-021-3/+16
* make userattributeadapter superclass of useridsadapterVincent Breitmoser2015-03-023-109/+142
* Fix status images in user id adapterDominik Schürmann2015-02-271-4/+4
* Merge keybase-proof branchDominik Schürmann2015-02-271-1/+17
|\
| * In the ImportKeysList display, arrange for Keybase UserIDs to sort below the ...Tim Bray2014-11-181-1/+17
* | Dont show verification icons in my key view, hide edit button for non-secret ...Dominik Schürmann2015-02-251-5/+17
* | Bigger status icon in key viewDominik Schürmann2015-02-251-2/+2