aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Expand)AuthorAgeFilesLines
* Use fixed gradle versionsDominik Schürmann2014-06-041-2/+4
* Merge remote-tracking branch 'origin/master' into edit-key-rewriteVincent Breitmoser2014-06-0299-712/+1368
|\
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-05-317-63/+54
| |\
| | * Finished cleaning up rebase conflicts post Keyserver exception refactorTim Bray2014-05-236-32/+33
| | * Add Log.d for QueryFailedExceptionTim Bray2014-05-231-0/+2
| | * Add Log.d for QueryFailedExceptionTim Bray2014-05-237-40/+28
| * | Pull from transifexDominik Schürmann2014-05-3192-649/+1314
| |/
* | wrapped-key-ring: add documentationVincent Breitmoser2014-06-027-7/+83
* | make everything work againVincent Breitmoser2014-06-023-8/+22
* | wrapped-key-ring: move key data around in ParcelableKeyRing instead of Import...Vincent Breitmoser2014-06-029-183/+119
* | wrapped-key-ring: no UncachedSecretKeyRing after allVincent Breitmoser2014-06-029-61/+75
* | new savekeyring operation (mostly stub)Vincent Breitmoser2014-05-2716-356/+595
* | introduce new SaveKeyringParcelVincent Breitmoser2014-05-271-0/+113
* | rename SaveKeyringParcel to OldSaveKeyringParcelVincent Breitmoser2014-05-274-14/+19
* | update unit test support in build filesVincent Breitmoser2014-05-274-105/+35
* | fix missing userIds in ImportKeysListEntryVincent Breitmoser2014-05-272-4/+9
* | wrapped-key-ring: forgot a part in PgpDecryptVerifyVincent Breitmoser2014-05-231-2/+9
* | introduce WrappedSignature for the ViewCert* ui codeVincent Breitmoser2014-05-233-31/+149
* | wrapped-key-ring: use UncachedKeyRing in ImportKeysListLoaderVincent Breitmoser2014-05-231-28/+8
* | wrapped-key-ring: UncachedKeyRing wraps only one ring of dynamic typeVincent Breitmoser2014-05-238-101/+126
* | wrapped-key-ring: encapsulate key flagsVincent Breitmoser2014-05-223-18/+27
* | Merge remote-tracking branch 'origin/master' into wrapped-key-ringVincent Breitmoser2014-05-2127-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 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
| |/
| * 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
| * 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-14440-1997/+4656
|\|
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-05-132-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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 06:41:34 +0000