| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #775 from kruks23/translation1 | Daniel Gultsch | 2014-12-15 | 1 | -33/+33 |
| |\ | | | | | Update spanish translations. | ||||
| | * | Update spanish translations. | kruks23 | 2014-12-13 | 1 | -33/+33 |
| | | | |||||
| * | | Merge pull request #781 from drizzt/patch-1 | Daniel Gultsch | 2014-12-15 | 1 | -1/+1 |
| |\ \ | | | | | | | fixed typo in italian translation | ||||
| | * | | fixed typo in italian translation | drizzt | 2014-12-15 | 1 | -1/+1 |
| | | | | | | | | | | s/gallaria/galleria/ | ||||
| * | | | avoid npe on weird platform bugs | iNPUTmice | 2014-12-15 | 1 | -30/+30 |
| |/ / | |||||
| * | | run mam queries only when online | iNPUTmice | 2014-12-14 | 2 | -4/+31 |
| | | | |||||
| * | | more patches for dns helper | iNPUTmice | 2014-12-14 | 1 | -13/+19 |
| | | | |||||
| * | | possible dns fixes | iNPUTmice | 2014-12-14 | 2 | -3/+12 |
| | | | |||||
| * | | refactored the way certain messages are being found within a conversation | iNPUTmice | 2014-12-14 | 5 | -117/+193 |
| | | | |||||
| * | | avoiding concurrent modification | iNPUTmice | 2014-12-13 | 2 | -6/+3 |
| | | | |||||
| * | | fixed regression | iNPUTmice | 2014-12-13 | 1 | -3/+3 |
| | | | |||||
| * | | reverse through mam history when loading larger chuncks | iNPUTmice | 2014-12-13 | 5 | -22/+79 |
| | | | |||||
| * | | 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 |
| | | |||||
| * | Merge pull request #767 from kruks23/translation3 | Daniel Gultsch | 2014-12-09 | 1 | -6/+6 |
| |\ | | | | | Update spanish translations. | ||||
| | * | Update spanish translations. | kruks23 | 2014-12-09 | 1 | -6/+6 |
| | | | |||||
| * | | 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.30.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.20.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 | ||||
| * | | Merge pull request #743 from weiss/update-german-translations | Daniel Gultsch | 2014-12-03 | 1 | -2/+4 |
| |\ \ | | | | | | | Update/improve German translations | ||||
| | * | | Update/improve German translations | Holger Weiß | 2014-12-02 | 1 | -2/+4 |
| | |/ | |||||
| * | | Merge branch 'development' of https://github.com/siacs/Conversations into ↵ | iNPUTmice | 2014-12-03 | 2 | -32/+108 |
| |\| | | | | | | | development | ||||
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |