aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | fixed #292iNPUTmice2014-07-211-0/+10
* | | fixed #267iNPUTmice2014-07-213-1/+15
* | | switched to direct invites. fixes #284iNPUTmice2014-07-214-16/+27
* | | fixed bug where presence requests where sent on display of contact detailsiNPUTmice2014-07-211-2/+5
* | | fixed #290iNPUTmice2014-07-211-1/+1
* | | disable subscription checkboxes when account is offlineiNPUTmice2014-07-201-0/+24
* | | hide verify snackbar when otr session is ended. fixed npeiNPUTmice2014-07-202-0/+4
* | | fixed typos reported by @jelmer fixed #288iNPUTmice2014-07-201-2/+2
* | | Merge pull request #289 from jelmer/dutchDaniel Gultsch2014-07-203-0/+294
|\ \ \
| * | | Add Dutch translations.Jelmer Vernooij2014-07-203-0/+294
* | | | simplified presence subscription in contact detailsiNPUTmice2014-07-202-106/+83
* | | | fixed #254iNPUTmice2014-07-202-6/+18
* | | | ignore groupchats messages that are pending leaveiNPUTmice2014-07-203-25/+30
* | | | Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-07-182-5/+5
|\ \ \ \
| * \ \ \ Merge pull request #285 from kruks23/developmentDaniel Gultsch2014-07-182-5/+5
| |\ \ \ \
| | * | | | Update Spanish Translationskruks232014-07-182-5/+5
| |/ / / /
* | | | | pending leaves and joins for muciNPUTmice2014-07-185-56/+71
* | | | | only show muc errors if actually connectediNPUTmice2014-07-181-25/+34
|/ / / /