aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | Move SlidingTabLayout and SlidingTabStrip into appropriate subpackageDominik Schürmann2014-06-066-6/+6
| | * | | | | Hide subkeys, certs tabs in key view, checkable menu item to show/hide themDominik Schürmann2014-06-064-10/+94
| | | |_|/ / | | |/| | |
| | * | | | Merge pull request #646 from timbray/masterDominik Schürmann2014-06-052-67/+66
| | |\ \ \ \
| | | * | | | Clean up keyimport.ImportKeysListEntryTim Bray2014-06-052-67/+66
| | |/ / / /
| | * | | | Merge pull request #645 from timbray/masterDominik Schürmann2014-06-052-7/+4
| |/| | | | |/| | | | |
| | * | | | Don't show full fingerprint in key search resultsTim Bray2014-06-051-6/+2
| | * | | | fixed error messageTim Bray2014-06-042-4/+3
| | | |/ / | | |/| |
| * | | | canonicalize: require primary key binding certificates for signing subkeysVincent Breitmoser2014-06-123-5/+49
| * | | | canonicalize: simplify import with info from canonicalizationVincent Breitmoser2014-06-123-43/+9
| * | | | canonicalize: filter out future and local certificatesVincent Breitmoser2014-06-124-19/+98
| * | | | import-log: more minor improvementsVincent Breitmoser2014-06-123-17/+12
| * | | | import: use wrapped keyring instead of uncached keyring for trustVincent Breitmoser2014-06-122-26/+20
| * | | | import-log: minor improvementsVincent Breitmoser2014-06-125-56/+77
| * | | | canonicalize: more stuffVincent Breitmoser2014-06-125-47/+70
| * | | | canonicalize: implementation, first draftVincent Breitmoser2014-06-125-29/+337
| * | | | import-log: properly distinguish return statesVincent Breitmoser2014-06-125-26/+25
| * | | | import-log: better way to check self trust, and fix log level filteringVincent Breitmoser2014-06-123-17/+6
| * | | | import-log: use holder pattern in log fragmentVincent Breitmoser2014-06-111-16/+24
| * | | | import-log: work on log fragment uiVincent Breitmoser2014-06-106-21/+113
| * | | | import-log: switch to flags instead of statuses for result intVincent Breitmoser2014-06-1016-160/+205
| * | | | import-log: more interface workVincent Breitmoser2014-06-107-50/+94
| * | | | import-log: some cosmeticsVincent Breitmoser2014-06-108-26/+33
| * | | | import-log: add LogDisplay activityVincent Breitmoser2014-06-108-21/+204
| * | | | import-log: use supertoast in ImportKeyActivityVincent Breitmoser2014-06-101-26/+87
| * | | | canonicalize: first step(s)Vincent Breitmoser2014-06-103-3/+66
| * | | | import-log: add OperationResults, use it in ImportKeys operationVincent Breitmoser2014-06-106-101/+260
| * | | | import-log: add SuperToast external libraryVincent Breitmoser2014-06-104-0/+7
| | |_|/ | |/| |
| * | | import-log: better stripped key loggingVincent Breitmoser2014-06-064-17/+43
| * | | import-log: add output to logcat (for debugging)Vincent Breitmoser2014-06-063-8/+19
| * | | import-log: add import log string resourcesVincent Breitmoser2014-06-061-0/+38
| * | | import-log: add log statements in import routineVincent Breitmoser2014-06-062-97/+225
| * | | import-log: improve operationresultparcel, add indentationVincent Breitmoser2014-06-062-10/+37
| * | | import-log: add parcelable prototypeVincent Breitmoser2014-06-051-0/+123
|/ / /
* | | ui: do show Certify identities button even for secret keysVincent Breitmoser2014-06-041-8/+0
* | | fix bug with bad verifying master keysVincent Breitmoser2014-06-041-3/+3
* | | do respect expectedFingerprint during key importVincent Breitmoser2014-06-042-9/+18
* | | neatness refactoringVincent Breitmoser2014-06-0433-241/+118
|/ /
* | Use fixed gradle versionsDominik Schürmann2014-06-042-2/+2
* | Use fixed gradle versionsDominik Schürmann2014-06-042-3/+6
* | Merge pull request #643 from open-keychain/v/devDominik Schürmann2014-06-0357-1790/+2727
|\ \
| * \ 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
|\ \ \ | | |/ | |/|
| * | Merge pull request #632 from timbray/masterDominik Schürmann2014-05-257-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
|/ /
| * spongycastle: expose pskr constructorVincent Breitmoser2014-06-021-0/+0
| * wrapped-key-ring: add documentationVincent Breitmoser2014-06-028-8/+85
| * make everything work againVincent Breitmoser2014-06-023-8/+22