Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge branch 'development' of github.com:siacs/Conversations into development | iNPUTmice | 2014-07-18 | 2 | -5/+5 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge pull request #285 from kruks23/development | Daniel Gultsch | 2014-07-18 | 2 | -5/+5 | |
| |\ \ \ \ | ||||||
| | * | | | | Update Spanish Translations | kruks23 | 2014-07-18 | 2 | -5/+5 | |
| |/ / / / | ||||||
* | | | | | pending leaves and joins for muc | iNPUTmice | 2014-07-18 | 5 | -56/+71 | |
* | | | | | only show muc errors if actually connected | iNPUTmice | 2014-07-18 | 1 | -25/+34 | |
|/ / / / | ||||||
* | | | | added russian translator to readme | iNPUTmice | 2014-07-18 | 1 | -0/+1 | |
* | | | | notify ui on roster changes | iNPUTmice | 2014-07-18 | 5 | -0/+55 | |
* | | | | show snackbar if conference was not found | iNPUTmice | 2014-07-18 | 4 | -5/+19 | |
* | | | | brought muc invites back. + couple of bug fixes + refactoring | iNPUTmice | 2014-07-17 | 21 | -145/+318 | |
* | | | | improvements on the dublicate muc messages issue | iNPUTmice | 2014-07-16 | 1 | -4/+11 | |
* | | | | Merge pull request #280 from kruks23/development | Daniel Gultsch | 2014-07-16 | 1 | -1/+6 | |
|\ \ \ \ | ||||||
| * | | | | Update Spanish Translations | kruks23 | 2014-07-16 | 1 | -1/+6 | |
|/ / / / | ||||||
* | | | | spelling | iNPUTmice | 2014-07-16 | 1 | -2/+2 | |
* | | | | made grace period work for muc as well | iNPUTmice | 2014-07-16 | 1 | -0/+2 | |
* | | | | fixed rare npe | iNPUTmice | 2014-07-16 | 1 | -0/+3 | |
* | | | | redesigned muc details a little bit | iNPUTmice | 2014-07-16 | 17 | -333/+362 | |
* | | | | Merge pull request #278 from rostovtsev/development | Daniel Gultsch | 2014-07-15 | 3 | -4/+297 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | Russian Localization | Ilia | 2014-07-16 | 1 | -0/+22 | |
| * | | | Double-checked Russian localization | Ilia | 2014-07-16 | 1 | -196/+196 | |
| * | | | Fixed typo Ouf -> Out | Ilia | 2014-07-15 | 1 | -1/+1 | |
| * | | | Fixed typo mange -> manage | Ilia | 2014-07-15 | 1 | -1/+1 | |
| * | | | Fixed typo Decrpytion -> Decryption | Ilia | 2014-07-15 | 1 | -2/+2 | |
| * | | | Update strings.xml | Ilia | 2014-07-15 | 1 | -86/+85 | |
| * | | | Russian Translation for Conversations | Ilia | 2014-07-15 | 1 | -0/+272 | |
| * | | | Delete values-ru | Ilia | 2014-07-15 | 1 | -272/+0 | |
| * | | | strings.xml | Ilia | 2014-07-15 | 1 | -0/+272 | |
* | | | | couple of bug fixes related to muc renaming | iNPUTmice | 2014-07-15 | 5 | -15/+20 | |
* | | | | fixed #276 | iNPUTmice | 2014-07-15 | 1 | -0/+9 | |
* | | | | unregister bookmark on conversation when bookmark is deleted | iNPUTmice | 2014-07-15 | 2 | -0/+7 | |
* | | | | added confirm dialog before contact and bookmark removal | iNPUTmice | 2014-07-15 | 3 | -12/+50 | |
* | | | | bug fix on deleting conference bookmarks | iNPUTmice | 2014-07-15 | 1 | -1/+1 | |
* | | | | Merge branch 'development' of github.com:siacs/Conversations into development | iNPUTmice | 2014-07-15 | 1 | -4/+22 | |
|\| | | | ||||||
| * | | | Merge pull request #275 from BenoitBouvarel/development | Daniel Gultsch | 2014-07-15 | 1 | -4/+22 | |
| |\ \ \ | ||||||
| | * | | | Update strings.xml | Benoit Bouvarel | 2014-07-15 | 1 | -4/+22 | |
* | | | | | use nick from bookmark if available | iNPUTmice | 2014-07-15 | 6 | -65/+78 | |
|/ / / / | ||||||
* | | | | pushing bookmarks back to server | iNPUTmice | 2014-07-15 | 6 | -12/+87 | |
* | | | | use proper picture on bookmarked conferences when joined. use bookmark title ... | iNPUTmice | 2014-07-14 | 7 | -23/+59 | |
* | | | | Merge branch 'development' of github.com:siacs/Conversations into development | iNPUTmice | 2014-07-14 | 1 | -1/+5 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge pull request #273 from kruks23/development | Daniel Gultsch | 2014-07-13 | 1 | -1/+5 | |
| |\ \ \ \ | ||||||
| | * | | | | Update Spanish Translations | kruks23 | 2014-07-13 | 1 | -1/+5 | |
| |/ / / / | ||||||
* | | | | | fetch bookmarks from server | iNPUTmice | 2014-07-14 | 8 | -17/+254 | |
* | | | | | fixed spelling in README and added mission statement to docs | iNPUTmice | 2014-07-14 | 2 | -1/+26 | |
|/ / / / | ||||||
* | | | | more faq | iNPUTmice | 2014-07-12 | 1 | -0/+17 | |
* | | | | spelling in readme | iNPUTmice | 2014-07-12 | 1 | -2/+2 | |
* | | | | added two more qna to the faq | iNPUTmice | 2014-07-12 | 1 | -0/+24 | |
* | | | | added statement about status and priority to faq | iNPUTmice | 2014-07-12 | 1 | -6/+23 | |
* | | | | fixed #268 | iNPUTmice | 2014-07-12 | 1 | -0/+0 | |
* | | | | refactored ui listeners a little bit | iNPUTmice | 2014-07-12 | 9 | -294/+398 | |
* | | | | made conversation list thread safe | iNPUTmice | 2014-07-12 | 4 | -8/+15 | |
* | | | | moved iq parser to seperate class as well | iNPUTmice | 2014-07-12 | 3 | -97/+108 |