aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Expand)AuthorAgeFilesLines
* use different filter for nfc intentsiNPUTmice2014-11-031-1/+1
* basic beam code / untestediNPUTmice2014-11-034-149/+207
* create file explicitly before downloading imageiNPUTmice2014-11-031-0/+2
* Merge branch 'development' of https://github.com/siacs/Conversations into dev...iNPUTmice2014-11-031-2/+1
|\
| * Wrap "last seen" time.Sam Whited2014-11-031-2/+1
* | 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
* Make conversations the root projectSam Whited2014-10-22313-0/+25560