aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* MUC: option to set/delete bookmark in conference details.Michael2014-11-231-0/+39
|
* 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.
| * remove unused imports.Michael2014-11-2112-38/+0
| |
* | update action bar with conversations updates as welliNPUTmice2014-11-212-52/+45
| |
* | 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
|/
* 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-213-7/+18
|
* changed listener timing and cache clearing after muc presencesiNPUTmice2014-11-201-6/+9
|
* create file and dirs before creating fileiNPUTmice2014-11-201-0/+2
|
* 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 ↵iNPUTmice2014-11-201-3/+0
|\ | | | | | | development
| * Remove broken / unused importsSam Whited2014-11-191-3/+0
| |
* | brought ad hoc conferences back. fixed #688 fixed #367iNPUTmice2014-11-2012-137/+476
|/
* sent read marker to full jidiNPUTmice2014-11-192-9/+10
|
* some saftey checks before registering listeners in XmppActivityiNPUTmice2014-11-191-1/+12
|
* put error notification into notification serviceiNPUTmice2014-11-183-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-181-33/+26
|
* properly remove conversations context menuiNPUTmice2014-11-182-41/+20
|
* 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
* context menu for conversations. fixed #630iNPUTmice2014-11-181-9/+45
|
* 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-177-38/+102
|
* synchronized around cache clear in avatar serviceiNPUTmice2014-11-171-9/+15
|
* Use `Locale.US' for string comparisons in searchSam Whited2014-11-172-6/+14
|
* trim search before searchingiNPUTmice2014-11-171-2/+2
|
* Merge branch 'development' of https://github.com/siacs/Conversations into ↵iNPUTmice2014-11-171-2/+3
|\ | | | | | | development
| * Fix linter suppressionSam Whited2014-11-171-2/+3
| |
* | split search keywords by whitespaces and imply AND operatioriNPUTmice2014-11-171-1/+11
|/
* highlight muc members by touching their name in muc details. fixed #503iNPUTmice2014-11-173-72/+105
|
* made tags searchableiNPUTmice2014-11-162-157/+180
|
* fixed regression of xmpp uris not workingiNPUTmice2014-11-162-14/+11
|
* Merge pull request #673 from SamWhited/developmentDaniel Gultsch2014-11-161-1/+1
|\ | | | | Fix fetching accounts by JIDs
| * Fix fetching accounts by JIDsSam Whited2014-11-161-1/+1
| | | | | | | | Fixes a crash when publishing an avatar
* | happy hanukkahiNPUTmice2014-11-168-23/+132
|/
* Merge branch 'development' of https://github.com/siacs/Conversations into ↵iNPUTmice2014-11-162-3/+3
|\ | | | | | | development
| * Don't escape passwords in SASLSam Whited2014-11-152-3/+3
| | | | | | | | Fixes #671
* | show full time stamp in connection established fieldiNPUTmice2014-11-161-1/+1
| |
* | better error checking in ssl switch overiNPUTmice2014-11-161-5/+9
|/
* made scan and show qr code more accessible in VerifyOtrActivityiNPUTmice2014-11-163-53/+186
|
* Merge branch 'master' into developmentiNPUTmice2014-11-161-5/+18
|\