aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/xmpp (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge tag '1.12.4' into trz/merge_1.12.4 (not tested yet)trz/merge_1.12.4lookshe2016-05-262-40/+54
|\
| * access disco over caching mechanism instead of querying dbDaniel Gultsch2016-05-191-1/+1
| * also save form elements in disco storageDaniel Gultsch2016-05-191-1/+1
| * cap exponential backoff at 300s (10 attempts)Daniel Gultsch2016-05-161-1/+1
| * show presence of other resources as templateDaniel Gultsch2016-05-131-4/+2
| * interrupt XMPPConnection ThreadDaniel Gultsch2016-05-121-0/+9
| * don’t let attempt count fall below zeroDaniel Gultsch2016-05-101-1/+1
| * report host-account as account state in UIDaniel Gultsch2016-05-101-3/+9
| * fix logging wrong variable for failed resumeDaniel Gultsch2016-05-081-1/+1
| * check for h attribute in 'failed' nonzaDaniel Gultsch2016-05-081-3/+9
| * report bind failure as account stateDaniel Gultsch2016-05-051-8/+9
| * log more information about HTTP’s max upload sizeDaniel Gultsch2016-05-051-1/+6
| * refactor captcha response handling to avoid network on main thread exceptionDaniel Gultsch2016-05-051-31/+18
| * spelling fixesklemens2016-05-042-3/+3
* | 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.4trz/merge_1.9.4lookshe2016-02-162-50/+49
|\| |
| * | use TLSv1.2 as SSL context on supported plattformsDaniel Gultsch2016-02-031-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 06:14:42 +0000