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/main/java/org/jivesoftware/smackx/pubsub
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
..
listener Enable more 'checkstyle' checks 2014-08-15 23:17:45 +02:00
packet Merge branch '4.1' 2015-03-04 22:42:36 +01:00
provider Rename PacketFilter (and implementing classes) and PacketExtension 2015-02-28 13:49:38 +01:00
util Rename 'Packet' class to 'Stanza' 2015-02-06 09:34:51 +01:00
AccessModel.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
Affiliation.java Rename PacketFilter (and implementing classes) and PacketExtension 2015-02-28 13:49:38 +01:00
AffiliationsExtension.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
ChildrenAssociationPolicy.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
CollectionNode.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
ConfigurationEvent.java Rename PacketFilter (and implementing classes) and PacketExtension 2015-02-28 13:49:38 +01:00
ConfigureForm.java Make DataForm type an enum 2015-01-10 20:10:46 +01:00
ConfigureNodeFields.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
EmbeddedPacketExtension.java Rename PacketFilter (and implementing classes) and PacketExtension 2015-02-28 13:49:38 +01:00
EventElement.java Rename PacketFilter (and implementing classes) and PacketExtension 2015-02-28 13:49:38 +01:00
EventElementType.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
FormNode.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
FormNodeType.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
GetItemsRequest.java Remove duplicate code in pubusb LeafNode 2014-09-21 20:49:11 +02:00
Item.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
ItemDeleteEvent.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
ItemPublishEvent.java Enable more 'checkstyle' checks 2014-08-15 23:17:45 +02:00
ItemReply.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
ItemsExtension.java Rename PacketFilter (and implementing classes) and PacketExtension 2015-02-28 13:49:38 +01:00
LeafNode.java Merge branch '4.1' 2015-03-04 22:42:36 +01:00
Node.java Merge branch '4.1' 2015-03-04 22:42:36 +01:00
NodeEvent.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
NodeExtension.java Rename PacketFilter (and implementing classes) and PacketExtension 2015-02-28 13:49:38 +01:00
NodeType.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
OptionsExtension.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
PayloadItem.java Rename PacketFilter (and implementing classes) and PacketExtension 2015-02-28 13:49:38 +01:00
PresenceState.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
PublishItem.java Enable more 'checkstyle' checks 2014-08-15 23:17:45 +02:00
PublishModel.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
PubSubElementType.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
PubSubManager.java Merge branch '4.1' 2015-03-04 22:42:36 +01:00
RetractItem.java Rename PacketFilter (and implementing classes) and PacketExtension 2015-02-28 13:49:38 +01:00
SimplePayload.java Rename PacketFilter (and implementing classes) and PacketExtension 2015-02-28 13:49:38 +01:00
SubscribeExtension.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
SubscribeForm.java Make DataForm type an enum 2015-01-10 20:10:46 +01:00
SubscribeOptionFields.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
Subscription.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
SubscriptionEvent.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
SubscriptionsExtension.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
UnsubscribeExtension.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00