Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fixed regression with mlinks stream managment. fixes #1206 | Daniel Gultsch | 2015-08-24 | 1 | -1/+1 |
| | |||||
* | added setting to allow for white backgrounds in incoming message bubbles | Daniel Gultsch | 2015-08-24 | 27 | -36/+234 |
| | |||||
* | Merge branch 'master' into development | Daniel Gultsch | 2015-08-24 | 1 | -1/+1 |
|\ | |||||
| * | catch invalid base64 in axolotl key parsing | Daniel Gultsch | 2015-08-24 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into development | Daniel Gultsch | 2015-08-23 | 3 | -2/+5 |
|\| | |||||
| * | version bump to 1.6.3 and changelog | Daniel Gultsch | 2015-08-23 | 2 | -2/+5 |
| | | |||||
| * | open files with capital extensions as well. fixes #1354 | Daniel Gultsch | 2015-08-23 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into development | Daniel Gultsch | 2015-08-23 | 2 | -3/+2 |
|\| | |||||
| * | bugfix: next encryption is now being properly detected | Daniel Gultsch | 2015-08-23 | 2 | -3/+2 |
| | | |||||
* | | Merge branch 'master' into development | Daniel Gultsch | 2015-08-23 | 2 | -1/+4 |
|\| | |||||
| * | version bump to 1.6.2 and changelog | Daniel Gultsch | 2015-08-23 | 2 | -2/+5 |
| | | |||||
* | | Merge branch 'master' into development | Daniel Gultsch | 2015-08-23 | 7 | -18/+16 |
|\| | |||||
| * | introduce special iq type for internal timeouts. always use != result to ↵ | Daniel Gultsch | 2015-08-23 | 7 | -20/+18 |
| | | | | | | | | check for error in callbacks | ||||
* | | Merge branch 'master' into development | Daniel Gultsch | 2015-08-23 | 1 | -10/+10 |
|\| | |||||
| * | reformating | Daniel Gultsch | 2015-08-23 | 1 | -3/+1 |
| | | |||||
| * | deal with another set of stream:features after bind | Daniel Gultsch | 2015-08-23 | 1 | -7/+9 |
| | | |||||
* | | Merge branch 'master' into development | Daniel Gultsch | 2015-08-23 | 8 | -178/+218 |
|\| | |||||
| * | added changelog for 1.6.1 | Daniel Gultsch | 2015-08-23 | 1 | -0/+3 |
| | | |||||
| * | version bump to 1.6.1 | Daniel Gultsch | 2015-08-23 | 1 | -2/+2 |
| | | |||||
| * | Add error handling to OMEMO PEP code | Andreas Straub | 2015-08-23 | 1 | -116/+131 |
| | | | | | | | | Log received errors and abort processing | ||||
| * | remove the READ_PHONE_STATE permission. | Michael | 2015-08-23 | 1 | -0/+2 |
| | | |||||
| * | remove callbacks directly from iterator | Daniel Gultsch | 2015-08-23 | 1 | -2/+2 |
| | | |||||
| * | don't make subsequent iq request when original stanza returned an error | Daniel Gultsch | 2015-08-23 | 2 | -51/+67 |
| | | |||||
| * | modified clearIqCallbacks into 2-step process | Daniel Gultsch | 2015-08-23 | 3 | -19/+23 |
| | | |||||
* | | Merge pull request #1348 from betheg/zxing | Daniel Gultsch | 2015-08-23 | 1 | -2/+2 |
|\ \ | | | | | | | update zxing to v3.2.1 | ||||
| * | | update zxing to v3.2.1 | Michael | 2015-08-23 | 1 | -2/+2 |
|/ / | |||||
* | | 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 ↵ | Daniel Gultsch | 2015-08-19 | 1 | -0/+1 |
| | | | | | | | | 32826ec29d28668b7f345ffcd45cd876dc980153 | ||||
* | | 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 |
| | | |||||
* | | 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 |
| | | |||||
* | | 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 (server info) |