Commit graph

8 commits

Author SHA1 Message Date
Daniel Gultsch 0a48f777ac code cleanup for jingle proxy discovery 2015-01-09 14:42:58 +01:00
Sam Whited eb7e683403 Make IqPacket type an enum 2015-01-04 08:20:30 -05:00
Sam Whited b48bddb852 Fix typo in method name 2014-12-29 14:21:20 -05:00
iNPUTmice af2922adea progress for ibb transfers 2014-11-15 15:34:12 +01:00
Sam Whited 180a0e4408 Rework `Account.getJid()' to return full JIDs
Remove `Account.getFullJid()'
2014-11-09 10:57:22 -05:00
Sam Whited f15900426d Update more files to use JID objects 2014-11-09 07:00:40 -05:00
Sam Whited 46f147a82c Merge branch 'gradle' into development
Conflicts:
	.gitignore
	CHANGELOG.md
	README.md
	libs/MemorizingTrustManager
	libs/minidns
	libs/openpgp-api-lib
2014-10-30 15:33:13 -04:00
Sam Whited 281ce3105f Make conversations the root project 2014-10-22 15:47:11 -04:00
Renamed from conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java (Browse further)