aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/utils (follow)
Commit message (Expand)AuthorAgeFilesLines
* Compile Clean after mergetrz/merge_1.5.2steckbrief2015-08-111-0/+1
* Merged 1.5.2 into trz/master with conflicts resolvedsteckbrief2015-08-117-95/+659
|\
| * made 'check image on http host' message more generic. fixed #1281Daniel Gultsch2015-07-161-1/+2
| * null check otr fingerprint before displayDaniel Gultsch2015-07-111-1/+3
| * renamed downloadable to transferableDaniel Gultsch2015-07-101-10/+9
| * print stack trace instead of writing error message to log in case of unknown ...Daniel Gultsch2015-07-091-1/+1
| * show contacts name in non anonymous mucs. fixes #1213Daniel Gultsch2015-07-051-2/+6
| * Merge branch 'master' into developmentDaniel Gultsch2015-07-031-0/+1
| |\
| | * added fallback for non-srv dns queriesDaniel Gultsch2015-07-031-0/+1
| * | changed mime type handlingDaniel Gultsch2015-07-012-10/+488
| * | changed namespace of the http upload featureDaniel Gultsch2015-06-301-1/+1
| * | initial http upload supportDaniel Gultsch2015-06-291-0/+1
| |/
| * don't perform dns lookups on domain parts that obviously look like ip addressesDaniel Gultsch2015-06-191-10/+14
| * made i/o and memory intensive operations execute in serial orderDaniel Gultsch2015-06-051-0/+34
| * fixed obvious bug in dns helperDaniel Gultsch2015-06-041-2/+2
| * streamlined dns helper by ignoring weightDaniel Gultsch2015-06-041-55/+10
| * let dns library take care of no-srv style hosts as wellDaniel Gultsch2015-05-281-9/+16
| * use dns library to resolve missing ipv6 or ipv4 addressesDaniel Gultsch2015-05-281-1/+30
| * fix to detect the sender jid correctlyM. Dietrich2015-05-201-3/+8
| * add extra jid to intend "show location"M. Dietrich2015-05-201-0/+1
| * added a few location questionsDaniel Gultsch2015-05-141-3/+8
| * ignore question marks in location questionDaniel Gultsch2015-05-131-10/+13
| * show location quick action after receiving a question about the users locationDaniel Gultsch2015-05-131-0/+24
| * optimized heart render code a bitDaniel Gultsch2015-05-101-3/+7
| * added white heart to new rendering as wellDaniel Gultsch2015-05-101-0/+1
| * paint single unicode hearts as red and slightly largerDaniel Gultsch2015-05-101-0/+4
| * fixed #1039Daniel Gultsch2015-04-251-0/+3
| * fixed a bug in DNS helper code. fixes #1130iNPUTmice2015-04-161-1/+1
| * fixed typosiNPUTmice2015-04-131-1/+1
* | Merge branch 'trz/rename' (early part) into trz/masterlookshe2015-06-191-0/+14
|\ \
| * | renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-1913-1622/+0
|/ /
* | no trim of messages or passwordlookshe2015-04-111-2/+1
* | Merge tag '1.2.0' into trz/mastersteckbrief2015-03-306-16/+120
|\|
| * show geo uris as 'location' in overviewiNPUTmice2015-03-101-1/+7
| * Merge pull request #1022 from Boris-de/cipher_blacklistDaniel Gultsch2015-03-081-0/+16
| |\
| | * disable all really weak cipher suitesBoris Wachtmeister2015-03-071-0/+16
| * | display geo uris as location. show 'send loction' in share menu if request lo...iNPUTmice2015-03-071-0/+71
| |/
| * made xmpp uris case insensitiveiNPUTmice2015-02-181-3/+3
| * support for XEP-0092: Software VersioniNPUTmice2015-02-161-0/+14
| * Merge pull request #959 from SamWhited/ciphers_fixDaniel Gultsch2015-02-091-5/+7
| |\
| | * Use platform ciphers as well, just prefer oursSam Whited2015-02-021-5/+7
| * | always add a non resolved SRV record to the listiNPUTmice2015-02-091-6/+1
| * | trim message bodys on displayDaniel Gultsch2015-02-071-1/+1
| |/
* | Merge master-originsteckbrief2015-02-204-19/+164
|\|
| * don't disable any ciphersiNPUTmice2015-02-021-3/+4
| * fixed text preview for imagesiNPUTmice2015-02-011-1/+1
| * fix mergable() for /me command.Michael2015-01-251-2/+3
| * proper desc for offering and sending images in conversations overviewiNPUTmice2015-01-181-0/+8
| * use same helper methods for images and filesiNPUTmice2015-01-181-21/+8
| * Merge pull request #901 from kriztan/patch-2Daniel Gultsch2015-01-181-0/+4
| |\