Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | ask for contact permissions when first opening StartConversationActivity | Daniel Gultsch | 2015-12-12 | 1 | -0/+11 |
| | |||||
* | avoid some NPEs | Daniel Gultsch | 2015-12-04 | 1 | -2/+3 |
| | |||||
* | add error state for unavailable tor network | Daniel Gultsch | 2015-12-04 | 1 | -4/+9 |
| | |||||
* | refactored socks5 connection code. make jingle transport use that new code | Daniel Gultsch | 2015-12-04 | 1 | -0/+52 |
| | |||||
* | copy commits | Christian S | 2015-11-29 | 1 | -21/+0 |
|\ | |||||
| * | pgp fixes and revert configuration changes | Daniel Gultsch | 2015-11-25 | 1 | -21/+0 |
| | | |||||
* | | show own name in sent locations | Christian S | 2015-11-14 | 1 | -0/+2 |
| | | |||||
* | | Merge remote-tracking branch 'siacs/master' into development | Christian S | 2015-10-31 | 2 | -0/+36 |
|\| | |||||
| * | show encryption type in warned/red messages | Daniel Gultsch | 2015-10-28 | 1 | -0/+15 |
| | | |||||
| * | Reset the margins manually after rotating | saqura | 2015-10-26 | 1 | -0/+21 |
| | | |||||
* | | copy commits | Christian S | 2015-10-17 | 1 | -4/+24 |
|\| | |||||
| * | introduced code to verify omemo device keys with x509 certificates. | Daniel Gultsch | 2015-10-16 | 1 | -4/+24 |
| | | | | | | | | cleaned up TrustKeysActivity to automatically close if there is nothing to do | ||||
* | | Merge remote-tracking branch 'siacs/master' into development | Christian S | 2015-10-16 | 1 | -0/+19 |
|\| | |||||
| * | add menu item in account details to renew certificate | Daniel Gultsch | 2015-10-11 | 1 | -0/+19 |
| | | |||||
* | | Version 1.6.10 | Christian S | 2015-09-20 | 1 | -1/+8 |
|\| | |||||
| * | let DnsHelper provide a fallback solution | Daniel Gultsch | 2015-09-19 | 1 | -1/+8 |
| | | |||||
* | | copy commits | Christian S | 2015-09-18 | 2 | -6/+16 |
|\| | |||||
| * | introduced Config variable to use legacy namespace for http upload | Daniel Gultsch | 2015-09-17 | 1 | -1/+3 |
| | | |||||
| * | fixed rare NPE in DnsHelper. fixed spelling and added logging | Daniel Gultsch | 2015-09-17 | 1 | -5/+13 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2015-09-15 | 1 | -1/+1 |
|\| | |||||
| * | changed http upload namespace to reflect the one in the XEP | Daniel Gultsch | 2015-09-14 | 1 | -1/+1 |
| | | |||||
* | | Version 1.6.9 | Christian S | 2015-09-12 | 1 | -0/+1 |
|\| | |||||
| * | increased dns timeout | Daniel Gultsch | 2015-09-10 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #34 from siacs/master | Christian S. | 2015-09-05 | 1 | -9/+21 |
|\| | |||||
| * | ignore timeout exceptions on secondary dns requests | Daniel Gultsch | 2015-09-05 | 1 | -9/+21 |
| | | |||||
* | | copy commits | Christian S | 2015-08-29 | 1 | -7/+40 |
|\| | |||||
| * | use build in method on >= lolipop devices to discover dns servers | Daniel Gultsch | 2015-08-28 | 1 | -7/+40 |
| | | |||||
* | | Version 1.6.5 | Christian S | 2015-08-26 | 1 | -3/+5 |
|\| | |||||
| * | catch some db query exceptions | Daniel Gultsch | 2015-08-25 | 1 | -3/+5 |
| | | |||||
* | | Merge pull request #27 from siacs/development | Christian S. | 2015-08-24 | 1 | -1/+1 |
|\| | | | | | copy commits | ||||
| * | open files with capital extensions as well. fixes #1354 | Daniel Gultsch | 2015-08-23 | 1 | -1/+1 |
| | | |||||
* | | copy commits | Christian S | 2015-08-19 | 1 | -1/+1 |
|\| | |||||
| * | catch package manager has died exception | Daniel Gultsch | 2015-08-19 | 1 | -1/+1 |
| | | |||||
* | | version 1.6.0 beta 3 | Christian S | 2015-08-12 | 1 | -0/+144 |
|\| | |||||
| * | do not touch pictures that are already in the right format | Daniel Gultsch | 2015-08-11 | 1 | -0/+144 |
| | | | | | | | | fixed #522 | ||||
* | | copy commits | Christian S | 2015-08-02 | 1 | -10/+6 |
|\| | |||||
| * | changed logging. (work around logcat null pointer | Daniel Gultsch | 2015-07-28 | 1 | -1/+0 |
| | | |||||
| * | rewrote dns fallback | Daniel Gultsch | 2015-07-24 | 1 | -9/+6 |
| | | |||||
* | | copy commits | Christian S | 2015-07-20 | 7 | -45/+43 |
|\| | |||||
| * | Optimize imports | Andreas Straub | 2015-07-20 | 6 | -40/+39 |
| | | |||||
| * | Adapt prettifyFingerprint() to axolotl FP sizes | Andreas Straub | 2015-07-19 | 1 | -5/+4 |
| | | |||||
* | | show contact name also in locations shared in MUCs | Christian S | 2015-07-17 | 1 | -1/+13 |
| | | |||||
* | | copy commits | Christian S | 2015-07-16 | 1 | -1/+2 |
|\| | |||||
| * | made 'check image on http host' message more generic. fixed #1281 | Daniel Gultsch | 2015-07-16 | 1 | -1/+2 |
| | | |||||
* | | changed 'checking_image' to 'checking_file' | Christian S | 2015-07-14 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'development' of https://github.com/siacs/Conversations into ↵ | Christian S | 2015-07-14 | 3 | -12/+13 |
|\| | | | | | | | siacs-development | ||||
| * | null check otr fingerprint before display | Daniel Gultsch | 2015-07-11 | 1 | -1/+3 |
| | | |||||
| * | renamed downloadable to transferable | Daniel Gultsch | 2015-07-10 | 1 | -10/+9 |
| | | |||||
| * | 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 | ||||
* | | Merge remote-tracking branch 'origin/patch-1' into development | Christian S | 2015-07-08 | 1 | -1/+1 |
|\| |