aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|/ / /
* | | added russian translator to readmeiNPUTmice2014-07-181-0/+1
* | | notify ui on roster changesiNPUTmice2014-07-185-0/+55
* | | show snackbar if conference was not foundiNPUTmice2014-07-184-5/+19
* | | brought muc invites back. + couple of bug fixes + refactoringiNPUTmice2014-07-1721-145/+318
* | | improvements on the dublicate muc messages issueiNPUTmice2014-07-161-4/+11
* | | Merge pull request #280 from kruks23/developmentDaniel Gultsch2014-07-161-1/+6
|\ \ \
| * | | Update Spanish Translationskruks232014-07-161-1/+6
|/ / /
* | | spellingiNPUTmice2014-07-161-2/+2
* | | made grace period work for muc as welliNPUTmice2014-07-161-0/+2
* | | fixed rare npeiNPUTmice2014-07-161-0/+3
* | | redesigned muc details a little bitiNPUTmice2014-07-1617-333/+362
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 05:51:12 +0000