aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Show time in messages previous dayskruks232014-07-101-2/+2
* Merge branch 'development' of https://github.com/siacs/Conversations into dev...kruks232014-07-1043-83/+600
|\
| * added create contact dialogiNPUTmice2014-07-103-4/+106
| * added contextual menu for contactsiNPUTmice2014-07-106-15/+85
| * small changesiNPUTmice2014-07-103-28/+13
| * made searchview text color whiteiNPUTmice2014-07-101-0/+4
| * theming for tabs in start conversationiNPUTmice2014-07-1026-12/+34
| * filter contacts and starting confercenesiNPUTmice2014-07-105-30/+185
| * added group add buttoniNPUTmice2014-07-103-20/+30
| * added action bar menu to start conversationiNPUTmice2014-07-103-0/+50
| * changed support lib to v13. added tabs and fragments to start conversation ac...iNPUTmice2014-07-107-2/+97
| * inital activityiNPUTmice2014-07-101-0/+11
| * moved hint box to the bottomiNPUTmice2014-07-102-50/+63
* | Merge branch 'development' of https://github.com/siacs/Conversations into dev...kruks232014-07-0912-156/+59
|\|
| * Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-07-091-5/+11
| |\
| * | unified warnings/error msgsiNPUTmice2014-07-0912-156/+59
* | | 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.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