aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Imports organizedsteckbrief2016-02-121-5/+0
* Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-8/+8
|\
| * request stanza count after every ibb data stanza to not fill our own stanza q...Daniel Gultsch2015-09-301-0/+1
| * introduce special iq type for internal timeouts. always use != result to chec...Daniel Gultsch2015-08-231-1/+1
| * enable axolotl encryption for jingle supported file transfersDaniel Gultsch2015-08-011-7/+3
| * use gcm for file encryption over httpDaniel Gultsch2015-07-291-2/+2
| * Optimize importsAndreas Straub2015-07-201-3/+3
| * increased ibb block sizeDaniel Gultsch2015-07-171-3/+1
| * properly calculate remaining size. should fix #1243Daniel Gultsch2015-06-031-2/+7
| * always log reason for failed file transferDaniel Gultsch2015-05-141-2/+6
| * fixed encrypted ibb file transfer which was broken with ART. fixes #1172Daniel Gultsch2015-05-071-25/+32
| * cleaned up file handlingDaniel Gultsch2015-04-251-0/+3
| * some bug fixes concerning 0byte files. fixes #1126iNPUTmice2015-04-151-0/+1
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-101-1/+1
|\ \
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-021-7/+7
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-061-2/+4
|\| |
| * | renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-191-224/+0
| |/
* / Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1lookshe2015-08-111-26/+44
|/
* Make IqPacket type an enumSam Whited2015-01-041-7/+7
* Fix typo in method nameSam Whited2014-12-291-3/+3
* better cleanup after unsuccesful transfersiNPUTmice2014-11-151-1/+15
* made file transfers cancelableiNPUTmice2014-11-151-4/+14
* progress for ibb transfersiNPUTmice2014-11-151-6/+16
* Update more files to use JID objectsSam Whited2014-11-091-7/+6
* Make conversations the root projectSam Whited2014-10-221-0/+191