Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | move typing info to ActionBar subtitle | Christian S | 2015-07-20 | 6 | -122/+143 |
| | |||||
* | Merge pull request #11 from kriztan/development | Christian S. | 2015-07-18 | 109 | -1145/+2281 |
|\ | | | | | version 1.5.0 | ||||
| * | Merge pull request #10 from kriztan/siacs-development | Christian S. | 2015-07-18 | 11 | -15/+39 |
| |\ | | | | | | | version 1.5.0 | ||||
| | * | Version 1.5.0 | Christian S | 2015-07-18 | 11 | -15/+39 |
| |/| | |||||
| | * | bump version to 1.5.0 | Daniel Gultsch | 2015-07-18 | 1 | -2/+2 |
| | | | |||||
| | * | 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 |
| | | | |||||
| * | | Merge pull request #7 from kriztan/siacs-development | Christian S. | 2015-07-16 | 33 | -122/+364 |
| |\ \ | | | | | | | | | copy commits | ||||
| | * | | copy commits | Christian S | 2015-07-16 | 33 | -122/+364 |
| |/| | | | |/ | |||||
| | * | version bump to 1.5.0-beta.2 | Daniel Gultsch | 2015-07-16 | 2 | -3/+3 |
| | | | |||||
| | * | 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 |
| | | | |||||
| | * | Merge branch 'development' of github.com:siacs/Conversations into development | Daniel Gultsch | 2015-07-16 | 1 | -3/+2 |
| | |\ | |||||
| | * | | 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 | 2 | -6/+13 |
| |\ \ \ | | | |/ | | |/| | import changes | ||||
| | * | | Merge pull request #1285 from kriztan/patch-2 | Daniel Gultsch | 2015-07-16 | 1 | -1/+0 |
| | |\ \ | | | | | | | | | | | fixed another typo | ||||
| | | * | | fixed another typo | Christian S. | 2015-07-16 | 1 | -1/+0 |
| | |/ / | |||||
| | * | | Merge pull request #1283 from Manouchehri/development | Daniel Gultsch | 2015-07-16 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | Fixed broken URL. | ||||
| | | * | | Fixed broken URL. | David Manouchehri | 2015-07-15 | 1 | -1/+1 |
| | | |/ | | | | | | | | | The HTTPS server is throwing GitHub's certificate instead of a proper one, so I'm going to stick with HTTP for now. | ||||
| | * | | Merge pull request #1284 from kriztan/patch-1 | Daniel Gultsch | 2015-07-16 | 1 | -1/+1 |
| | |\ \ | | | |/ | | |/| | fixed typo | ||||
| | | * | fixed typo | Christian S. | 2015-07-16 | 1 | -1/+1 |
| | |/ | |||||
| | * | mention http upload component in readme | Daniel Gultsch | 2015-07-15 | 1 | -1/+5 |
| | | | |||||
| | * | 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 |
| | | | |||||
| * | | version 1.5.0 beta1 | Christian S. | 2015-07-14 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #4 from kriztan/swipe-modification | Christian S. | 2015-07-14 | 1 | -70/+71 |
| |\ \ | | | | | | | | | swipe only to left to close an active conversation and increased undo message | ||||
| | * | | 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 | 62 | -555/+899 |
| |\| | | | | | | | | | | 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 |
| | | | |||||
| | * | spelling | Daniel Gultsch | 2015-07-11 | 1 | -1/+1 |
| | | | |||||
| | * | added changelog | Daniel Gultsch | 2015-07-10 | 1 | -0/+3 |
| | | | |||||
| | * | version bump to 1.5.0-beta | Daniel Gultsch | 2015-07-10 | 1 | -2/+2 |
| | | | |||||
| | * | renamed HttpConnection to HttpDownloadConnection | Daniel Gultsch | 2015-07-10 | 6 | -19/+19 |
| | | |