aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/xmpp/jingle (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-161-1/+2
|\
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-104-5/+6
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-024-55/+55
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-063-9/+12
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-231-3/+5
|\|
| * renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-1913-1997/+0
* | Merge tag '1.5.2' into trz/rebaselookshe2015-08-114-88/+111
|/
* implementation for downloading only when enabled wlanlookshe2015-04-121-2/+2
* set jingle file transfer to offer after iq offer has returnediNPUTmice2015-01-251-6/+17
* keep proper image file extensionDaniel Gultsch2015-01-111-8/+8
* code cleanup for jingle proxy discoveryDaniel Gultsch2015-01-093-99/+71
* mark sent images as sent_received instead of sentDaniel Gultsch2015-01-061-2/+1
* made checks for valid image extensions case insensitiveDaniel Gultsch2015-01-041-1/+1
* Make IqPacket type an enumSam Whited2015-01-043-14/+14
* Fix typo in method nameSam Whited2014-12-293-6/+6
* Make account status an enumSam Whited2014-11-151-1/+1
* better cleanup after unsuccesful transfersiNPUTmice2014-11-153-1/+35
* fixed description in notifications and conversation overviewiNPUTmice2014-11-151-3/+10
* fixed resending for files as welliNPUTmice2014-11-151-0/+1
* made file transfers cancelableiNPUTmice2014-11-153-20/+48
* progress for ibb transfersiNPUTmice2014-11-154-13/+25
* some mime and pgp fixes for file transferiNPUTmice2014-11-151-1/+20
* support for pgp filesiNPUTmice2014-11-151-0/+2
* progress for http images as well. fixed open button for sent filesiNPUTmice2014-11-151-2/+6
* bug fixes and various improvements for file transferiNPUTmice2014-11-151-7/+4
* basic arbitrary file transferiNPUTmice2014-11-152-55/+84
* more refactoring for presence selection. removed getTo, getFrom and getJid fr...iNPUTmice2014-11-101-1/+1
* Rework `Account.getJid()' to return full JIDsSam Whited2014-11-093-14/+14
* refactored code to always contain full jid for counterpartiNPUTmice2014-11-091-1/+1
* Update more files to use JID objectsSam Whited2014-11-095-40/+52
* Merge branch 'gradle' into developmentSam Whited2014-10-302-16/+13
* Make conversations the root projectSam Whited2014-10-2213-0/+1873