Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | introduce special iq type for internal timeouts. always use != result to chec... | Daniel Gultsch | 2015-08-23 | 7 | -20/+18 | |
| * | | 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 | 6 | -177/+214 | |
| |\| | ||||||
| | * | Add error handling to OMEMO PEP code | Andreas Straub | 2015-08-23 | 1 | -116/+131 | |
| | * | 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 | |
* | | | 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 | |
| |\| | ||||||
| | * | 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 | 7 | -86/+76 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | 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 1.6.0 | Christian S | 2015-08-15 | 8 | -3/+88 | |
|\| | | | ||||||
| * | | | 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 | 188 | -1200/+5258 | |
| |\| | | ||||||
| | * | | provide extra interface to close sockets. fixes #1330 | Daniel Gultsch | 2015-08-15 | 2 | -2/+11 | |
| | * | | show HTTP upload availability on Edit account screen | hlad | 2015-08-14 | 3 | -0/+28 | |
| | |/ | ||||||
| * | | fixed npe in error message handling | Daniel Gultsch | 2015-07-21 | 1 | -1/+1 | |
| * | | 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 |