aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Expand)AuthorAgeFilesLines
* modified typing optionsChristian S.2015-07-211-1/+1
* move typing info to ActionBar subtitleChristian S2015-07-206-122/+143
* Version 1.5.0Christian S2015-07-1810-12/+36
|\
| * pulled translationsDaniel Gultsch2015-07-187-1/+15
| * account for downloaded http files in dup checkerDaniel Gultsch2015-07-181-8/+18
| * code cleanupDaniel Gultsch2015-07-171-1/+1
| * fixed inactive http downloadDaniel Gultsch2015-07-171-1/+1
* | show contact name also in locations shared in MUCsChristian S2015-07-171-1/+13
* | Merge pull request #8 from siacs/developmentChristian S.2015-07-173-5/+3
|\|
| * show error message in account details when info has not been editedDaniel Gultsch2015-07-171-1/+1
| * increased ibb block sizeDaniel Gultsch2015-07-172-4/+2
* | copy commitsChristian S2015-07-1632-120/+362
|\|
| * version bump to 1.5.0-beta.2Daniel Gultsch2015-07-161-1/+1
| * even less jumpyDaniel Gultsch2015-07-161-1/+3
| * fixed some ux glitches in editaccountDaniel Gultsch2015-07-163-9/+9
| * removed empty translation fileDaniel Gultsch2015-07-161-2/+0
| * made 'check image on http host' message more generic. fixed #1281Daniel Gultsch2015-07-1628-104/+334
| * fixed some npesDaniel Gultsch2015-07-161-4/+11
* | Merge pull request #5 from siacs/developmentChristian S.2015-07-161-3/+7
|\|
| * fixed crash on invalid muc bookmarksDaniel Gultsch2015-07-151-3/+7
* | show bigger avatar in 'publish profile picture' viewChristian S.2015-07-161-3/+3
* | show bigger avatar in 'edit account' viewChristian S.2015-07-161-2/+2
* | modified swipe optionsChristian S.2015-07-141-71/+71
* | swipe only to left to close an active conversationChristian S.2015-07-141-0/+1
* | 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-1460-553/+894
|\|
| * 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
| * 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
* | 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
* | 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