aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/xmpp (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-271-7/+14
|\
| * show regitration failed try again later in UIDaniel Gultsch2016-05-241-7/+14
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-202-3/+3
|\|
| * 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
* | show presence of other resources as templateDaniel Gultsch2016-05-131-4/+2
* | interrupt XMPPConnection ThreadDaniel Gultsch2016-05-131-0/+9
* | don’t let attempt count fall below zeroDaniel Gultsch2016-05-131-1/+1
* | report host-account as account state in UIDaniel Gultsch2016-05-131-3/+9
* | fix logging wrong variable for failed resumeDaniel Gultsch2016-05-131-1/+1
* | check for h attribute in 'failed' nonzaDaniel Gultsch2016-05-131-3/+9
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-05-061-9/+15
|\|
| * 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
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-05-051-31/+18
|\|
| * refactor captcha response handling to avoid network on main thread exceptionDaniel Gultsch2016-05-051-31/+18
* | 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