aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* made warnings in chats i tiny bit smalleriNPUTmice2014-06-272-13/+18
* faulty otr messages now generate an erroriNPUTmice2014-06-263-5/+25
* fixed rare bug with attach image menuiNPUTmice2014-06-261-0/+6
* moved some try catchs aroundiNPUTmice2014-06-251-5/+5
* more npe fixesiNPUTmice2014-06-252-3/+8
* fixed two rare npeiNPUTmice2014-06-252-44/+49
* more kxml fuck ups fixediNPUTmice2014-06-251-0/+2
* fixed odd occurrences of a cursor returned by the system being NULL. wtf ukasiNPUTmice2014-06-251-0/+3
* wraped stanza writer in try catchiNPUTmice2014-06-251-5/+11
* removed unecessary loggingiNPUTmice2014-06-251-5/+0
* wrap wakelock release with try catchiNPUTmice2014-06-253-7/+7
* some fixes for otr with multiple partiesiNPUTmice2014-06-252-1/+10
* changed diesys' linkiNPUTmice2014-06-241-1/+1
* Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-06-241-2/+2
|\
| * Merge pull request #226 from kruks23/developmentDaniel Gultsch2014-06-241-2/+2
| |\
| | * Update spanish mins agokruks232014-06-241-2/+2
* | | more otr fixesiNPUTmice2014-06-242-14/+24
|/ /
* | added Diego Turtulici to list of contributorsiNPUTmice2014-06-241-0/+3
* | fixes for offline otriNPUTmice2014-06-242-1/+17
|/
* added rendering script for artworkiNPUTmice2014-06-2411-0/+12
* changed opacityiNPUTmice2014-06-245-1240/+119
* added license file. plus renamingiNPUTmice2014-06-244-0/+1587
* Merge pull request #225 from diesys/developmentDaniel Gultsch2014-06-243-0/+1162
|\
| * Create conversation_mono.svgdiesys2014-06-231-0/+400
| * conversation_baloon.svgdiesys2014-06-231-0/+381
| * conversation.svgdiesys2014-06-231-0/+381
* | fixed regression with chat markers not workingiNPUTmice2014-06-233-8/+2
|/
* new logoiNPUTmice2014-06-2312-7/+13
* fix for not being able to send otr encrypted images to offline contacts. unco...iNPUTmice2014-06-231-18/+18
* possible better distribution of contact picture colorsiNPUTmice2014-06-231-2/+2
* enabled otr encryption for ibb filetransfer as welliNPUTmice2014-06-232-16/+20
* removed warningsiNPUTmice2014-06-225-11/+7
* changelog and version bump to 0.4-betaiNPUTmice2014-06-222-2/+11
* fixed #220iNPUTmice2014-06-225-14/+63
* moved message packet creation into sperate classiNPUTmice2014-06-223-69/+84
* establish otr connection before sending imageiNPUTmice2014-06-221-13/+34
* removed duplicate entriesiNPUTmice2014-06-211-4/+0
* Merge branch 'beriain-development' into developmentiNPUTmice2014-06-201-240/+249
|\
| * Merge branch 'development' of https://github.com/beriain/Conversations into b...iNPUTmice2014-06-201-240/+249
|/|
| * 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
|\ \