aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* 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
* | fixed bug with otr session being initilized over and over againiNPUTmice2014-07-232-11/+11
* | Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-07-231-13/+13
|\ \
| * \ Merge pull request #307 from Erkan-Yilmaz/developmentDaniel Gultsch2014-07-231-13/+13
| |\ \
| | * | typosErkan Yilmaz2014-07-231-13/+13
| |/ /
* / / more disco. fixed chat markers with jappixiNPUTmice2014-07-236-18/+99
|/ /
* | updated mtmiNPUTmice2014-07-221-0/+0
* | Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-07-221-0/+3
|\ \
| * \ Merge pull request #303 from kruks23/developmentDaniel Gultsch2014-07-221-0/+3
| |\ \
| | * | Update Spanish Translationskruks232014-07-221-0/+3
* | | | some cleanupiNPUTmice2014-07-222-43/+0
|/ / /
* / / switched to mtmiNPUTmice2014-07-227-142/+32
|/ /
* | brought settings and manage account menu items backiNPUTmice2014-07-222-8/+4
* | fixed #301iNPUTmice2014-07-221-1/+2
* | refactored message adapter into seperate classDaniel Gultsch2014-07-223-445/+498
* | Merge branch 'development' of github.com:siacs/Conversations into developmentDaniel Gultsch2014-07-221-14/+39
|\ \
| * \ Merge pull request #299 from beriain/developmentDaniel Gultsch2014-07-221-14/+39
| |\ \
| | * | Update strings.xmlAitor Beriain2014-07-221-14/+39
* | | | Merge branch 'master' into developmentDaniel Gultsch2014-07-222-3/+8
|\ \ \ \ | |/ / / |/| | |
| * | | version bump to 0.5-beta and changelog0.5-betaiNPUTmice2014-07-212-3/+8
* | | | save login nick for mucs during joiniNPUTmice2014-07-211-0/+5
|/ / /
* | | back to normal invites. fixed #298iNPUTmice2014-07-211-1/+14
* | | added hint to explain the contact has read up to this pointiNPUTmice2014-07-212-0/+8