aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* more error handling in xmppconnectioniNPUTmice2014-11-031-66/+78
* fixed arrayoutofbounds + spellingiNPUTmice2014-11-012-7/+7
* Merge pull request #600 from SamWhited/gradleDaniel Gultsch2014-11-01434-99/+7009
|\
| * Merge branch 'gradle' into developmentSam Whited2014-10-30434-99/+7009
|/|
| * Tweak README some moreSam Whited2014-10-281-2/+3
| * Fix typo in subtree merge directionsSam Whited2014-10-281-1/+1
| * Add subtree merge directions to READMESam Whited2014-10-281-3/+19
| * Subtree merged in openpgp api libSam Whited2014-10-2845-6/+1829
| |\
| | * Work on Yubikey decryptionDominik Schürmann2014-09-081-0/+1
| | * Fix for user ids in APIDominik Schürmann2014-09-071-1/+1
| | * Merge branch 'master' of https://github.com/open-keychain/openpgp-api-libDominik Schürmann2014-09-0718-2/+81
| | |\
| | | * Pull from transifexDominik Schürmann2014-09-0417-0/+61
| | | * Update READMEDominik Schürmann2014-09-021-1/+1
| | | * Update READMEDominik Schürmann2014-09-021-1/+1
| | | * Update READMEDominik Schürmann2014-09-021-2/+20
| | * | Fix nullpointer with new OpenPgpSignatureResult versionDominik Schürmann2014-09-071-0/+1
| | |/
| | * ChangelogDominik Schürmann2014-08-311-1/+2
| | * Add userIds to OpenPgpSignatureResultDominik Schürmann2014-08-311-14/+29
| | * Merge branch 'master' of https://github.com/open-keychain/openpgp-api-libDominik Schürmann2014-08-311-2/+5
| | |\
| | | * Merge pull request #1 from Flowdalic/flowDominik Schürmann2014-08-301-2/+5
| | | |\
| | | | * Add my Real-name to the Copyright statementFlorian Schmaus2014-08-301-2/+5
| | | |/
| | * / Add SIGNATURE_KEY_REVOKED, SIGNATURE_KEY_EXPIRED, rename SIGNATURE_PUB_KEY_UN...Dominik Schürmann2014-08-312-6/+12
| | |/
| | * Use application contextDominik Schürmann2014-08-121-1/+1
| | * More fixes for OpenPgpServiceConnectionDominik Schürmann2014-08-121-3/+6
| | * Refactor OpenPgpServiceConnection with better callbackDominik Schürmann2014-08-121-13/+16
| | * Add EXTRA_ORIGINAL_FILENAMEDominik Schürmann2014-08-111-1/+4
| | * Rename to OpenPgpMetadataDominik Schürmann2014-08-111-10/+10
| | * Support mime type in metadataDominik Schürmann2014-08-111-14/+13
| | * Increase version to 4Dominik Schürmann2014-08-111-5/+30
| | * Add metadata parcelDominik Schürmann2014-08-111-0/+133
| | * Lint fixesDominik Schürmann2014-08-041-1/+1
| | * Update gradle plugin to 0.12.2Dominik Schürmann2014-07-271-1/+1
| | * Add values for NFC supportDominik Schürmann2014-07-221-2/+3
| | * Extend for NFCDominik Schürmann2014-07-171-0/+3
| | * Update android gradle plugin to 0.12.0Dominik Schürmann2014-06-281-1/+1
| | * Add transifex configDominik Schürmann2014-06-221-0/+8
| | * Update buildTools to 19.1Dominik Schürmann2014-06-091-2/+2
| | * Add readmeDominik Schürmann2014-05-071-0/+3
| | * Initial import from main repoDominik Schürmann2014-05-0724-0/+1542
| * Subtree merged in minidnsSam Whited2014-10-2823-0/+2945
| * Remove minidns dirSam Whited2014-10-281-6/+0
| * Subtree merged in MemorizingTrustManagerSam Whited2014-10-2835-0/+1875
| |\
| | * Allow mdns multicast / unicast reply queriesRene Treffer2014-07-301-2/+18
| | * Remove System.out codeRene Treffer2014-07-301-2/+6
| | * Fix style on build.gradleRene Treffer2014-07-301-2/+4
| | * Merge branch 'v0.1'Rene Treffer2014-07-233-2/+24
| | |\
| | | * Add parsing for mdns QU records (RFC6762)Rene Treffer2014-07-231-1/+15
| | | * Better / more verbose toStringRene Treffer2014-07-232-1/+9
| | | * Add TXT recordRene Treffer2014-07-232-1/+74
| | | * Add PTR record parsingRene Treffer2014-07-223-1/+24