aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/xmpp (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'siacs/master' into developmentChristian S2016-02-142-31/+50
|\
| * 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 remote-tracking branch 'siacs/master' into developmentChristian S2016-02-042-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
* | | Merge branch 'siacs/master'Christian S2016-01-313-7/+31
|\| |
| * | 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
* | Merge branch 'siacs/master' into developmentChristian S2016-01-233-3/+20
|\|
| * 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
* | Merge branch 'siacs/master' into developmentChristian S2016-01-171-0/+8
|\|
| * reuse same xmppconnection for reconnectsDaniel Gultsch2016-01-161-0/+8
* | Merge branch 'siacs/master' into developmentChristian S2016-01-161-12/+27
|\|
| * nimbuzz.com: don't wait for disco replies to set account to onlineDaniel Gultsch2016-01-151-11/+26
* | Merge branch 'siacs/master' into developmentChristian S2016-01-131-69/+109
|\|
| * 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
* | copy commitsChristian S2015-12-181-128/+122
|\|
| * throw exception at the end of the streamDaniel Gultsch2015-12-171-128/+122
* | copy commitsChristian S2015-12-161-8/+43
|\|
| * 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
* | wait with status change to online after all disco queries have been madeDaniel Gultsch2015-12-121-5/+14
* | request storage permission when needed on Android 6.0Daniel Gultsch2015-12-121-1/+2
* | add error state for unavailable tor networkDaniel Gultsch2015-12-041-6/+2
* | refactored socks5 connection code. make jingle transport use that new codeDaniel Gultsch2015-12-042-52/+19
* | do socks5 connect manuallyDaniel Gultsch2015-12-041-14/+34
* | initial tor supportDaniel Gultsch2015-12-042-6/+18
* | copy commitsChristian S2015-11-295-6/+48
|\|
| * hide subject edit button if not editable by userDaniel Gultsch2015-11-261-0/+4
| * detect server identity and added muc-workaround for slackDaniel Gultsch2015-11-261-2/+34
| * removed unecessary chat stateDaniel Gultsch2015-11-261-1/+1
| * fail jingle file transfer if axolotl key message could not be created. fixes ...Daniel Gultsch2015-11-261-1/+5
| * pgp fixes and revert configuration changesDaniel Gultsch2015-11-253-2/+4
* | Merge pull request #47 from siacs/masterChristian S2015-11-011-1/+0
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 19:49:07 +0000