aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Imports organizedsteckbrief2016-02-121-4/+0
* Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-1/+5
|\
| * pgp fixes and revert configuration changesDaniel Gultsch2015-11-251-1/+1
| * Optimize importsAndreas Straub2015-07-201-3/+5
| * renamed downloadable to transferableDaniel Gultsch2015-07-101-3/+2
| * initial http upload supportDaniel Gultsch2015-06-291-4/+4
| * let jingle connection and manager handle message statusDaniel Gultsch2015-05-161-0/+6
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-101-1/+3
|\ \
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-021-3/+3
|\| |
| * | renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-191-164/+0
| |/
* / Merge tag '1.5.2' into trz/rebaselookshe2015-08-111-5/+10
|/
* code cleanup for jingle proxy discoveryDaniel Gultsch2015-01-091-45/+31
* Make IqPacket type an enumSam Whited2015-01-041-2/+2
* Fix typo in method nameSam Whited2014-12-291-1/+1
* progress for ibb transfersiNPUTmice2014-11-151-0/+4
* Rework `Account.getJid()' to return full JIDsSam Whited2014-11-091-3/+3
* Update more files to use JID objectsSam Whited2014-11-091-6/+12
* Merge branch 'gradle' into developmentSam Whited2014-10-301-2/+7
* Make conversations the root projectSam Whited2014-10-221-0/+163
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 03:42:16 +0000