aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * wrapped-key-ring: encapsulate key flagsVincent Breitmoser2014-05-223-18/+27
| * Merge remote-tracking branch 'origin/master' into wrapped-key-ringVincent Breitmoser2014-05-2137-253/+375
| |\ | |/ |/|
* | Layout fixes for key importDominik Schürmann2014-05-199-66/+58
* | Add license header to FixedDrawerLayoutDominik Schürmann2014-05-181-0/+16
* | Merge branch 'thi-highlight-keyserver-search-results-as-well'Dominik Schürmann2014-05-189-91/+128
|\ \
| * | Merge highlight keyserver pull requestDominik Schürmann2014-05-189-91/+128
|/| |
| * | Rename mCurQuery to mQuery for consistencyThialfihar2014-05-161-5/+5
| * | Use Highlighter instead of HighlightQueryCursorAdapterThialfihar2014-05-163-79/+28
| * | Add highlighting to keyserver/keybase searchThialfihar2014-05-165-5/+75
| * | Support mutliple search words and highlight themThialfihar2014-05-163-6/+24
* | | Rename KeyServer to KeyserverDominik Schürmann2014-05-189-38/+34
|/ /
* | Merge pull request #630 from timbray/masterDominik Schürmann2014-05-162-24/+60
|\ \
| * | keybase cleanups for revised search output formatTim Bray2014-05-151-24/+7
| * | keybase now has key info in search outputTim Bray2014-05-151-0/+5
| * | JWalk javadocsTim Bray2014-05-141-0/+48
|/ /
* | New screenshotsDominik Schürmann2014-05-1410-0/+0
* | Merge pull request #627 from thi/improve-keybase.io-supportDominik Schürmann2014-05-146-49/+94
|\ \
| * | Rename fingerPrint to fingerprintThialfihar2014-05-145-16/+16
| * | Add github, twitter, website info for keybase keysThialfihar2014-05-141-0/+17
| * | Cleanup keybase query a bitThialfihar2014-05-141-15/+14
| * | Don't guess keybase key algorithm and sizeThialfihar2014-05-142-5/+8
| * | Add extraData property in ImportKeyListEntryThialfihar2014-05-143-8/+20
| * | List full keybase id or strong key id matches on topThialfihar2014-05-141-1/+10
| * | Make keybase lookup works for key ids starting with 0xThialfihar2014-05-141-1/+6
* | | Clarify help startDominik Schürmann2014-05-141-1/+1
|/ /
| * wrapped-key-ring: use CachedKeyRing where possibleVincent Breitmoser2014-05-217-42/+44
| * use long rather than String to build uris by keyVincent Breitmoser2014-05-2113-37/+33
| * wrapped-key-ring: split up CachedKeyRing and WrappedKeyRingVincent Breitmoser2014-05-2123-211/+370
| * Merge remote-tracking branch 'origin/master' into wrapped-key-ringVincent Breitmoser2014-05-14505-5887/+4675
| |\ | |/ |/|
* | Update html-textviewDominik Schürmann2014-05-141-0/+0
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-05-132-5/+6
|\ \
| * \ Merge pull request #623 from danielhass/appmsgDominik Schürmann2014-05-122-5/+6
| |\ \
| | * | Removed unused Toast importDaniel Haß2014-05-111-1/+0
| | * | Toast replacementDaniel Haß2014-05-111-2/+4
| | * | Fixed wrong AppMsg-StyleDaniel Haß2014-05-111-2/+2
| |/ /
* / / Add pgpauth app to help, update html-textviewDominik Schürmann2014-05-134-27/+4
|/ /
* | Add Tim Bray to aboutDominik Schürmann2014-05-091-0/+1
* | Version 2.7Dominik Schürmann2014-05-081-2/+2
* | Translations from transifexDominik Schürmann2014-05-0819-3/+141
* | Changelog 2.7Dominik Schürmann2014-05-082-0/+16
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-05-0812-28/+63
|\ \
| * | ui: purplize dialog headers (huge hack inside)Vincent Breitmoser2014-05-0812-28/+63
* | | Translations from transifexDominik Schürmann2014-05-084-8/+12
|/ /
* | proper null checks and closing of cursors everywhereVincent Breitmoser2014-05-086-148/+189
* | use longsparsearrays instead of hashmaps in that one placeVincent Breitmoser2014-05-081-16/+19
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-05-083-5/+1
|\ \
| * | use setEncryptToSigner for asymmetric encryptionVincent Breitmoser2014-05-083-5/+1
* | | Use flat buttons where appropriateDominik Schürmann2014-05-0815-40/+77
|/ /
* | Merge pull request #619 from Valodim/loader-fragmentDominik Schürmann2014-05-0811-197/+216
|\ \
| * | use LoaderFragment in ViewKey tabsVincent Breitmoser2014-05-087-53/+35