Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-06-06 | 1 | -5/+3 |
|\ | |||||
| * | opt-in to send last userinteraction in presence | Daniel Gultsch | 2016-06-04 | 2 | -7/+3 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-06-01 | 1 | -1/+1 |
|\| | |||||
| * | don't replace \n\t\r | Daniel Gultsch | 2016-06-01 | 1 | -1/+1 |
| | | |||||
* | | optimize imports | Christian Schneppe | 2016-05-31 | 4 | -9/+1 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-05-31 | 5 | -2/+37 |
|\| | |||||
| * | execute phone contact changes in singlethreadexecutor | Daniel Gultsch | 2016-05-31 | 3 | -2/+35 |
| | | |||||
| * | handle app links for conferences | Daniel Gultsch | 2016-05-30 | 1 | -0/+1 |
| | | |||||
| * | remove unicode control chars before sending | Daniel Gultsch | 2016-05-30 | 1 | -0/+1 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-05-30 | 1 | -3/+12 |
|\| | |||||
| * | handle app links with @ in them | Daniel Gultsch | 2016-05-30 | 1 | -3/+12 |
| | | |||||
* | | change uri | Christian Schneppe | 2016-05-30 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-05-29 | 1 | -3/+9 |
|\| | |||||
| * | handle app links | Daniel Gultsch | 2016-05-29 | 1 | -3/+9 |
| | | | | | | | | invites in the form of https://conversations/i/localpart/domainpart | ||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-05-29 | 1 | -3/+7 |
|\| | |||||
| * | limit text size in message adapter to 2k and also limit text size in ↵ | Daniel Gultsch | 2016-05-28 | 1 | -3/+7 |
| | | | | | | | | conversations adapter | ||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-05-28 | 3 | -14/+25 |
|\| | |||||
| * | Merge branch 'master' of https://github.com/gjedeer/Conversations into ↵ | Daniel Gultsch | 2016-05-28 | 1 | -1/+1 |
| |\ | | | | | | | | | | gjedeer-master | ||||
| | * | Add geo: link support in longer messages | GDR! | 2016-05-26 | 1 | -1/+1 |
| | | | |||||
| * | | put bug report jid in config. include package signature in report | Daniel Gultsch | 2016-05-28 | 2 | -13/+24 |
| |/ | |||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-05-22 | 3 | -13/+16 |
|\| | |||||
| * | refactore exceptionhandler to have one line file writer | Daniel Gultsch | 2016-05-21 | 3 | -13/+16 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-05-16 | 2 | -20/+10 |
|\| | |||||
| * | include name in locations received in MUCs | Daniel Gultsch | 2016-05-15 | 2 | -8/+12 |
| | | |||||
| * | interrupt XMPPConnection Thread | Daniel Gultsch | 2016-05-12 | 1 | -1/+6 |
| | | | | | | | | | | in some cases the the DNS query might take too long (even though we specified a timeout) if that happens we need a secondary solution (besides killing the socket) to stop the thread | ||||
| * | prefer IPv4 DNS servers | Daniel Gultsch | 2016-05-12 | 1 | -3/+16 |
| | | | | | | | | some devices might have problems contacting the IPv6 DNS server while in sleep mode | ||||
* | | revert checkbox meaning from chrash report | Christian Schneppe | 2016-05-16 | 1 | -3/+3 |
| | | |||||
* | | interrupt XMPPConnection Thread | Daniel Gultsch | 2016-05-13 | 1 | -1/+6 |
| | | | | | | | | | | in some cases the the DNS query might take too long (even though we specified a timeout) if that happens we need a secondary solution (besides killing the socket) to stop the thread | ||||
* | | prefer IPv4 DNS servers | Daniel Gultsch | 2016-05-13 | 1 | -3/+16 |
| | | | | | | | | some devices might have problems contacting the IPv6 DNS server while in sleep mode | ||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' into development | Christian S | 2016-04-30 | 2 | -1/+18 |
|\| | |||||
| * | removed unused config variables | Daniel Gultsch | 2016-04-27 | 1 | -1/+1 |
| | | |||||
| * | expert setting to manually change presence | Daniel Gultsch | 2016-04-22 | 1 | -0/+17 |
| | | |||||
* | | 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 |
| | |