1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-23 04:22:05 +01:00
Smack/source/org/jivesoftware/smackx
Florian Schmaus f8274dda53 Merge branch smack_3_3_2 and trunk
as the state of the both branches of Smack's SVN repository
http://fisheye.igniterealtime.org/browse/smack on 2013-12-30.

Conflicts:
	documentation/extensions/caps.html
	source/org/jivesoftware/smack/PacketReader.java
	source/org/jivesoftware/smack/SmackConfiguration.java
	source/org/jivesoftware/smack/parsing/ParsingExceptionCallback.java
	source/org/jivesoftware/smackx/ServiceDiscoveryManager.java
2013-12-30 01:29:55 +01:00
..
bookmark SMACK-279: The XMPPConnection extends the new abstract Connection class 2010-02-09 11:55:56 +00:00
bytestreams SMACK-458 Managers should be kept on disconnects 2013-10-26 11:17:16 +00:00
commands SMACK-462 Use getInstace() ConnectionCreationListener 2013-11-03 21:49:58 +00:00
debugger SMACK-363 Applied code cleanup patches for many generics related issues. 2012-10-26 10:47:55 +00:00
entitycaps Merge branch smack_3_3_2 and trunk 2013-12-30 01:29:55 +01:00
filetransfer SMACK-430 Re-activated code that throws an exception if createOutgoingFileTransfer() was called with a bare JID 2013-03-22 18:15:06 +00:00
muc SMACK-439 2013-05-17 22:04:31 +00:00
packet Merge branch smack_3_3_2 and trunk 2013-12-30 01:29:55 +01:00
ping SMACK-462 Use getInstace() ConnectionCreationListener 2013-11-03 21:49:58 +00:00
provider SMACK-413 fixed vCard parsing regarding the PHOTO element. Moved vCard test cases to unit-test where appropriate. Added testcases for vCard PHOTO parsing. 2013-03-23 00:30:59 +00:00
pubsub SMACK-455 Fixed improper advance of parser when parsing multiple items in a pubsub message. 2013-10-07 01:38:09 +00:00
receipts SMACK-462 Use getInstace() ConnectionCreationListener 2013-11-03 21:49:58 +00:00
search SMACK-363 Applied code cleanup patches for many generics related issues. 2012-10-26 10:47:55 +00:00
workgroup SMACK-363 Applied code cleanup patches for many generics related issues. 2012-10-26 10:47:55 +00:00
ChatState.java Copyright update. 2007-02-12 00:59:05 +00:00
ChatStateListener.java Copyright update. 2007-02-12 00:59:05 +00:00
ChatStateManager.java SMACK-374 Added patch to fix memory leak. 2012-11-22 02:51:51 +00:00
DefaultMessageEventRequestListener.java Copyright update. 2007-02-12 00:59:05 +00:00
Form.java SMACK-361 Added support for Entity Capabilities. 2013-03-18 08:50:48 +00:00
FormField.java SMACK-361 Some general code cleanup added some missing hashcode methods and added back some removed public API methods (marked as deprecated). 2013-03-31 14:24:50 +00:00
GroupChatInvitation.java Copyright update. 2007-02-12 00:59:05 +00:00
LastActivityManager.java SMACK-345: Improved detection of last activity. Properly synchronized access to lastMessageSent and registerd last activity namespace with ServiceDiscoveryManager. Improved LastActivity Provider 2013-02-14 00:00:54 +00:00
MessageEventManager.java SMACK-363 Applied code cleanup patches for many generics related issues. 2012-10-26 10:47:55 +00:00
MessageEventNotificationListener.java Copyright update. 2007-02-12 00:59:05 +00:00
MessageEventRequestListener.java Copyright update. 2007-02-12 00:59:05 +00:00
MultipleRecipientInfo.java SMACK-352 removed duplicated headers, fixed svn keywords 2013-02-07 19:10:22 +00:00
MultipleRecipientManager.java SMACK-352 removed duplicated headers, fixed svn keywords 2013-02-07 19:10:22 +00:00
NodeInformationProvider.java SMACK-361 Some general code cleanup added some missing hashcode methods and added back some removed public API methods (marked as deprecated). 2013-03-31 14:24:50 +00:00
OfflineMessageHeader.java Copyright update. 2007-02-12 00:59:05 +00:00
OfflineMessageManager.java SMACK-363 Applied code cleanup patches for many generics related issues. 2012-10-26 10:47:55 +00:00
package.html Initial check-in. 2003-08-23 23:08:19 +00:00
PEPListener.java Added a first version of Personal Event Publishing. 2008-10-30 21:29:17 +00:00
PEPManager.java SMACK-279: The XMPPConnection extends the new abstract Connection class 2010-02-09 11:55:56 +00:00
PrivateDataManager.java SMACK-363 Applied code cleanup patches for many generics related issues. 2012-10-26 10:47:55 +00:00
RemoteRosterEntry.java SMACK-363 Applied code cleanup patches for many generics related issues. 2012-10-26 10:47:55 +00:00
ReportedData.java adding Generics to Iterators without 2011-05-30 11:31:02 +00:00
RosterExchangeListener.java SMACK-363 Applied code cleanup patches for many generics related issues. 2012-10-26 10:47:55 +00:00
RosterExchangeManager.java SMACK-363 Applied code cleanup patches for many generics related issues. 2012-10-26 10:47:55 +00:00
ServiceDiscoveryManager.java Merge branch smack_3_3_2 and trunk 2013-12-30 01:29:55 +01:00
SharedGroupManager.java SMACK-352 Changed or removed copyright notices that should not have been attributed to Jive Software. 2013-04-07 19:15:32 +00:00
XHTMLManager.java SMACK-363 Applied code cleanup patches for many generics related issues. 2012-10-26 10:47:55 +00:00
XHTMLText.java SMACK-329 2011-06-01 07:39:05 +00:00