aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-09-276-1/+17
|\
| * Merge pull request #485 from kruks23/translation5Daniel Gultsch2014-09-271-0/+7
| |\
| | * Update Spanish Translationskruks232014-09-241-0/+7
| * | Merge pull request #487 from weiss/add-german-translationsDaniel Gultsch2014-09-272-0/+9
| |\ \
| | * | Add missing German translationsHolger Weiß2014-09-242-0/+9
| * | | Merge pull request #498 from betheg/locale_folderDaniel Gultsch2014-09-272-0/+0
| |\ \ \
| | * | | fix lint-warning: Wrong locale nameMichael2014-09-262-0/+0
| | |/ /
| * | | Merge pull request #499 from betheg/hardcoded_stringDaniel Gultsch2014-09-271-1/+1
| |\ \ \
| | * | | fix lint-warning: Hardcoded textMichael2014-09-261-1/+1
| | |/ /
* | / / fixed some lint warnings. thanks @bethegiNPUTmice2014-09-275-1/+10
|/ / /
* | | anwser to xmpp: style uris. fixed open conversations from android address bookiNPUTmice2014-09-275-20/+107
* | | revised send button in landscape modeiNPUTmice2014-09-272-2/+3
|/ /
* / added Aizaz AZ as translator to readmeiNPUTmice2014-09-241-0/+1
|/
* version bump to 0.7.20.7.2iNPUTmice2014-09-232-2/+13
* changed method that determins whether or not sm is availableiNPUTmice2014-09-231-5/+1
* refactored options menu handling a bitiNPUTmice2014-09-231-140/+149
* changed app title in cs translationiNPUTmice2014-09-231-1/+1
* dont mark message as send on resendiNPUTmice2014-09-231-1/+6
* fixed rare npeiNPUTmice2014-09-231-20/+21
* fixed very rare npeiNPUTmice2014-09-221-1/+1
* formating fixes for chineseiNPUTmice2014-09-221-2/+2
* Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-09-221-0/+260
|\
| * Merge pull request #479 from AizazAZ/masterDaniel Gultsch2014-09-221-0/+260
| |\
| | * Added Chinese (Simplified) TranslationAZ2014-09-221-0/+260
* | | fixed #452iNPUTmice2014-09-226-4/+30
|/ /
* | don't show time stamp within the last 6 hours of a new dayiNPUTmice2014-09-221-1/+1
* | added 'model' to selectable resources. fixed #461iNPUTmice2014-09-221-1/+15
* | show full date in message list, fixed #328iNPUTmice2014-09-212-4/+20
* | changed message merger a bitiNPUTmice2014-09-211-9/+10
* | changed some preference descriptionsiNPUTmice2014-09-212-5/+5
* | fixed #454 - added fast srcolling to some listsiNPUTmice2014-09-212-0/+2
* | changed security indicator and changed opacity of received tick to match the ...iNPUTmice2014-09-207-14/+18
* | Merge pull request #460 from betheg/receiptsDaniel Gultsch2014-09-2016-10/+143
|\ \
| * | indicates received messages with a tick.Michael2014-09-2016-10/+143
* | | fixed presence splittingiNPUTmice2014-09-2013-31/+31
* | | fixed #470iNPUTmice2014-09-204-43/+60
|/ /
* | made xmppconnection service available in generatorsiNPUTmice2014-09-205-4/+27
* | scroll fixesiNPUTmice2014-09-192-10/+11
* | Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-09-192-18/+18
|\ \
| * \ Merge pull request #469 from svetlemodry/developmentDaniel Gultsch2014-09-192-18/+18
| |\ \
| | * | Czech strings.xml file updateJaroslav Lichtblau2014-09-191-17/+17
| | * | improvement fixJaroslav Lichtblau2014-09-191-1/+1
* | | | background daemon doesn't start automatically if there are no enabled account...iNPUTmice2014-09-192-2/+13
|/ / /
* | | fixed #462iNPUTmice2014-09-191-5/+5
* | | fixed compile errors in italian translationiNPUTmice2014-09-192-14/+14
|/ /
* | Merge pull request #448 from betheg/add_breakDaniel Gultsch2014-09-194-7/+1
|\ \
| * | add a forgotten break and remove some unused importsMichael2014-09-134-7/+1
* | | Merge pull request #447 from betheg/private_notifyDaniel Gultsch2014-09-191-4/+6
|\ \ \
| * | | MUC: notify also on private messagesMichael2014-09-131-4/+6
| |/ /
* | | Merge pull request #453 from Elinvention/developmentDaniel Gultsch2014-09-192-0/+299
|\ \ \