aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu (follow)
Commit message (Expand)AuthorAgeFilesLines
* made method private that is no longer required to be publiciNPUTmice2014-12-231-1/+1
* Simplify roster handling codeSam Whited2014-12-223-121/+97
* Fix NPEs in blocking codeSam Whited2014-12-222-2/+4
* Add support for XEP-0191 (Blocking command)Sam Whited2014-12-2237-903/+1444
* get rid of special self presence object and incorporate that into rosteriNPUTmice2014-12-203-75/+46
* more null checks for otr fingerprintsiNPUTmice2014-12-201-1/+1
* don't include empty fingerprints in list of otrfingerprintsiNPUTmice2014-12-201-4/+6
* fixed another break continue bugiNPUTmice2014-12-201-3/+2
* inject ui callback into running mam queryiNPUTmice2014-12-203-4/+6
* fixed #755iNPUTmice2014-12-191-1/+1
* clean up conversation history after swtiching to a different conversationiNPUTmice2014-12-173-4/+12
* show error if jid couldn't be parsed in new contact dialogiNPUTmice2014-12-171-15/+10
* Merge branch 'development' of https://github.com/siacs/Conversations into dev...iNPUTmice2014-12-173-18/+19
|\
| * Merge pull request #783 from SamWhited/quiet-hoursDaniel Gultsch2014-12-173-18/+19
| |\
| | * Handle time comparisons using longsSam Whited2014-12-162-13/+8
| | * Update summary in TimePreference change listenerSam Whited2014-12-151-5/+11
* | | made scroling smoother + bug fixes for history loadingiNPUTmice2014-12-173-21/+47
* | | smoothed out scrolling a bitiNPUTmice2014-12-172-23/+44
|/ /
* | properly detect images in share withiNPUTmice2014-12-171-6/+6
* | Merge branch 'issue756' of https://github.com/SamWhited/Conversations into Sa...iNPUTmice2014-12-171-24/+36
|\ \
| * | Allow sending of any filetype via intentSam Whited2014-12-151-24/+36
| |/
* / properly count mam messagesiNPUTmice2014-12-172-4/+13
|/
* go through mam history page by page. load mam dynamically on scrolliNPUTmice2014-12-155-43/+108
* Merge pull request #782 from SamWhited/quiet-hoursDaniel Gultsch2014-12-151-3/+3
|\
| * Make some magic number constants finalSam Whited2014-12-151-3/+3
* | fixed crashing on unparsed jidsiNPUTmice2014-12-151-4/+4
* | Merge branch 'quiet-hours' of https://github.com/SamWhited/Conversations into...iNPUTmice2014-12-151-68/+64
|\|
| * Make silent notification when quiet hours are onSam Whited2014-12-151-68/+64
* | migrated more jid parsing to use getAttributeAsJid. added error loggingiNPUTmice2014-12-154-32/+8
* | Merge branch 'quiet-hours' of https://github.com/SamWhited/Conversations into...iNPUTmice2014-12-152-27/+147
|\|
| * Add quiet hours featureSam Whited2014-12-142-27/+147
* | fixed history deletion. fixed #780iNPUTmice2014-12-152-1/+11
* | avoid npe on weird platform bugsiNPUTmice2014-12-151-30/+30
* | run mam queries only when onlineiNPUTmice2014-12-142-4/+31
* | more patches for dns helperiNPUTmice2014-12-141-13/+19
|/
* possible dns fixesiNPUTmice2014-12-142-3/+12
* 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