aboutsummaryrefslogtreecommitdiffstats
path: root/src (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-2242-903/+1481
| * 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
| * Merge pull request #794 from svetlemodry/developmentDaniel Gultsch2014-12-201-2/+2
| |\
| | * Czech image transfer string fixJaroslav Lichtblau2014-12-191-2/+2
| * | Update spanish translationskruks232014-12-201-4/+12
| * | Merge branch 'development' of https://github.com/siacs/Conversations into dev...iNPUTmice2014-12-192-0/+16
| |\|
| | * Czech translation updatedJaroslav Lichtblau2014-12-181-0/+8
| | * Update german translationskriztan2014-12-181-0/+8
| * | 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-174-21/+48
| * | | smoothed out scrolling a bitiNPUTmice2014-12-173-23/+45
| |/ /
| * | properly detect images in share withiNPUTmice2014-12-171-6/+6
| * | Merge branch 'issue756' of https://github.com/SamWhited/Conversations into Sa...iNPUTmice2014-12-172-25/+37
| |\ \
| | * | Allow sending of any filetype via intentSam Whited2014-12-152-25/+37
| | |/
| * / 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-154-29/+176
| |\|
| | * Add quiet hours featureSam Whited2014-12-144-29/+176
| * | fixed history deletion. fixed #780iNPUTmice2014-12-152-1/+11
| * | Merge pull request #775 from kruks23/translation1Daniel Gultsch2014-12-151-33/+33
| |\ \
| | * | Update spanish translations.kruks232014-12-131-33/+33
| * | | Merge pull request #781 from drizzt/patch-1Daniel Gultsch2014-12-151-1/+1
| |\ \ \
| | * | | fixed typo in italian translationdrizzt2014-12-151-1/+1
| * | | | 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