aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Collapse)AuthorAgeFilesLines
* unfinishd qr code implemenation. thanks to @emdeteiNPUTmice2014-11-035-18/+130
|
* create file explicitly before downloading imageiNPUTmice2014-11-031-0/+2
|
* Merge branch 'development' of https://github.com/siacs/Conversations into ↵iNPUTmice2014-11-031-2/+1
|\ | | | | | | development
| * Wrap "last seen" time.Sam Whited2014-11-031-2/+1
| | | | | | | | Fixes #611
* | more error handling for http connectioniNPUTmice2014-11-031-9/+12
|/
* version bump to 0.8.1iNPUTmice2014-11-031-5/+6
|
* 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 branch 'gradle' into developmentSam Whited2014-10-3041-376/+846
| | | | | | | | | | Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib
* Make conversations the root projectSam Whited2014-10-22313-0/+25560