aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* import fixesiNPUTmice2014-11-201-0/+2
|
* Merge branch 'development' of https://github.com/siacs/Conversations into ↵iNPUTmice2014-11-201-3/+0
|\ | | | | | | development
| * Merge pull request #696 from SamWhited/developmentDaniel Gultsch2014-11-191-3/+0
| |\ | | | | | | Remove broken / unused imports
| | * 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 translation
| * 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 translations
| * | Update german translationskriztan2014-11-191-0/+41
| |/
* | Merge pull request #694 from beriain/developmentDaniel Gultsch2014-11-191-0/+56
|\ \ | |/ |/| Update basque translation
| * 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 ↵iNPUTmice2014-11-181-39/+15
| | | | throwing exception. use finally to release wake lock. use status.server_not_found instead of status.offline when necessary
* 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 ↵iNPUTmice2014-11-184-230/+532
|/| | | | | | | qooob-development
| * Update README.mdIlia Rostovtsev2014-11-181-2/+2
| |
| * Updated launcher icon: Bigger circlesIlia Rostovtsev2014-11-181-113/+78
| |
| * Notification icon: Solid versionIlia Rostovtsev2014-11-181-115/+52
| |
| * Notification icon: Dashed-solid versionIlia Rostovtsev2014-11-181-0/+400
| | | | | | Keeping this icon in case it's needed later
* | context menu for conversations. fixed #630iNPUTmice2014-11-183-9/+57
|/
* bump to version 0.9-alpha to differentiate stack traces. no feature freeze ↵iNPUTmice2014-11-171-2/+2
| | | | or anything else
* clear avatar cache with new roster push from serveriNPUTmice2014-11-171-0/+2
|
* avoided some null pointersiNPUTmice2014-11-173-24/+35
|
* context menu for muc participants + refactor trueCounterpart to use Jid classiNPUTmice2014-11-178-39/+106
|
* synchronized around cache clear in avatar serviceiNPUTmice2014-11-172-9/+19
|
* Merge pull request #681 from SamWhited/searchlocalefixDaniel Gultsch2014-11-172-6/+14
|\ | | | | Use `Locale.US' for string comparisons in search
| * Use `Locale.US' for string comparisons in searchSam Whited2014-11-172-6/+14
| |
* | Merge pull request #680 from ferdev1/patch-2Daniel Gultsch2014-11-171-2/+2
|\ \ | |/ |/| Fix string 2
| * Update strings.xmlferdev12014-11-171-2/+2
| |
* | trim search before searchingiNPUTmice2014-11-171-2/+2
| |
* | Merge branch 'development' of https://github.com/siacs/Conversations into ↵iNPUTmice2014-11-171-2/+3
|\| | | | | | | development
| * Merge pull request #679 from SamWhited/lintfixDaniel Gultsch2014-11-171-2/+3
| |\ | | | | | | Fix broken SuppressLint
| | * Fix linter suppressionSam Whited2014-11-171-2/+3
| |/
* | split search keywords by whitespaces and imply AND operatioriNPUTmice2014-11-171-1/+11
| |
* | slightly modified logo / launcher iconiNPUTmice2014-11-1711-416/+37
|/
* Merge branch 'development' of https://github.com/siacs/Conversations into ↵iNPUTmice2014-11-171-1/+1
|\ | | | | | | development
| * Merge pull request #675 from ferdev1/patch-1Daniel Gultsch2014-11-171-1/+1
| |\ | | | | | | Fix string
| | * Fix stringferdev12014-11-161-1/+1
| | |
* | | highlight muc members by touching their name in muc details. fixed #503iNPUTmice2014-11-174-73/+106
|/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 07:56:33 +0000