1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-06-19 18:04:49 +02:00
Smack/smack-extensions/src/test/java/org/jivesoftware/smackx
Florian Schmaus 701aa7d9c4 Merge branch '4.1'
Conflicts:
	smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
	smack-core/src/main/java/org/jivesoftware/smack/PacketCollector.java
	smack-core/src/main/java/org/jivesoftware/smack/PacketListener.java
	smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
	smack-core/src/main/java/org/jivesoftware/smack/debugger/SmackDebugger.java
	smack-core/src/main/java/org/jivesoftware/smack/packet/Packet.java
	smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java
	smack-core/src/test/java/org/jivesoftware/smack/ThreadedDummyConnection.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/address/provider/MultipleAddressesProvider.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FaultTolerantNegotiator.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.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/main/java/org/jivesoftware/smackx/pubsub/packet/PubSub.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/VCardManager.java
	smack-extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java
	smack-im/src/main/java/org/jivesoftware/smack/chat/ChatManager.java
	smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSession.java
	smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleProvider.java
	smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/UserID.java
	smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java
	smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
	version.gradle
2015-03-04 22:42:36 +01:00
..
amp Rename PacketFilter (and implementing classes) and PacketExtension 2015-02-28 13:49:38 +01:00
bytestreams Merge branch '4.1' 2015-03-04 22:42:36 +01:00
caps Merge branch '4.1' 2015-03-04 22:42:36 +01:00
delay/provider Change jxmpp version to 0.4.1-alpha2-SNAPSHOT 2014-12-12 11:50:33 +01:00
filetransfer Use Jid (and subclasses) from jxmpp-jid 2015-02-17 16:07:16 +01:00
forward Use Jid (and subclasses) from jxmpp-jid 2015-02-17 16:07:16 +01:00
iqlast Rename 'Packet' class to 'Stanza' 2015-02-06 09:34:51 +01:00
iqversion Use Jid (and subclasses) from jxmpp-jid 2015-02-17 16:07:16 +01:00
jiveproperties Improve parsing. Add method for de-serializing Strings 2014-05-28 08:18:44 +02:00
muc Make DataForm type an enum 2015-01-10 20:10:46 +01:00
ping Use Jid (and subclasses) from jxmpp-jid 2015-02-17 16:07:16 +01:00
privacy/provider Improve privacy parsing and API. Add NumberUtil 2015-01-21 09:50:44 +01:00
pubsub Merge branch '4.1' 2015-03-04 22:42:36 +01:00
receipts Merge branch '4.1' 2015-03-04 22:42:36 +01:00
rsm/provider Add support for XEP-0059: Result Set Management 2014-09-13 12:28:18 +02:00
shim/provider Improve SHIM API 2015-01-02 00:09:30 +01:00
time Add (IQ|PacketExtension)IntrospectionProvider 2014-12-10 11:09:52 +01:00
vcardtemp Move vCard unit test into its own package 2015-02-09 07:35:15 +01:00
xdata/packet Fix DataFormProvider parsing 'fixed' FormFields 2015-01-26 07:54:12 +01:00
xdatalayout/packet Support for XEP-0122: Data Forms Validation. 2014-12-30 02:03:12 +01:00
xdatavalidation Improve privacy parsing and API. Add NumberUtil 2015-01-21 09:50:44 +01:00
xhtmlim/provider Rename PacketFilter (and implementing classes) and PacketExtension 2015-02-28 13:49:38 +01:00
ExtensionsInitializerTest.java Enable OSGi compliance via 'DynamicImport-Package: *' 2015-01-03 13:14:02 +01:00
InitExtensions.java Enable OSGi compliance via 'DynamicImport-Package: *' 2015-01-03 13:14:02 +01:00