aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Show time in messages previous dayskruks232014-07-081-1/+1
* Merge pull request #245 from beriain/developmentDaniel Gultsch2014-07-081-5/+11
|\
| * Update strings.xmlAitor Beriain2014-07-071-5/+11
* | contact tiles follow material colors as welliNPUTmice2014-07-082-6/+13
* | uniformed colors. made colors a little materialiNPUTmice2014-07-0823-108/+107
* | Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-07-072-29/+120
|\|
| * Merge pull request #256 from kruks23/developmentDaniel Gultsch2014-07-071-0/+2
| |\
| | * Update Spanish Translationskruks232014-07-071-0/+2
| * | Merge pull request #257 from BenoitBouvarel/developmentDaniel Gultsch2014-07-071-29/+118
| |\ \ | | |/ | |/|
| | * Update strings.xmlBenoit Bouvarel2014-07-071-31/+25
| | * French translation updatedBenoit Bouvarel2014-07-071-3/+98
* | | changed icons to lightiNPUTmice2014-07-0759-6/+4
|/ /
* / styled action bar greeniNPUTmice2014-07-072-24/+46
|/
* made account jid lowercaseiNPUTmice2014-07-041-1/+2
* made contact jids lower caseiNPUTmice2014-07-042-2/+4
* small ui overhauls. unified text sizes. made text a bit smaller. moved messag...iNPUTmice2014-07-0412-33/+48
* fixed #247iNPUTmice2014-07-041-3/+3
* added timeout to jingle socketiNPUTmice2014-07-032-3/+16
* more xmlpullparser fixesiNPUTmice2014-07-031-0/+2
* 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.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.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