aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/utils (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-06-011-1/+1
|\
| * don't replace \n\t\rDaniel Gultsch2016-06-011-1/+1
* | optimize importsChristian Schneppe2016-05-314-9/+1
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-315-2/+37
|\|
| * execute phone contact changes in singlethreadexecutorDaniel Gultsch2016-05-313-2/+35
| * handle app links for conferencesDaniel Gultsch2016-05-301-0/+1
| * remove unicode control chars before sendingDaniel Gultsch2016-05-301-0/+1
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-301-3/+12
|\|
| * handle app links with @ in themDaniel Gultsch2016-05-301-3/+12
* | change uriChristian Schneppe2016-05-301-1/+1
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-291-3/+9
|\|
| * handle app linksDaniel Gultsch2016-05-291-3/+9
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-291-3/+7
|\|
| * limit text size in message adapter to 2k and also limit text size in conversa...Daniel Gultsch2016-05-281-3/+7
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-283-14/+25
|\|
| * Merge branch 'master' of https://github.com/gjedeer/Conversations into gjedee...Daniel Gultsch2016-05-281-1/+1
| |\
| | * Add geo: link support in longer messagesGDR!2016-05-261-1/+1
| * | put bug report jid in config. include package signature in reportDaniel Gultsch2016-05-282-13/+24
| |/
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-223-13/+16
|\|
| * refactore exceptionhandler to have one line file writerDaniel Gultsch2016-05-213-13/+16
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-162-20/+10
|\|
| * include name in locations received in MUCsDaniel Gultsch2016-05-152-8/+12
| * interrupt XMPPConnection ThreadDaniel Gultsch2016-05-121-1/+6
| * prefer IPv4 DNS serversDaniel Gultsch2016-05-121-3/+16
* | revert checkbox meaning from chrash reportChristian Schneppe2016-05-161-3/+3
* | interrupt XMPPConnection ThreadDaniel Gultsch2016-05-131-1/+6
* | prefer IPv4 DNS serversDaniel Gultsch2016-05-131-3/+16
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-302-1/+18
|\|
| * removed unused config variablesDaniel Gultsch2016-04-271-1/+1
| * expert setting to manually change presenceDaniel Gultsch2016-04-221-0/+17
* | Merge pull request #80 from siacs/masterChristian S2016-03-201-4/+5
|\|
| * show room nick for /me command in sent muc messages. fixes #1773Daniel Gultsch2016-03-201-4/+5
* | Merge branch 'siacs/master' into developmentChristian S2016-03-171-1/+10
|\|
| * Check if path for URI is accessiblefiaxh2016-03-151-1/+10
* | Merge branch 'siacs/master' into developmentChristian S2016-03-051-1/+4
|\|
| * mark oob messages and always display download buttonDaniel Gultsch2016-03-041-1/+4
* | Merge branch 'siacs/master' into developmentChristian S2016-02-271-1/+3
|\|
| * Retry decryption from message menufiaxh2016-02-231-1/+3
* | Add device name to client infoArtem Shipovskiy2016-02-041-0/+4
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2016-02-042-2/+28
|\|
| * use TLSv1.2 as SSL context on supported plattformsDaniel Gultsch2016-02-031-0/+11
| * prefer dns servers from networsk with the default routeDaniel Gultsch2016-01-291-2/+17
* | Merge branch 'siacs/master' into developmentChristian S2016-01-231-27/+45
|\|
| * catch security exception when user prevents access to address bookDaniel Gultsch2016-01-201-27/+45
* | Merge branch 'siacs/master' into developmentChristian S2016-01-133-77/+163
|\|
| * move some ssl socket modifiers into a seperate helper classDaniel Gultsch2016-01-121-0/+62
| * Implement XEP-0368: SRV records for XMPP over TLSmoparisthebest2016-01-111-50/+71
| * ask to be excluded from battery optimizationDaniel Gultsch2016-01-111-27/+29
* | Merge branch 'siacs/master' into developmentChristian S2016-01-101-0/+3
|\|
| * null check in getOriginalPathDaniel Gultsch2016-01-041-0/+3