aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'development' of https://github.com/siacs/Conversations into sia...Christian S2015-07-1426-401/+740
|\
| * renamed colorsDaniel Gultsch2015-07-132-13/+9
| * catch exception on broken android phonesDaniel Gultsch2015-07-121-1/+7
| * made lock button reflect encryption status of the next messages instead of th...Daniel Gultsch2015-07-121-16/+10
| * only try to change affilations for known jidsDaniel Gultsch2015-07-111-1/+1
| * try to catch weird npe in android sdkDaniel Gultsch2015-07-111-0/+2
| * null check otr fingerprint before displayDaniel Gultsch2015-07-111-1/+3
| * renamed HttpConnection to HttpDownloadConnectionDaniel Gultsch2015-07-106-19/+19
| * renamed downloadable to transferableDaniel Gultsch2015-07-1014-101/+87
| * get file upload ready to work with httpsDaniel Gultsch2015-07-103-38/+53
| * display toast in ui on failed http downloadDaniel Gultsch2015-07-106-36/+104
| * show timestamp on images in mucsDaniel Gultsch2015-07-101-1/+1
| * added null check in sasl response verifierDaniel Gultsch2015-07-101-1/+1
| * catch number format exception in server ackDaniel Gultsch2015-07-101-10/+14
| * print stack trace instead of writing error message to log in case of unknown ...Daniel Gultsch2015-07-091-1/+1
* | resize avatarsChristian S2015-07-085-13/+15
|\ \
| * | resize avatar viewsChristian S2015-07-085-13/+15
* | | Merge remote-tracking branch 'origin/patch-1' into developmentChristian S2015-07-082-2/+2
|\| |
| * | resize avatar image in contact details (untested)Christian S.2015-07-081-1/+1
| |/
| * show contacts name in non anonymous mucs. fixes #1213Daniel Gultsch2015-07-051-2/+6
* | changed bugs messages addressChristian S.2015-07-071-1/+1
* | correct MUC nicknamesChristian S2015-07-051-5/+4
* | show nicknames in MUCs instead of the user part of the JIDChristian S.2015-07-051-1/+6
* | changed avatar image size to 384 pxChristian S.2015-07-051-1/+1
* | refactored sendMessage and merged with resendMessageChristian S2015-07-052-148/+117
|\|
| * refactored sendMessage and merged with resendMessageDaniel Gultsch2015-07-052-148/+117
* | added 'vcf' to 'well known extensions'Christian S.2015-07-051-1/+1
* | added 'apk' to well known file types to be downloadableChristian S2015-07-041-1/+1
* | play notification when conversation is openChristian S.2015-07-041-23/+21
* | added some more well known file types to be downloadableChristian S2015-07-041-1/+1
* | small avatar modificationsChristian S2015-07-041-6/+6
* | Merge pull request #1 from siacs/developmentChristian S.2015-07-033-3/+6
|\|
| * make sure unread count is initialized as 0. fixes #1270Daniel Gultsch2015-07-031-1/+2
| * avoid very rare npeDaniel Gultsch2015-07-032-2/+4
| * Merge branch 'master' into developmentDaniel Gultsch2015-07-031-0/+1
| |\
* | | changed WEBP to JPEG for imagesChristian S2015-07-032-3/+3
* | | Merge remote-tracking branch 'origin/master' into developmentChristian S2015-07-031-0/+1
|\ \ \ | |/ / |/| / | |/
| * added fallback for non-srv dns queriesDaniel Gultsch2015-07-031-0/+1
* | fixed share with activity to account for http file uploadDaniel Gultsch2015-07-022-43/+38
* | also offer http download for some 'well known extensions'Daniel Gultsch2015-07-022-1/+4
* | refactored message context menuDaniel Gultsch2015-07-023-33/+38
* | moved null check for to and from in message parserDaniel Gultsch2015-07-021-5/+6
* | changed mime type handlingDaniel Gultsch2015-07-017-54/+555
* | disable automatic aes encryption for the time beingDaniel Gultsch2015-06-301-1/+1
* | changed namespace of the http upload featureDaniel Gultsch2015-06-301-1/+1
* | made httpconnection (download) ready all kind of filesDaniel Gultsch2015-06-309-69/+74
* | made storage path decision entirely based upon file extensionDaniel Gultsch2015-06-301-2/+4
* | refactored bodyContainsDownloadable to be more flexibleDaniel Gultsch2015-06-305-37/+39
* | always show copy original url in context menu when url is availableDaniel Gultsch2015-06-301-2/+1
* | untested pgp support for http uploadDaniel Gultsch2015-06-292-6/+31