aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'development' of https://github.com/beriain/Conversations into ↵iNPUTmice2014-06-201-240/+249
|\ | | | | | | | | | | | | beriain-development Conflicts: res/values-eu/strings.xml
| * Update strings.xmlAitor Beriain2014-06-181-3/+6
| |
| * Update strings.xmlAitor Beriain2014-06-091-3/+30
| |
* | fixes for otr file transferiNPUTmice2014-06-204-23/+49
| |
* | not working version of otr file transferiNPUTmice2014-06-2015-52/+548
| |
* | clear input field after conference pgp messageiNPUTmice2014-06-161-0/+1
| |
* | streamlined onpresenceselected listeneriNPUTmice2014-06-165-124/+106
| |
* | fixed bug in intent filter. cleaned share with activityiNPUTmice2014-06-162-15/+44
| |
* | added share image intent to android manifest for testing purposesiNPUTmice2014-06-162-43/+66
| |
* | code cleanup / unificationiNPUTmice2014-06-162-40/+22
| |
* | cleanup; removed unnecessary imports and log outputsiNPUTmice2014-06-1613-41/+5
| |
* | Merge pull request #211 from kruks23/developmentDaniel Gultsch2014-06-153-15/+30
|\ \ | | | | | | Rounded minutes ago and last seen moe exactly
| * | Rounded minutes ago and last seen + Update Spanish Translationskruks232014-06-153-15/+30
|/ /
* | Merge pull request #209 from mrdomino/developmentDaniel Gultsch2014-06-151-2/+1
|\ \ | | | | | | Send from our full jid (fixes #60)
| * | Send from our full jid (fixes #60)Steven Dee2014-06-151-2/+1
|/ / | | | | | | | | | | | | The problem wasn't with sending to bare jids, but rather sending *from* bare jids, which we did unless we were OTR encrypted for some reason. Google Talk supports the former, but (probably correctly) rejects the latter.
* | infite scrollingiNPUTmice2014-06-143-15/+69
| |
* | fixed #197iNPUTmice2014-06-141-2/+3
| |
* | fixed #204iNPUTmice2014-06-141-4/+8
| |
* | offline sending of imagesiNPUTmice2014-06-132-7/+16
| |
* | status waiting for images sent offlineiNPUTmice2014-06-132-24/+41
| |
* | moved last seen to contact detailsiNPUTmice2014-06-136-51/+14
| |
* | further bullet proofingiNPUTmice2014-06-131-32/+33
| |
* | fixed #201iNPUTmice2014-06-131-1/+0
| |
* | finished offline otriNPUTmice2014-06-125-23/+47
| |
* | fire onContactStatusChanged only on online/offline changes. not on status ↵iNPUTmice2014-06-123-13/+4
| | | | | | | | changes
* | send otr messages when contacts comes onlineiNPUTmice2014-06-123-4/+7
| |
* | made muc join easier if muc server is known. added room to key wordsiNPUTmice2014-06-123-2/+17
| |
* | groundwork for offline otr messagesiNPUTmice2014-06-118-122/+111
| |
* | select presence dialog now suggests last used presenceiNPUTmice2014-06-101-6/+22
| |
* | fixed scrolling issuesiNPUTmice2014-06-102-19/+36
| |
* | cleanupiNPUTmice2014-06-101-2/+1
| |
* | Merge pull request #193 from strb/muciconsDaniel Gultsch2014-06-101-1/+1
|\ \ | | | | | | Muc Icon tile color fix
| * | Muc Icon tile color fixAndreas Straub2014-06-101-1/+1
|/ /
* | don't display 'enter password' message if OpenKeychain is not installed. ↵iNPUTmice2014-06-097-88/+130
| | | | | | | | made status messages in chat not selectable
* | Merge pull request #188 from DerHamster/worktestDaniel Gultsch2014-06-091-1/+1
|\ \ | | | | | | small fix ( zerfifikat -> zertifikat )
| * | small fix ( zerfifikat -> zertifikat )eric2014-06-091-1/+1
| | |
* | | updated languagesiNPUTmice2014-06-091-5/+30
|/ /
* | Merge pull request #186 from kruks23/developmentDaniel Gultsch2014-06-091-16/+23
|\ \ | | | | | | Update Spanish Translations
| * | Update Spanish Translationskruks232014-06-091-16/+23
|/ /
* | fixing #184iNPUTmice2014-06-071-0/+1
| |
* | removed unnecessary variable in message classiNPUTmice2014-06-073-5/+0
| |
* | localized date. rounded minutes, hours and dates in last seeniNPUTmice2014-06-074-14/+24
| |
* | possible fix to be able to images and encrypted messages at a faster rateiNPUTmice2014-06-077-121/+147
| |
* | do not just simply resend imagesiNPUTmice2014-06-061-20/+24
| |
* | fixed last_seen_nowiNPUTmice2014-06-062-2/+2
| |
* | removed presence from last seeniNPUTmice2014-06-064-14/+14
| |
* | put xep333 parsing into parser classDaniel Gultsch2014-06-064-30/+31
| |
* | refactored presence parsing into dedicated classDaniel Gultsch2014-06-064-138/+178
| |
* | Merge branch 'kruks23-development' into developmentiNPUTmice2014-06-061-2/+3
|\ \
| * | added abbrev_all to date formatiNPUTmice2014-06-061-1/+1
| | |