aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/xmpp (follow)
Commit message (Expand)AuthorAgeFilesLines
* FS#169 - Merge Conversations 1.11.2 into Conversations+ devlookshe2016-03-252-6/+8
|\
| * allow to delete attachments. fixes #1539Daniel Gultsch2016-03-231-4/+1
| * only add image files to media scannerDaniel Gultsch2016-03-231-3/+1
| * be more careful to avoid creating multiple connectionsDaniel Gultsch2016-03-201-3/+7
* | Merge tag '1.11.1' into trz/merge_1.11.1lookshe2016-03-171-2/+2
|\|
| * log reason for bind failureDaniel Gultsch2016-03-111-2/+2
* | removed duplicated sourcelookshe2016-03-121-21/+10
* | Added method to get body from message if hasMeCommand and harmonized extracti...lookshe2016-03-121-20/+27
* | Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-081-4/+4
|\|
| * add a few more know file extensionsDaniel Gultsch2016-03-041-3/+3
| * refactored omemo to take multiple recipientsDaniel Gultsch2016-02-291-1/+1
* | Fixes FS#151 - Missing button on image-linkslookshe2016-03-071-1/+2
* | Fixes FS#146: Remove Tor-Supportsteckbrief2016-03-022-22/+5
* | Fixed merge issue for resolving FS#47 (preferences involved in the decision f...steckbrief2016-02-241-1/+1
* | Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-222-31/+54
|\|
| * fixed regression that caused messages in muc not being sendDaniel Gultsch2016-02-171-1/+1
| * optional mode to close tcp connection when going into backgroundDaniel Gultsch2016-02-141-20/+38
| * send push enable to server. simplified loggingDaniel Gultsch2016-02-131-2/+7
| * client side support for XEP-0357: Push NotificationsDaniel Gultsch2016-02-121-9/+5
* | Merge tag '1.9.4' into trz/merge_1.9.4lookshe2016-02-162-50/+49
|\|
| * use TLSv1.2 as SSL context on supported plattformsDaniel Gultsch2016-02-031-1/+1
| * cache server capsDaniel Gultsch2016-02-032-2/+18
| * Merge branch 'disco-caps' of https://github.com/singpolyma/Conversations into...Daniel Gultsch2016-02-021-47/+30
| |\
| | * Factor out a representation of XEP-0030 resultsStephen Paul Weber2016-01-231-47/+30
* | | Imports organizedsteckbrief2016-02-126-39/+2
* | | Simplification of DNS requests.steckbrief2016-02-121-63/+48
* | | Compilation errors and merge mixups fixedsteckbrief2016-02-111-0/+1
* | | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-1120-512/+1031
|\| |
| * | be more careful with resetting the stream idDaniel Gultsch2016-01-291-2/+1
| * | show values in formfieldwrappers and allow form to be set to read onlyDaniel Gultsch2016-01-261-3/+3
| * | expert setting to trigger extended connection optionsDaniel Gultsch2016-01-251-2/+11
| * | added FormWrapper and form field validationDaniel Gultsch2016-01-231-0/+15
| |/
| * reset stanza queue when resetting xmppconnectionDaniel Gultsch2016-01-231-0/+1
| * added UI wrapper for (some) form fieldsDaniel Gultsch2016-01-222-1/+17
| * added config variable to allow non-tls connectionsDaniel Gultsch2016-01-221-2/+3
| * reuse same xmppconnection for reconnectsDaniel Gultsch2016-01-161-0/+8
| * nimbuzz.com: don't wait for disco replies to set account to onlineDaniel Gultsch2016-01-151-11/+26
| * throw security exception instead of going to next srv entryDaniel Gultsch2016-01-121-1/+3
| * move some ssl socket modifiers into a seperate helper classDaniel Gultsch2016-01-121-56/+5
| * Implement XEP-0368: SRV records for XMPP over TLSmoparisthebest2016-01-111-54/+149
| * reworked that loop that iterates over various serversDaniel Gultsch2016-01-111-16/+10
| * throw exception at the end of the streamDaniel Gultsch2015-12-171-128/+122
| * timeout service discovery after 20sDaniel Gultsch2015-12-151-7/+42
| * wait with status change to online after all disco queries have been madeDaniel Gultsch2015-12-091-5/+14
| * request storage permission when needed on Android 6.0Daniel Gultsch2015-12-071-1/+2
| * add error state for unavailable tor networkDaniel Gultsch2015-12-011-6/+2
| * refactored socks5 connection code. make jingle transport use that new codeDaniel Gultsch2015-12-012-52/+19
| * do socks5 connect manuallyDaniel Gultsch2015-12-011-14/+34
| * initial tor supportDaniel Gultsch2015-12-012-6/+18
| * hide subject edit button if not editable by userDaniel Gultsch2015-11-261-0/+4