| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | Merge branch 'feature/mam' into development | iNPUTmice | 2014-12-13 | 17 | -75/+535 | |
| |\ | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | |||||
| | * | various mam improvments | iNPUTmice | 2014-12-13 | 6 | -39/+130 | |
| | | | ||||||
| | * | mark otr messages as no-store for mam | iNPUTmice | 2014-12-10 | 1 | -0/+1 | |
| | | | ||||||
| | * | changed lastMessageReceived into lastMessageTransmitted to account for sent ↵ | iNPUTmice | 2014-12-10 | 4 | -22/+31 | |
| | | | | | | | | | messages as well. (will trigger on sm ack) | |||||
| | * | save server id from mam messages. check for dups before adding mam | iNPUTmice | 2014-12-10 | 3 | -5/+40 | |
| | | | ||||||
| | * | added max history age (default 1w). automatically sort newly added mam messages | iNPUTmice | 2014-12-10 | 9 | -42/+103 | |
| | | | ||||||
| | * | very basic mam support | iNPUTmice | 2014-12-10 | 9 | -8/+277 | |
| | | | ||||||
| | * | store last message received date in conversation | iNPUTmice | 2014-12-10 | 5 | -54/+48 | |
| | | | ||||||
| * | | refactored phone contacts merger | iNPUTmice | 2014-12-13 | 1 | -33/+38 | |
| |/ | ||||||
| * | removed unnecessary otr error response | iNPUTmice | 2014-12-10 | 2 | -12/+0 | |
| | | ||||||
| * | recreate activity after theme has changed. fixed #764 | iNPUTmice | 2014-12-09 | 2 | -3/+20 | |
| | | ||||||
| * | cleanup: removed unused emoticon parsing | iNPUTmice | 2014-12-09 | 4 | -53/+2 | |
| | | ||||||
| * | cleanup: removed stream compression | iNPUTmice | 2014-12-09 | 3 | -205/+0 | |
| | | ||||||
| * | version bump to 0.9.3 | iNPUTmice | 2014-12-07 | 1 | -1/+1 | |
| | | ||||||
| * | possible work around for some weird - possibly sdk - bugs | iNPUTmice | 2014-12-07 | 1 | -4/+5 | |
| | | ||||||
| * | fixed digest-md5 | iNPUTmice | 2014-12-04 | 1 | -0/+4 | |
| | | ||||||
| * | close cursors after querying phone db | iNPUTmice | 2014-12-03 | 1 | -0/+2 | |
| | | ||||||
| * | fixed #651 | iNPUTmice | 2014-12-03 | 2 | -0/+20 | |
| | | ||||||
| * | more safety checks for listener counts | iNPUTmice | 2014-12-03 | 1 | -88/+29 | |
| | | ||||||
| * | fixed #544 | iNPUTmice | 2014-12-03 | 1 | -1/+51 | |
| | | ||||||
| * | version bump to 0.9.2 | iNPUTmice | 2014-12-03 | 1 | -1/+1 | |
| | | ||||||
| * | display proper error in edit account details if jid is invalid | iNPUTmice | 2014-12-03 | 1 | -8/+9 | |
| | | ||||||
| * | further npe checks | iNPUTmice | 2014-12-03 | 2 | -6/+13 | |
| | | ||||||
| * | refactored the message adapter a bit | iNPUTmice | 2014-12-03 | 1 | -32/+33 | |
| | | ||||||
| * | set nick and autojoin=true for new bookmarks | iNPUTmice | 2014-12-03 | 1 | -0/+4 | |
| | | ||||||
| * | made muc parser more compatible with legacy mucs?! (whatever that is exactly) | iNPUTmice | 2014-12-03 | 1 | -3/+1 | |
| | | ||||||
| * | Make sure SASL tokenizer strips strings | Sam Whited | 2014-12-02 | 2 | -1/+5 | |
| | | | | | Fix DIGEST-MD5 auth (make sure we're not splitting on BASE64 `==') | |||||
| * | worked around concurrent modification exception | iNPUTmice | 2014-12-03 | 1 | -11/+11 | |
| | | ||||||
| * | fixed another npe in hasBookmark | iNPUTmice | 2014-12-03 | 1 | -2/+3 | |
| | | ||||||
| * | Merge pull request #740 from SamWhited/jidrpfix | Daniel Gultsch | 2014-12-03 | 1 | -163/+165 | |
| |\ | | | | | Fix RFC 6122 implementation | |||||
| | * | Allow JIDs such as "example.net/@" | Sam Whited | 2014-12-02 | 1 | -3/+2 | |
| | | | ||||||
| | * | "example.net/@/" should be a valid JID. | Sam Whited | 2014-12-02 | 1 | -164/+166 | |
| | | | | | | | | | Retab JID file | |||||
| | * | Fix RFC 6122 implementation | Sam Whited | 2014-12-02 | 1 | -4/+5 | |
| | | | | | | | | | JID resourceparts should be able to contain "@" and "/" characters | |||||
| * | | safety net in joinMuc | iNPUTmice | 2014-12-03 | 1 | -4/+6 | |
| | | | ||||||
| * | | clean up getProposedNick | iNPUTmice | 2014-12-03 | 1 | -6/+5 | |
| | | | ||||||
| * | | fixed potential npes in message parser | iNPUTmice | 2014-12-03 | 1 | -2/+7 | |
| | | | ||||||
| * | | cleaned up avatar / tile creation | iNPUTmice | 2014-12-03 | 2 | -20/+9 | |
| |/ | ||||||
| * | fixed #728 | iNPUTmice | 2014-12-01 | 1 | -5/+2 | |
| | | ||||||
| * | bumped cap version as well | iNPUTmice | 2014-12-01 | 1 | -1/+1 | |
| | | ||||||
| * | clear encrypted messages on reinit | iNPUTmice | 2014-12-01 | 1 | -2/+13 | |
| | | ||||||
| * | worked around rare npe | iNPUTmice | 2014-12-01 | 1 | -5/+12 | |
| | | ||||||
| * | fixed npe if roster jid couldnt be parsed | iNPUTmice | 2014-12-01 | 1 | -8/+5 | |
| | | ||||||
| * | do not query service info from main server again | iNPUTmice | 2014-12-01 | 1 | -5/+3 | |
| | | ||||||
| * | don't request fragment before updating | iNPUTmice | 2014-11-30 | 1 | -6/+2 | |
| | | ||||||
| * | Merge pull request #721 from SamWhited/warning_fixes | Daniel Gultsch | 2014-11-29 | 1 | -3/+6 | |
| |\ | | | | | Warning "fixes" | |||||
| | * | Misc. "fixes" to correct warnings. | Sam Whited | 2014-11-29 | 1 | -3/+6 | |
| | | | ||||||
| * | | fixed npe for broken bookmarks | iNPUTmice | 2014-11-29 | 1 | -7/+8 | |
| | | | ||||||
| * | | fix for concurrency issue | iNPUTmice | 2014-11-29 | 1 | -1/+1 | |
| |/ | ||||||
| * | fixed npe. fixed #717 | iNPUTmice | 2014-11-27 | 1 | -5/+6 | |
| | | ||||||
| * | create conversation with bare jid | iNPUTmice | 2014-11-27 | 1 | -1/+1 | |
| | | ||||||
 |
index : conversations-plus | |
| improved conversations | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |