aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into developmentiNPUTmice2014-07-312-2/+5
|\
| * version bump to 0.5.20.5.2iNPUTmice2014-07-312-3/+6
| * fixed npe in start conversation activityiNPUTmice2014-07-311-1/+3
| * fixed generation of muc pictures with copyonwrite user listiNPUTmice2014-07-311-6/+10
| * fixed rare npe in loading of selfiiNPUTmice2014-07-311-1/+1
| * fixed npe for the rare case that user has disabled his action bariNPUTmice2014-07-311-7/+14
* | added 'how to logcat' to readmeiNPUTmice2014-07-301-0/+12
* | fixed npe for the rare case that user has disabled his action bariNPUTmice2014-07-301-7/+14
* | fixed npe in start conversation activityiNPUTmice2014-07-301-1/+3
* | fixed generation of muc pictures with copyonwrite user listiNPUTmice2014-07-301-6/+10
* | fixed rare npe in loading of selfiiNPUTmice2014-07-301-1/+1
* | fixed #239 - show contact names and pictures in muc if real jid is knowniNPUTmice2014-07-296-133/+230
* | started development for 0.6iNPUTmice2014-07-281-2/+2
|/
* added changelog0.5.1iNPUTmice2014-07-281-0/+4
* bumped to version 0.5.1iNPUTmice2014-07-281-2/+2
* added more features to readmeiNPUTmice2014-07-281-0/+2
* line break for readmeiNPUTmice2014-07-271-0/+1
* fixed bug in message parseriNPUTmice2014-07-271-4/+8
* updated readme a bitiNPUTmice2014-07-271-6/+5
* trying to work around npe in androids xml parseriNPUTmice2014-07-271-3/+1
* fixe race conditons with newIntentiNPUTmice2014-07-271-19/+17
* migrated some ArrayLists to CopyOnWriteArrayListsiNPUTmice2014-07-276-22/+14
* fixed npe with unsuccesfull bindiNPUTmice2014-07-261-18/+25
* fixed npe when user was very quick with starting to type in startConversation...iNPUTmice2014-07-261-2/+4
* added swedish translation by @andersrunesoniNPUTmice2014-07-263-0/+294
* Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-07-261-2/+32
|\
| * Merge pull request #315 from jelmer/dutchDaniel Gultsch2014-07-261-2/+32
| |\
| | * Update Dutch translations.Jelmer Vernooij2014-07-261-2/+32
| |/
* | Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-07-252-60/+90
|\|
| * Merge pull request #313 from suraia/translation-deDaniel Gultsch2014-07-252-60/+90
| |\
| | * Update German translation.Michael Kuhn2014-07-242-60/+90
| |/
* / version bump to 0.50.5iNPUTmice2014-07-241-2/+2
|/
* Merge pull request #312 from beriain/developmentDaniel Gultsch2014-07-241-2/+2
|\
| * Some correctionsAitor Beriain2014-07-241-2/+2
|/
* updated screenshotsiNPUTmice2014-07-241-0/+0
* removed duplicates from muc suggestionsiNPUTmice2014-07-242-6/+7
* included version string in crash reportsiNPUTmice2014-07-241-6/+17
* french translations by @BenoitBouvarel fixed #311iNPUTmice2014-07-241-7/+20
* fixed spanish string. wild guessed + google translate fix for basqueiNPUTmice2014-07-242-2/+2
* added some translations back that have been removed be accidentiNPUTmice2014-07-247-7/+21
* Merge branch 'rostovtsev-development' into developmentiNPUTmice2014-07-241-0/+12
|\
| * Merge branch 'development' of https://github.com/rostovtsev/Conversations int...iNPUTmice2014-07-241-0/+12
|/|
| * Update strings.xmlIlia2014-07-241-2/+2
| * Added translationsIlia2014-07-241-0/+14
* | added jelmer to the list of translatorsiNPUTmice2014-07-241-0/+1
* | removed more legacy tls error handling stuffiNPUTmice2014-07-243-9/+0
* | removed outdated tls erroriNPUTmice2014-07-243-11/+2
* | removed outdated translations from languge filesiNPUTmice2014-07-248-108/+2
* | presonalized read up to this point messageiNPUTmice2014-07-242-11/+8
* | answer correctly if both markers and receipts are requestediNPUTmice2014-07-242-13/+17