aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* changed 'checking_image' to 'checking_file'Christian S2015-07-1421-22/+22
* deleted old filesChristian S2015-07-143-266/+0
* Merge branch 'development' of https://github.com/siacs/Conversations into sia...Christian S2015-07-1462-555/+899
|\
| * renamed colorsDaniel Gultsch2015-07-1336-165/+162
| * 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
| * spellingDaniel Gultsch2015-07-111-1/+1
| * added changelogDaniel Gultsch2015-07-101-0/+3
| * version bump to 1.5.0-betaDaniel Gultsch2015-07-101-2/+2
| * 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-107-36/+105
| * 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
* | Version 1.4.7 beta3Christian S2015-07-081-1/+1
* | resize avatarsChristian S2015-07-088-24/+30
|\ \
| * | resize avatar viewsChristian S2015-07-088-33/+55
* | | 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
* | version 1.4.7 beta2Christian S.2015-07-051-1/+1
* | 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
| * version bump to 1.4.7Daniel Gultsch2015-07-041-2/+2
* | 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
* | increased version numberChristian S.2015-07-041-2/+2
* | modified action bar iconsChristian S2015-07-041-3/+4
* | updated german languageChristian S2015-07-041-0/+2
* | modified standard preferencesChristian S2015-07-041-5/+5
* | small avatar modificationsChristian S2015-07-049-14/+34
* | added some more well known file types to be downloadableChristian S2015-07-041-1/+1
* | small avatar modificationsChristian S2015-07-042-17/+28
* | 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-032-2/+3
| |\
* | | changed WEBP to JPEG for imagesChristian S2015-07-032-3/+3
* | | Merge remote-tracking branch 'origin/master' into developmentChristian S2015-07-032-2/+3
|\ \ \ | |/ / |/| / | |/