vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Smack/smack-extensions/src/main/java/org/jivesoftware/smackx
History
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
..
address Merge branch '4.0' 2014-07-05 14:37:22 +02:00
amp Use jxmpp-core (0.1.0-alpha1-SNAPSHOT) 2014-06-01 12:24:30 +02:00
attention/packet Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
bookmarks Properly escape Bookmarks and FormField XML 2014-06-19 16:52:19 +02:00
bytestreams Introduce packet.Element 2014-07-05 11:59:45 +02:00
caps Merge branch '4.0' 2014-07-05 14:37:22 +02:00
chatstates Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
commands Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
delay Remove decorators for "Legacy Delayed Delivery" 2014-07-01 23:29:45 +02:00
disco Introduce packet.Element 2014-07-05 11:59:45 +02:00
filetransfer Merge branch '4.0' 2014-07-05 14:37:22 +02:00
forward Remove decorators for "Legacy Delayed Delivery" 2014-07-01 23:29:45 +02:00
iqlast Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
iqprivate Merge branch '4.0' 2014-07-05 14:37:22 +02:00
iqversion Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
jiveproperties Extend JivePropertiesManager 2014-04-28 20:23:26 +02:00
muc Merge branch '4.0' 2014-07-05 14:37:22 +02:00
nick/packet Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
offline Use new PacketExtensionFilter constructor 2014-06-10 18:54:53 +02:00
pep Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
ping Fix PingManager, use 'nextPingIn' to schedule 2014-06-12 18:43:51 +02:00
privacy Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
pubsub Merge branch '4.0' 2014-07-05 14:37:22 +02:00
receipts Make XMPPConnection an interface 2014-05-28 08:18:41 +02:00
search Merge branch '4.0' 2014-07-05 14:37:22 +02:00
sharedgroups Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
shim Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
si Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
time Change IQ.Type to enum 2014-06-06 21:10:13 -03:00
vcardtemp Merge branch '4.0' 2014-07-05 14:37:22 +02:00
xdata Properly escape Bookmarks and FormField XML 2014-06-19 16:52:19 +02:00
xevent MessageEventManager's PacketFilter should ignore error type messages 2014-06-10 18:56:50 +02:00
xhtmlim Merge branch '4.0' 2014-07-05 14:37:22 +02:00