1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-06-23 20:04:51 +02:00
Smack/smack-extensions/src/test/java/org/jivesoftware/smackx
Florian Schmaus 94a16ba41e Merge branch '4.0'
Conflicts:
	build.gradle
	documentation/connections.html
	documentation/gettingstarted.html
	smack-core/src/main/java/org/jivesoftware/smack/SmackException.java
	smack-core/src/test/java/org/jivesoftware/smack/parsing/ParsingExceptionTest.java
	smack-core/src/test/java/org/jivesoftware/smack/test/util/TestUtils.java
	smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java
	smack-tcp/src/main/java/org/jivesoftware/smack/tcp/PacketReader.java
2014-07-05 14:37:22 +02:00
..
amp Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
bytestreams Introduce packet.Element 2014-07-05 11:59:45 +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 Improve parsing. Add method for de-serializing Strings 2014-05-28 08:18:44 +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 Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +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