aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* add an listener for the muc roster update.Michael2014-11-234-1/+63
* MUC: do not add yourself to the muc user list.Michael2014-11-231-0/+2
* Merge pull request #709 from kruks23/translationDaniel Gultsch2014-11-221-2/+8
|\
| * Update spanish translationskruks232014-11-221-2/+8
|/
* work around to not confuse irc transport with real conference serversiNPUTmice2014-11-211-2/+7
* Merge pull request #706 from betheg/unused_importsDaniel Gultsch2014-11-2112-38/+0
|\
| * remove unused imports.Michael2014-11-2112-38/+0
* | update action bar with conversations updates as welliNPUTmice2014-11-212-52/+45
* | Merge pull request #707 from betheg/joinmucDaniel Gultsch2014-11-211-0/+1
|\ \
| * | MUC: set from when join muc.Michael2014-11-211-0/+1
|/ /
* / move task to back and not finish when hitting back buttoniNPUTmice2014-11-211-7/+5
|/
* Merge pull request #705 from betheg/mucDaniel Gultsch2014-11-211-10/+16
|\
| * STATUS_CODE_SELF_PRESENCE is not set in all case.Michael2014-11-211-10/+16
|/
* additional null pointer saftey checksiNPUTmice2014-11-211-15/+13
* verify contacts key only on initiating side of smpiNPUTmice2014-11-214-7/+20
* changed listener timing and cache clearing after muc presencesiNPUTmice2014-11-201-6/+9
* create file and dirs before creating fileiNPUTmice2014-11-201-0/+2
* Merge pull request #698 from kriztan/patch-1Daniel Gultsch2014-11-201-16/+20
|\
| * Update german translationskriztan2014-11-201-16/+20
* | Merge pull request #699 from betheg/status_codeDaniel Gultsch2014-11-201-3/+5
|\ \ | |/ |/|
| * change status codes string 'number' to a better readable constant.Michael2014-11-201-3/+5
|/
* fixed potential NPEsiNPUTmice2014-11-201-39/+43
* import fixesiNPUTmice2014-11-201-0/+2
* Merge branch 'development' of https://github.com/siacs/Conversations into dev...iNPUTmice2014-11-201-3/+0
|\
| * Merge pull request #696 from SamWhited/developmentDaniel Gultsch2014-11-191-3/+0
| |\
| | * Remove broken / unused importsSam Whited2014-11-191-3/+0
| |/
* / brought ad hoc conferences back. fixed #688 fixed #367iNPUTmice2014-11-2013-137/+480
|/
* sent read marker to full jidiNPUTmice2014-11-192-9/+10
* some saftey checks before registering listeners in XmppActivityiNPUTmice2014-11-191-1/+12
* Merge pull request #691 from kruks23/developmentDaniel Gultsch2014-11-191-5/+11
|\
| * Update spanish translationskruks232014-11-191-4/+4
| * Update spanish translationskruks232014-11-181-2/+8
* | Merge pull request #692 from kriztan/patch-3Daniel Gultsch2014-11-191-0/+41
|\ \
| * | Update german translationskriztan2014-11-191-0/+41
| |/
* | Merge pull request #694 from beriain/developmentDaniel Gultsch2014-11-191-0/+56
|\ \ | |/ |/|
| * Update basque translationAitor Beriain2014-11-191-0/+56
|/
* added faq for srv recordsiNPUTmice2014-11-181-0/+6
* put error notification into notification serviceiNPUTmice2014-11-187-46/+42
* simplified message merge conditioniNPUTmice2014-11-181-43/+13
* synchronized message list in conversation fragmentiNPUTmice2014-11-181-113/+118
* show dynamic tags in contacts activity as welliNPUTmice2014-11-182-45/+33
* properly remove conversations context menuiNPUTmice2014-11-184-52/+27
* disabled broken conversations context menuiNPUTmice2014-11-181-3/+3
* better usage of synchronized in some placesiNPUTmice2014-11-183-82/+80
* better exception handling in XmppConnection.connect. (never return without th...iNPUTmice2014-11-181-39/+15
* added rendered versions of new iconsiNPUTmice2014-11-188-0/+0
* Merge branch 'qooob-development' into developmentiNPUTmice2014-11-184-230/+532
|\
| * Merge branch 'development' of https://github.com/qooob/Conversations into qoo...iNPUTmice2014-11-184-230/+532
|/|
| * Update README.mdIlia Rostovtsev2014-11-181-2/+2
| * Updated launcher icon: Bigger circlesIlia Rostovtsev2014-11-181-113/+78
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 00:21:47 +0000