aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | 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
* | | | Merge pull request #278 from rostovtsev/developmentDaniel Gultsch2014-07-153-4/+297
|\ \ \ \ | | |_|/ | |/| |
| * | | Russian LocalizationIlia2014-07-161-0/+22
| * | | Double-checked Russian localizationIlia2014-07-161-196/+196
| * | | Fixed typo Ouf -> OutIlia2014-07-151-1/+1
| * | | Fixed typo mange -> manageIlia2014-07-151-1/+1
| * | | Fixed typo Decrpytion -> DecryptionIlia2014-07-151-2/+2
| * | | Update strings.xmlIlia2014-07-151-86/+85
| * | | Russian Translation for ConversationsIlia2014-07-151-0/+272
| * | | Delete values-ruIlia2014-07-151-272/+0
| * | | strings.xmlIlia2014-07-151-0/+272
* | | | couple of bug fixes related to muc renamingiNPUTmice2014-07-155-15/+20
* | | | fixed #276iNPUTmice2014-07-151-0/+9
* | | | unregister bookmark on conversation when bookmark is deletediNPUTmice2014-07-152-0/+7
* | | | added confirm dialog before contact and bookmark removaliNPUTmice2014-07-153-12/+50
* | | | bug fix on deleting conference bookmarksiNPUTmice2014-07-151-1/+1
* | | | Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-07-151-4/+22
|\| | |
| * | | Merge pull request #275 from BenoitBouvarel/developmentDaniel Gultsch2014-07-151-4/+22
| |\ \ \
| | * | | Update strings.xmlBenoit Bouvarel2014-07-151-4/+22
* | | | | use nick from bookmark if availableiNPUTmice2014-07-156-65/+78
|/ / / /
* | | | pushing bookmarks back to serveriNPUTmice2014-07-156-12/+87
* | | | use proper picture on bookmarked conferences when joined. use bookmark title ...iNPUTmice2014-07-147-23/+59
* | | | Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-07-141-1/+5
|\ \ \ \
| * \ \ \ Merge pull request #273 from kruks23/developmentDaniel Gultsch2014-07-131-1/+5
| |\ \ \ \
| | * | | | Update Spanish Translationskruks232014-07-131-1/+5
| |/ / / /
* | | | | fetch bookmarks from serveriNPUTmice2014-07-148-17/+254
* | | | | fixed spelling in README and added mission statement to docsiNPUTmice2014-07-142-1/+26
|/ / / /
* | | | more faqiNPUTmice2014-07-121-0/+17
* | | | spelling in readmeiNPUTmice2014-07-121-2/+2
* | | | added two more qna to the faqiNPUTmice2014-07-121-0/+24
* | | | added statement about status and priority to faqiNPUTmice2014-07-121-6/+23
* | | | fixed #268iNPUTmice2014-07-121-0/+0
* | | | refactored ui listeners a little bitiNPUTmice2014-07-129-294/+398
* | | | made conversation list thread safeiNPUTmice2014-07-124-8/+15
* | | | moved iq parser to seperate class as welliNPUTmice2014-07-123-97/+108