Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Version 1.5.0 | Christian S | 2015-07-18 | 10 | -12/+36 |
|\ | |||||
| * | pulled translations | Daniel Gultsch | 2015-07-18 | 7 | -1/+15 |
| | | |||||
| * | account for downloaded http files in dup checker | Daniel Gultsch | 2015-07-18 | 1 | -8/+18 |
| | | |||||
| * | code cleanup | Daniel Gultsch | 2015-07-17 | 1 | -1/+1 |
| | | |||||
| * | fixed inactive http download | Daniel Gultsch | 2015-07-17 | 1 | -1/+1 |
| | | |||||
* | | show contact name also in locations shared in MUCs | Christian S | 2015-07-17 | 1 | -1/+13 |
| | | |||||
* | | Merge pull request #8 from siacs/development | Christian S. | 2015-07-17 | 3 | -5/+3 |
|\| | | | | | copy commits | ||||
| * | show error message in account details when info has not been edited | Daniel Gultsch | 2015-07-17 | 1 | -1/+1 |
| | | |||||
| * | increased ibb block size | Daniel Gultsch | 2015-07-17 | 2 | -4/+2 |
| | | |||||
* | | copy commits | Christian S | 2015-07-16 | 32 | -120/+362 |
|\| | |||||
| * | version bump to 1.5.0-beta.2 | Daniel Gultsch | 2015-07-16 | 1 | -1/+1 |
| | | |||||
| * | even less jumpy | Daniel Gultsch | 2015-07-16 | 1 | -1/+3 |
| | | |||||
| * | fixed some ux glitches in editaccount | Daniel Gultsch | 2015-07-16 | 3 | -9/+9 |
| | | |||||
| * | removed empty translation file | Daniel Gultsch | 2015-07-16 | 1 | -2/+0 |
| | | |||||
| * | made 'check image on http host' message more generic. fixed #1281 | Daniel Gultsch | 2015-07-16 | 28 | -104/+334 |
| | | |||||
| * | fixed some npes | Daniel Gultsch | 2015-07-16 | 1 | -4/+11 |
| | | |||||
* | | Merge pull request #5 from siacs/development | Christian S. | 2015-07-16 | 1 | -3/+7 |
|\| | | | | | import changes | ||||
| * | fixed crash on invalid muc bookmarks | Daniel Gultsch | 2015-07-15 | 1 | -3/+7 |
| | | |||||
* | | show bigger avatar in 'publish profile picture' view | Christian S. | 2015-07-16 | 1 | -3/+3 |
| | | |||||
* | | show bigger avatar in 'edit account' view | Christian S. | 2015-07-16 | 1 | -2/+2 |
| | | |||||
* | | modified swipe options | Christian S. | 2015-07-14 | 1 | -71/+71 |
| | | |||||
* | | swipe only to left to close an active conversation | Christian S. | 2015-07-14 | 1 | -0/+1 |
| | | |||||
* | | changed 'checking_image' to 'checking_file' | Christian S | 2015-07-14 | 21 | -22/+22 |
| | | |||||
* | | deleted old files | Christian S | 2015-07-14 | 3 | -266/+0 |
| | | |||||
* | | Merge branch 'development' of https://github.com/siacs/Conversations into ↵ | Christian S | 2015-07-14 | 60 | -553/+894 |
|\| | | | | | | | siacs-development | ||||
| * | renamed colors | Daniel Gultsch | 2015-07-13 | 36 | -165/+162 |
| | | |||||
| * | catch exception on broken android phones | Daniel Gultsch | 2015-07-12 | 1 | -1/+7 |
| | | |||||
| * | made lock button reflect encryption status of the next messages instead of ↵ | Daniel Gultsch | 2015-07-12 | 1 | -16/+10 |
| | | | | | | | | the last | ||||
| * | only try to change affilations for known jids | Daniel Gultsch | 2015-07-11 | 1 | -1/+1 |
| | | |||||
| * | try to catch weird npe in android sdk | Daniel Gultsch | 2015-07-11 | 1 | -0/+2 |
| | | |||||
| * | null check otr fingerprint before display | Daniel Gultsch | 2015-07-11 | 1 | -1/+3 |
| | | |||||
| * | renamed HttpConnection to HttpDownloadConnection | Daniel Gultsch | 2015-07-10 | 6 | -19/+19 |
| | | |||||
| * | renamed downloadable to transferable | Daniel Gultsch | 2015-07-10 | 14 | -101/+87 |
| | | |||||
| * | get file upload ready to work with https | Daniel Gultsch | 2015-07-10 | 3 | -38/+53 |
| | | |||||
| * | display toast in ui on failed http download | Daniel Gultsch | 2015-07-10 | 7 | -36/+105 |
| | | | | | | | | fixes #954 | ||||
| * | show timestamp on images in mucs | Daniel Gultsch | 2015-07-10 | 1 | -1/+1 |
| | | | | | | | | fixes #1178 | ||||
| * | added null check in sasl response verifier | Daniel Gultsch | 2015-07-10 | 1 | -1/+1 |
| | | |||||
| * | catch number format exception in server ack | Daniel Gultsch | 2015-07-10 | 1 | -10/+14 |
| | | |||||
| * | print stack trace instead of writing error message to log in case of unknown ↵ | Daniel Gultsch | 2015-07-09 | 1 | -1/+1 |
| | | | | | | | | exception in dnsutil | ||||
* | | resize avatars | Christian S | 2015-07-08 | 8 | -24/+30 |
|\ \ | |||||
| * | | resize avatar views | Christian S | 2015-07-08 | 8 | -33/+55 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/patch-1' into development | Christian S | 2015-07-08 | 2 | -2/+2 |
|\| | | |||||
| * | | resize avatar image in contact details (untested) | Christian S. | 2015-07-08 | 1 | -1/+1 |
| |/ | |||||
| * | show contacts name in non anonymous mucs. fixes #1213 | Daniel Gultsch | 2015-07-05 | 1 | -2/+6 |
| | | |||||
* | | changed bugs messages address | Christian S. | 2015-07-07 | 1 | -1/+1 |
| | | |||||
* | | correct MUC nicknames | Christian S | 2015-07-05 | 1 | -5/+4 |
| | | |||||
* | | show nicknames in MUCs instead of the user part of the JID | Christian S. | 2015-07-05 | 1 | -1/+6 |
| | | |||||
* | | changed avatar image size to 384 px | Christian S. | 2015-07-05 | 1 | -1/+1 |
| | | |||||
* | | refactored sendMessage and merged with resendMessage | Christian S | 2015-07-05 | 2 | -148/+117 |
|\| | |||||
| * | refactored sendMessage and merged with resendMessage | Daniel Gultsch | 2015-07-05 | 2 | -148/+117 |
| | |