aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* refactored the way certain messages are being found within a conversationiNPUTmice2014-12-145-117/+193
* avoiding concurrent modificationiNPUTmice2014-12-132-6/+3
* fixed regressioniNPUTmice2014-12-131-3/+3
* reverse through mam history when loading larger chuncksiNPUTmice2014-12-135-22/+79
* Merge branch 'feature/mam' into developmentiNPUTmice2014-12-1317-75/+535
|\
| * various mam improvmentsiNPUTmice2014-12-136-39/+130
| * mark otr messages as no-store for mamiNPUTmice2014-12-101-0/+1
| * changed lastMessageReceived into lastMessageTransmitted to account for sent m...iNPUTmice2014-12-104-22/+31
| * save server id from mam messages. check for dups before adding mamiNPUTmice2014-12-103-5/+40
| * added max history age (default 1w). automatically sort newly added mam messagesiNPUTmice2014-12-109-42/+103
| * very basic mam supportiNPUTmice2014-12-109-8/+277
| * store last message received date in conversationiNPUTmice2014-12-105-54/+48
* | refactored phone contacts mergeriNPUTmice2014-12-131-33/+38
|/
* removed unnecessary otr error responseiNPUTmice2014-12-102-12/+0
* recreate activity after theme has changed. fixed #764iNPUTmice2014-12-092-3/+20
* Merge pull request #767 from kruks23/translation3Daniel Gultsch2014-12-091-6/+6
|\
| * Update spanish translations.kruks232014-12-091-6/+6
* | Merge pull request #768 from betheg/asDaniel Gultsch2014-12-091-1/+3
|\ \
| * | gradle: fix Cannot set property outputFile on null object.Michael2014-12-091-1/+3
|/ /
* | Merge pull request #710 from betheg/asDaniel Gultsch2014-12-093-17/+15
|\ \
| * | update gradle to 2.2.1 and android gradle plugin to 1.0.0Michael2014-12-092-2/+2
| * | update android gradle plugin to 1.0.0-rc4Michael2014-12-051-1/+1
| * | update android gradle plugin to 0.14.4Michael2014-11-223-17/+15
* | | cleanup: removed unused emoticon parsingiNPUTmice2014-12-094-53/+2
* | | cleanup: removed stream compressioniNPUTmice2014-12-093-205/+0
* | | version bump to 0.9.30.9.3iNPUTmice2014-12-073-3/+5
* | | possible work around for some weird - possibly sdk - bugsiNPUTmice2014-12-071-4/+5
| |/ |/|
* | Merge pull request #752 from SamWhited/update-logoDaniel Gultsch2014-12-041-0/+0
|\ \
| * | Update logo in art folderSam Whited2014-12-041-0/+0
|/ /
* | fixed digest-md5iNPUTmice2014-12-041-0/+4
* | Merge branch 'development' of https://github.com/siacs/Conversations into dev...iNPUTmice2014-12-031-1/+1
|\ \
| * \ Merge pull request #746 from SamWhited/developmentDaniel Gultsch2014-12-031-1/+1
| |\ \
| | * | Single character README fix waste of time pull request.Sam Whited2014-12-031-1/+1
* | | | close cursors after querying phone dbiNPUTmice2014-12-031-0/+2
|/ / /
* / / fixed #651iNPUTmice2014-12-032-0/+20
|/ /
* | more safety checks for listener countsiNPUTmice2014-12-031-88/+29
* | updated readmeiNPUTmice2014-12-031-2/+2
* | fixed #544iNPUTmice2014-12-031-1/+51
* | version bump to 0.9.20.9.2iNPUTmice2014-12-033-3/+6
* | display proper error in edit account details if jid is invalidiNPUTmice2014-12-031-8/+9
* | further npe checksiNPUTmice2014-12-032-6/+13
* | refactored the message adapter a bitiNPUTmice2014-12-031-32/+33
* | set nick and autojoin=true for new bookmarksiNPUTmice2014-12-031-0/+4
* | made muc parser more compatible with legacy mucs?! (whatever that is exactly)iNPUTmice2014-12-031-3/+1
* | Merge pull request #744 from SamWhited/developmentDaniel Gultsch2014-12-032-1/+5
|\ \
| * | Make sure SASL tokenizer strips stringsSam Whited2014-12-022-1/+5
|/ /
* | worked around concurrent modification exceptioniNPUTmice2014-12-031-11/+11
* | fixed another npe in hasBookmarkiNPUTmice2014-12-031-2/+3
* | Merge pull request #740 from SamWhited/jidrpfixDaniel Gultsch2014-12-031-163/+165
|\ \
| * | Allow JIDs such as "example.net/@"Sam Whited2014-12-021-3/+2