aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-07-032-11/+96
|\
| * Merge pull request #246 from scento/german-translationDaniel Gultsch2014-07-032-11/+96
| |\
| | * Update translationWenzel Pünter2014-07-031-2/+2
| | * Add missing German translationsWenzel Pünter2014-07-031-9/+94
| |/
* | version bump to 0.4.10.4.1iNPUTmice2014-07-031-2/+2
* | Merge branch 'development'iNPUTmice2014-07-034-6/+10
|\|
| * fixed array out of bounds in isMuciNPUTmice2014-07-031-2/+5
| * fixed some tiny ui glitchesiNPUTmice2014-07-022-4/+4
| * enabled anti alising for tilesiNPUTmice2014-07-021-0/+1
* | allow state loss on fragment changeiNPUTmice2014-07-011-1/+1
* | fixed npe on rare occasion of show element in presence being nulliNPUTmice2014-07-011-1/+1
|/
* fixed #216iNPUTmice2014-07-011-3/+7
* fixed image sharing with contacts that have multiple presencesiNPUTmice2014-07-011-16/+25
* version bump to v0.40.4iNPUTmice2014-06-301-2/+2
* removed old notification iconiNPUTmice2014-06-304-1/+1
* fixed rare npe in verify otr fingerprint dialogiNPUTmice2014-06-301-4/+6
* possible fix for #232iNPUTmice2014-06-301-6/+35
* couple of modifications for disco discoveryiNPUTmice2014-06-301-3/+12
* fixed #235iNPUTmice2014-06-302-129/+164
* fixed #228iNPUTmice2014-06-302-1/+12
* added error message for #240iNPUTmice2014-06-302-3/+20
* Merge pull request #237 from kruks23/developmentDaniel Gultsch2014-06-301-2/+6
|\
| * Update Spanish Translationskruks232014-06-291-2/+6
* | more error handling for jingle connectionsiNPUTmice2014-06-2910-57/+90
|/
* raised ping time outiNPUTmice2014-06-271-3/+3
* 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