Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #80 from siacs/master | Christian S | 2016-03-20 | 1 | -4/+5 |
|\ | | | | | copy commits | ||||
| * | show room nick for /me command in sent muc messages. fixes #1773 | Daniel Gultsch | 2016-03-20 | 1 | -4/+5 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-03-17 | 1 | -1/+10 |
|\| | |||||
| * | Check if path for URI is accessible | fiaxh | 2016-03-15 | 1 | -1/+10 |
| | | | | | | | | | | The path extracted from the Cursor might not be accessible for Conversations. FileUtils accesses URI information through the ContentProvider, so this wouldn't be noticed. Fixes sharing from open-keychain's TemporaryContentProvider | ||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-03-05 | 1 | -1/+4 |
|\| | |||||
| * | mark oob messages and always display download button | Daniel Gultsch | 2016-03-04 | 1 | -1/+4 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-02-27 | 1 | -1/+3 |
|\| | |||||
| * | Retry decryption from message menu | fiaxh | 2016-02-23 | 1 | -1/+3 |
| | | |||||
* | | Add device name to client info | Artem Shipovskiy | 2016-02-04 | 1 | -0/+4 |
| | | |||||
* | | Merge remote-tracking branch 'siacs/master' into development | Christian S | 2016-02-04 | 2 | -2/+28 |
|\| | |||||
| * | use TLSv1.2 as SSL context on supported plattforms | Daniel Gultsch | 2016-02-03 | 1 | -0/+11 |
| | | |||||
| * | prefer dns servers from networsk with the default route | Daniel Gultsch | 2016-01-29 | 1 | -2/+17 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-01-23 | 1 | -27/+45 |
|\| | |||||
| * | catch security exception when user prevents access to address book | Daniel Gultsch | 2016-01-20 | 1 | -27/+45 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-01-13 | 3 | -77/+163 |
|\| | |||||
| * | move some ssl socket modifiers into a seperate helper class | Daniel Gultsch | 2016-01-12 | 1 | -0/+62 |
| | | |||||
| * | Implement XEP-0368: SRV records for XMPP over TLS | moparisthebest | 2016-01-11 | 1 | -50/+71 |
| | | |||||
| * | ask to be excluded from battery optimization | Daniel Gultsch | 2016-01-11 | 1 | -27/+29 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-01-10 | 1 | -0/+3 |
|\| | |||||
| * | null check in getOriginalPath | Daniel Gultsch | 2016-01-04 | 1 | -0/+3 |
| | | |||||
* | | copy commits | Christian S | 2015-12-29 | 1 | -1/+1 |
|\| | |||||
| * | handle null names in getColorForName | Daniel Gultsch | 2015-12-29 | 1 | -1/+1 |
| | | |||||
* | | copy commits | Christian S | 2015-12-28 | 1 | -23/+52 |
|\| | |||||
| * | lower case all fingerprints. fixes #1521 | Daniel Gultsch | 2015-12-27 | 1 | -1/+2 |
| | | |||||
| * | code cleanup | Daniel Gultsch | 2015-12-23 | 1 | -22/+0 |
| | | |||||
| * | show certificate information | Daniel Gultsch | 2015-12-23 | 1 | -0/+50 |
| | | |||||
| * | ask for contact permissions when first opening StartConversationActivity | Daniel Gultsch | 2015-12-07 | 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-01 | 1 | -4/+9 |
| | | |||||
| * | refactored socks5 connection code. make jingle transport use that new code | Daniel Gultsch | 2015-12-01 | 1 | -0/+52 |
| | | |||||
* | | 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 |
|\| |