aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/xmpp (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-10-204-22/+14
|\
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-05-092-9/+10
|\|
* | Merge tag '1.11.7' into trz/merge_1.11.7lookshe2016-04-171-59/+84
|\ \
| * | republish avatar if server offers non-persistent pep :-(Daniel Gultsch2016-04-111-7/+9
| * | 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
| * | 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
| * | 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 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-061-1/+2
|\ \ \ | | |/ | |/|
* | | Merge tag '1.11.3' into trz/rebaselookshe2016-04-053-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
* | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 12:06:25 +0000