aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/xmpp (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'refs/remotes/siacs/master' into HEADChristian S2016-05-042-3/+3
|\
| * spelling fixesklemens2016-05-042-3/+3
* | added multiple ports to connect to...Christian S2016-04-221-4/+7
* | use IP/port to connect to serverChristian S2016-04-211-1/+11
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-141-7/+9
|\|
| * republish avatar if server offers non-persistent pep :-(Daniel Gultsch2016-04-111-7/+9
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-111-39/+44
|\|
| * don't throw IO exception at end of streamDaniel Gultsch2016-04-101-1/+0
| * moved authentication into seperate method. force close socket before changing...Daniel Gultsch2016-04-101-38/+44
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-091-7/+15
|\|
| * transform nimbuzz workaround into a more general 'waitForDisco' conditionDaniel Gultsch2016-04-091-6/+11
| * add required disco#items query to timeout listDaniel Gultsch2016-04-081-1/+4
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2016-04-041-13/+25
|\|
| * switched around info and items query to avoid race conditionDaniel Gultsch2016-04-041-1/+1
| * made sure the disco#items query has returned before finalizing the bindDaniel Gultsch2016-04-041-12/+24
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2016-04-033-13/+43
|\|
| * check max http file size when attaching filesDaniel Gultsch2016-04-011-2/+15
| * add methods to check max file size for http uploadDaniel Gultsch2016-03-311-8/+21
| * save otr fingerprint in messageDaniel Gultsch2016-03-311-1/+1
| * include form fields into caps hash calculationDaniel Gultsch2016-03-311-4/+8
* | Merge branch 'siacs/master' into developmentChristian S2016-03-261-6/+1
|\|
| * allow to delete attachments. fixes #1539Daniel Gultsch2016-03-231-4/+1
| * only add image files to media scannerDaniel Gultsch2016-03-231-3/+1
* | Merge pull request #80 from siacs/masterChristian S2016-03-201-3/+7
|\|
| * be more careful to avoid creating multiple connectionsDaniel Gultsch2016-03-201-3/+7
* | Merge branch 'siacs/master' into developmentChristian S2016-03-131-2/+2
|\|
| * log reason for bind failureDaniel Gultsch2016-03-111-2/+2
* | Merge branch 'siacs/master' into developmentChristian S2016-03-051-3/+3
|\|
| * add a few more know file extensionsDaniel Gultsch2016-03-041-3/+3
* | Merge branch 'siacs/master' into developmentChristian S2016-03-041-1/+1
|\|
| * refactored omemo to take multiple recipientsDaniel Gultsch2016-02-291-1/+1
* | Merge branch 'siacs/master' into developmentChristian S2016-02-201-1/+1
|\|
| * fixed regression that caused messages in muc not being sendDaniel Gultsch2016-02-171-1/+1
* | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 09:51:45 +0000