aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* made qr code available from muc and contact details as welliNPUTmice2014-11-047-105/+175
|
* added missing return statement. fixed api bugiNPUTmice2014-11-041-3/+2
|
* Merge pull request #620 from emdete/p0Daniel Gultsch2014-11-041-58/+59
|\ | | | | P0
| * be more OOM. Dietrich2014-11-041-51/+44
| |
| * support pre JELLY_BEAN ndefM. Dietrich2014-11-041-16/+24
|/
* fixed nfc. react to ?join uris. some refactoring. code cleanup. thanks to ↵iNPUTmice2014-11-034-187/+291
|\ | | | | | | @emdete
| * fixed merge errornfciNPUTmice2014-11-031-1/+0
| |
| * Merge branch 'nfc' of https://github.com/siacs/Conversations into nfciNPUTmice2014-11-031-0/+1
| |\ | | | | | | | | | | | | Conflicts: src/main/AndroidManifest.xml
| | * basic beam code / untestediNPUTmice2014-11-034-149/+207
| | |
| * | use different filter for nfc intentsiNPUTmice2014-11-031-1/+1
| | |
| * | basic beam code / untestediNPUTmice2014-11-034-149/+207
| | |
* | | unfinishd qr code implemenation. thanks to @emdeteiNPUTmice2014-11-036-18/+132
|/ /
* | create file explicitly before downloading imageiNPUTmice2014-11-031-0/+2
| |
* | Merge pull request #614 from SamWhited/spacefixesDaniel Gultsch2014-11-031-7/+7
|\ \ | | | | | | Fix some space/tab issues in README
| * | Removed the last \t from the README...Sam Whited2014-11-031-1/+1
| | |
| * | Another tab fix.Sam Whited2014-11-031-1/+1
| | |
| * | Fix some space/tab issues in READMESam Whited2014-11-031-5/+5
| | |
* | | Merge branch 'development' of https://github.com/siacs/Conversations into ↵iNPUTmice2014-11-032-3/+2
|\ \ \ | |_|/ |/| | | | | development
| * | Merge pull request #615 from SamWhited/issue611Daniel Gultsch2014-11-031-2/+1
| |\ \ | | |/ | |/| Wrap "last seen" time
| | * Wrap "last seen" time.Sam Whited2014-11-031-2/+1
| |/ | | | | | | Fixes #611
| * Merge pull request #605 from emdete/render_gradle_pathDaniel Gultsch2014-11-031-1/+1
| |\ | | | | | | adjust path in render script
| | * adjust path in render scriptM. Dietrich2014-11-011-1/+1
| | |
* | | more error handling for http connectioniNPUTmice2014-11-031-9/+12
| | |
* | | disabled proguard. fixed gradle libsiNPUTmice2014-11-032-11/+6
|/ /
* | version bump to 0.8.1iNPUTmice2014-11-032-7/+8
| |
* | always use exif helperiNPUTmice2014-11-031-23/+6
| |
* | 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
|\ | | | | Build system and library changes (Gradle / Subtree merging)
| * Merge branch 'gradle' into developmentSam Whited2014-10-30434-99/+7009
|/| | | | | | | | | | | | | | | | | | | Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib
| * 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 statement
| | | | * Add my Real-name to the Copyright statementFlorian Schmaus2014-08-301-2/+5
| | | |/ | | | | | | | | | | | | of ParcelFileDescriptorUtil.
| | * / Add SIGNATURE_KEY_REVOKED, SIGNATURE_KEY_EXPIRED, rename ↵Dominik Schürmann2014-08-312-6/+12
| | |/ | | | | | | | | | SIGNATURE_PUB_KEY_UNKNOWN
| | * Use application contextDominik Schürmann2014-08-121-1/+1
| | |
| | * More fixes for OpenPgpServiceConnectionDominik Schürmann2014-08-121-3/+6
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 03:17:04 +0000