1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-06-18 09:24:49 +02:00
Smack/smack-extensions/src/test/java/org/jivesoftware/smackx
Florian Schmaus 7735a5224c Merge branch '4.0'
Conflicts:
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java
	smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java
	smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListenerTest.java
	smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java
2014-07-14 14:31:09 +02:00
..
amp Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
bytestreams Merge branch '4.0' 2014-07-14 14:31:09 +02:00
caps Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
delay/provider Remove decorators for "Legacy Delayed Delivery" 2014-07-01 23:29:45 +02:00
filetransfer Properly escape Bookmarks and FormField XML 2014-06-19 16:52:19 +02:00
forward Improve parsing. Add method for de-serializing Strings 2014-05-28 08:18:44 +02:00
iqlast Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
iqversion Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
jiveproperties Improve parsing. Add method for de-serializing Strings 2014-05-28 08:18:44 +02:00
muc Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
ping Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
privacy/provider Improve parsing. Add method for de-serializing Strings 2014-05-28 08:18:44 +02:00
pubsub Use CharSequence instead of String in parseContent() 2014-07-06 21:10:40 +02:00
receipts Improve parsing. Add method for de-serializing Strings 2014-05-28 08:18:44 +02:00
time/packet Improve parsing. Add method for de-serializing Strings 2014-05-28 08:18:44 +02:00
xhtmlim/provider Use CharSequence instead of String in parseContent() 2014-07-06 21:10:40 +02:00
ExtensionsInitializerTest.java Reworked OSGi support of Smack (SMACK-343) 2014-05-15 16:09:37 +02:00
InitExtensions.java Reworked OSGi support of Smack (SMACK-343) 2014-05-15 16:09:37 +02:00
VCardUnitTest.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00