Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | replaced ... with … | Christian S | 2015-08-19 | 2 | -4/+4 |
* | some little image preview changes | Christian S | 2015-08-19 | 4 | -24/+25 |
* | forked NotificationService from siacs/development | Christian S | 2015-08-19 | 1 | -16/+18 |
* | removed duplicates | Christian S | 2015-08-19 | 1 | -13/+0 |
* | removed duplicate string | Christian S | 2015-08-19 | 1 | -1/+0 |
* | copy commits | Christian S | 2015-08-19 | 17 | -193/+450 |
|\ | |||||
| * | Merge branch 'master' into development | Daniel Gultsch | 2015-08-19 | 12 | -151/+397 |
| |\ | |||||
| | * | pulled translations from transifex | Daniel Gultsch | 2015-08-19 | 12 | -151/+397 |
| * | | simulate old behaviour with messages being set to waiting while offline | Daniel Gultsch | 2015-08-19 | 2 | -3/+10 |
| * | | Merge branch 'master' into development | Daniel Gultsch | 2015-08-19 | 1 | -0/+1 |
| |\| | |||||
| | * | fixed nasty 'stuck at sending' bug that got introduced in 32826ec29d28668b7f3... | Daniel Gultsch | 2015-08-19 | 1 | -0/+1 |
| * | | Merge branch 'master' into development | Daniel Gultsch | 2015-08-19 | 2 | -1/+7 |
| |\| | |||||
| | * | check if inputstream is null before cropping avatar images | Daniel Gultsch | 2015-08-19 | 1 | -0/+6 |
| | * | catch package manager has died exception | Daniel Gultsch | 2015-08-19 | 1 | -1/+1 |
| * | | Merge branch 'master' into development | Daniel Gultsch | 2015-08-16 | 3 | -34/+35 |
| |\| | |||||
| | * | increased version code | Daniel Gultsch | 2015-08-16 | 1 | -1/+1 |
| | * | deal with broken frameworks | Daniel Gultsch | 2015-08-16 | 1 | -4/+1 |
| | * | catch broken base64 in avatars | Daniel Gultsch | 2015-08-16 | 1 | -5/+1 |
| | * | synchronize packetCallbacks | Daniel Gultsch | 2015-08-16 | 1 | -25/+30 |
| | * | catch null pointer in ScramSHA1 sasl | Daniel Gultsch | 2015-08-16 | 1 | -0/+3 |
* | | | Merge pull request #23 from kriztan/Subtitle | Christian S. | 2015-08-18 | 21 | -0/+33 |
|\ \ \ | |||||
| * | | | add subtitle to ActionBar in chatviews | Christian S | 2015-08-18 | 23 | -4/+52 |
* | | | | added German translation for undo string | Christian S. | 2015-08-16 | 1 | -2/+3 |
* | | | | added translation for undo string | Christian S. | 2015-08-16 | 1 | -0/+1 |
* | | | | reduced image preview size | Christian S. | 2015-08-16 | 1 | -1/+1 |
* | | | | Merge branch 'siacs/development' into development | Christian S | 2015-08-15 | 8 | -88/+78 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | version bump to 1.7.0-alpha to start new development cycle | Daniel Gultsch | 2015-08-15 | 1 | -2/+2 |
| * | | | Merge branch 'depend_on_sm' into development | Daniel Gultsch | 2015-08-15 | 7 | -86/+76 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | fully depend on sm | Daniel Gultsch | 2015-08-15 | 7 | -86/+76 |
* | | | | Update CHANGELOG.md | Christian S. | 2015-08-15 | 1 | -2/+6 |
* | | | | version 1.6.0 | Christian S | 2015-08-15 | 9 | -5/+90 |
|\| | | | |||||
| * | | | version bump to 1.6.0 | Daniel Gultsch | 2015-08-15 | 1 | -2/+2 |
| * | | | Merge branch 'development' | Daniel Gultsch | 2015-08-15 | 3 | -0/+48 |
| |\ \ \ | |||||
| | * | | | Update license string with libraries | Andreas Straub | 2015-08-15 | 1 | -0/+4 |
| | * | | | Display error message if all contact keys purged | Andreas Straub | 2015-08-15 | 3 | -0/+44 |
| | |/ / | |||||
| * | | | Merge branch 'development' | Daniel Gultsch | 2015-08-15 | 201 | -1239/+6933 |
| |\| | | |||||
| | * | | provide extra interface to close sockets. fixes #1330 | Daniel Gultsch | 2015-08-15 | 2 | -2/+11 |
| | * | | Merge pull request #1329 from hlad/server_info_http_upload | Daniel Gultsch | 2015-08-15 | 3 | -0/+28 |
| | |\ \ | | | |/ | | |/| | |||||
| | | * | show HTTP upload availability on Edit account screen | hlad | 2015-08-14 | 3 | -0/+28 |
| | |/ | |||||
| * | | bump to version 1.5.2 | Daniel Gultsch | 2015-07-21 | 1 | -2/+2 |
| * | | fixed npe in error message handling | Daniel Gultsch | 2015-07-21 | 1 | -1/+1 |
| * | | version bump to 1.5.1 and changelog | Daniel Gultsch | 2015-07-21 | 2 | -2/+6 |
| * | | and now do that properly | Daniel Gultsch | 2015-07-21 | 1 | -1/+1 |
| * | | end otr session when receiving failed otr message warnings | Daniel Gultsch | 2015-07-21 | 1 | -1/+7 |
| * | | bugfix: also add no-permanent-storage to message hints | Daniel Gultsch | 2015-07-21 | 2 | -1/+2 |
| * | | bugfix: changed condition of onOtrSessionEstablished being called | Daniel Gultsch | 2015-07-21 | 1 | -6/+6 |
| * | | pulled new translations from transifex | Daniel Gultsch | 2015-07-21 | 2 | -1/+6 |
| * | | bugfix: don't crash if aes key could not be set before jingle transfer | Daniel Gultsch | 2015-07-21 | 1 | -1/+4 |
| * | | bugfix: use sendIqPacket method in service instead of invoking XmppConnection... | Daniel Gultsch | 2015-07-21 | 1 | -3/+2 |
| * | | bugfix: accept status code 201 on http upload | Daniel Gultsch | 2015-07-21 | 1 | -1/+1 |