Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-27 00:32:07 +01:00
Code Issues Releases Wiki Activity
1718 commits 8 branches 0 tags 34 MiB
Commit graph

1718 commits

This branch
This branch
All branches
Author SHA1 Message Date
rcollier
62ce8e85dd SMACK-362 Added check for no values on form. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12926 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-12-21 14:58:48 +00:00
rcollier
c60184f852 SMACK-343 Added bnd wrap task to build to generate OSGi attributes in the manifest files. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12925 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-12-21 14:27:06 +00:00
rcollier
2115a6b545 Moved the EmbeddedExtensionProvider from smackx to smack, since it is not tied to extensions but is a simple utility for aiding in parsing of custom cabinets. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12922 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-12-19 17:28:57 +00:00
rcollier
298841cf54 Moved the EmbeddedExtensionProvider from smackx to smack, since it is not tied to extensions but is a simple utility for aiding in parsing of custom cabinets. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12921 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-12-19 17:26:47 +00:00
rcollier
be3b4ae9ef Updated url in javadoc. Changed from jabber to xmpp. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12919 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-12-19 15:45:24 +00:00
rcollier
01d444ac78 SMACK-353 Fix thread leak issue. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12918 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-12-19 15:43:52 +00:00
Tim Jentz
e16cb2b4cc SMACK-354 Provide milliseconds in timestamp colum debugwindow 
Applied the smack-354-debug_milliseconds.patch

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12914 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-12-16 13:39:24 +00:00
rcollier
197548b548 SMACK-346 Return correct error code on file transfer refusal 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12860 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-10-09 01:58:56 +00:00
rcollier
55f4eb68be SMACK-349 The correct byte size is now calculated for outgoing ibb streams, taking into account the base64 encoding. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12859 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-10-09 01:38:09 +00:00
rcollier
3b47f94b35 SMACK-263 Applied patch for setting file info for transfer 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12854 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-10-08 03:48:29 +00:00
rcollier
c96be693dc Moved utility class to the core, since it is not extension related and useful for all code. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12598 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-09-21 23:57:34 +00:00
rcollier
3f89df061d Merged the 3.2 branch back into trunk. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12588 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-09-09 01:26:22 +00:00
rcollier
ec66d6ea52 Added a few more tests for pubsub configuration 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12587 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-09-08 21:32:06 +00:00
rcollier
fdd60122d3 SMACK-348 Updated broken links. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12580 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-08-18 03:44:41 +00:00
rcollier
eda09cb3ca SMACK-324 Applied recommended patch to remove improper stanza construction. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12579 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-08-18 03:28:05 +00:00
rcollier
98d03d2d75 Just cleaning up an import used in the javadoc. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12575 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-08-15 01:28:15 +00:00
rcollier
50bf29b122 Updates for Release of 3.2.1 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12557 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-07-04 19:51:43 +00:00
Wolf Posdorfer
87ccd0b1c2 clear all rows button now clears all rows 
patch by lemon

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12548 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-06-29 07:58:13 +00:00
rcollier
402b430291 SMACK-230 Added synchronization since disconnect can be called from multiple threads. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12540 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-06-23 19:55:10 +00:00
rcollier
da5434505b SMACK-129 - Added a property in smack-config file for the default packet collector size and set it much lower than the previous default. Also made the max size for packet collectors configurable from the constructor. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12509 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-06-18 18:18:03 +00:00
Wolf Posdorfer
0c88e19d3b SMACK-273 
if RoomListenerMultiplexor is null also return a new one for this connection

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12441 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-06-01 07:41:17 +00:00
Wolf Posdorfer
a71d8960e8 SMACK-329 
changed <br>-Tag to xhtml compliant <br/>-tag

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12440 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-06-01 07:39:05 +00:00
Wolf Posdorfer
5e8f1c029b adding Generics to Iterators without 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12431 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-05-30 11:31:02 +00:00
Holger Bergunde
a12167ebfc SMACK-338 this should use IBB as fallback protocol if available 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12409 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-05-23 14:11:35 +00:00
Holger Bergunde
3558b1bbcb SMACK-324 removed non base64 char from SASL response packet. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12372 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-05-12 07:32:46 +00:00
rcollier
22d04c26e3 Merge trunk (3.2 release) up to the 3.2 branch for development on 3.2.x releases. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12370 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-05-12 02:06:35 +00:00
rcollier
84c43c4fdd Updated all version info for 3.2 release. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12329 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-05-04 23:41:24 +00:00
rcollier
acd98830b7 Fixed import linked in javadoc 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12306 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-04-29 11:41:12 +00:00
rcollier
8f1d8b50dd Updated the build to use Java 1.6 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12305 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-04-29 02:37:50 +00:00
rcollier
85e5402979 SMACK-330 Added missing node attribute in the item element for pubsub. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12304 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-04-29 02:36:58 +00:00
rcollier
1df6aaadf3 SMACK-330 Added missing node attribute in the item element for pubsub. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12303 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-04-29 02:36:16 +00:00
Holger Bergunde
f90b43a87c SMACK-325 patched the diff to ReconnectionManager manually. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12219 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-03-31 06:35:59 +00:00
rcollier
750cfa64b0 Fixed bug with setting the form value in ConfigureForm.setChildrenAssociationPolicy. It was trying to set a single string value instead of a list. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12213 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-03-30 02:34:21 +00:00
rcollier
2c55c2ac65 SMACK-334 FileTransferNegotiator now passes the correct type in the stream-method variable. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12212 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-03-30 00:43:35 +00:00
rcollier
8a8b8ccd79 SMACK-163 Fixed NPE in accessing form field information. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12200 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-03-29 00:44:38 +00:00
rcollier
9176bf4a83 Added some new tests and disabled a couple that appear to give false negatives. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12196 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-03-28 13:20:27 +00:00
rcollier
0ec7e23666 Updated some javadoc that caused confusion as to the login() behaviour. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12194 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-03-28 13:13:41 +00:00
Wolf Posdorfer
01a1fb7751 added Button to clear "All Packets" Tab 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12152 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-03-21 15:08:48 +00:00
rcollier
2150d07435 Merged the 3.2 Beta branch into trunk. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12107 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-03-14 01:53:42 +00:00
rcollier
67a5e6b98d SMACK-283 Changed the STUNResolver to not use a default server. Thus causing it to fail to initialize if no server is actually configured. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12106 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-03-14 01:04:40 +00:00
Wolf Posdorfer
f21ae88344 reverting r12099 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12102 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-03-11 11:54:11 +00:00
Holger Bergunde
6494edb15a SMACK-317 setOrder() from PrivacyItem is now public. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12100 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-03-11 11:16:05 +00:00
Wolf Posdorfer
4639340c77 adding log4j.properties file into jstun.jar to stop warn4jlog messages 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12099 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-03-11 09:18:58 +00:00
Holger Bergunde
4ada4978d8 SMACK-312 Fire roster listener also when the group name changed 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12087 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-03-10 11:30:53 +00:00
Holger Bergunde
5a544a50e3 SMACK-332 Debugger shows the "right" version: Currently: 3.2.0 Beta 2 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@12086 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-03-10 11:24:51 +00:00
rcollier
74188e6856 Updated version information for creating version 3.2 Beta2 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12032 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-02-24 00:53:05 +00:00
rcollier
5675258eb7 Updated documentation related to using and handling chat messages. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12031 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-02-21 21:23:45 +00:00
rcollier
64d36a52e3 SMACK-328 Added patches to fix threading issue with usage of SimpleDateFormatter. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12030 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-02-21 20:45:00 +00:00
rcollier
75094d0199 SMACK-269 Test cases to support chat lookups. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12029 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-02-21 19:13:16 +00:00
rcollier
1735aa50eb SMACK-269 Added storing links by base and full JID so incoming messages with no thread ID can attempt to match full JID, and then try base JID before creating a new chat. 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12028 b35dd754-fafc-0310-a699-88a17e54d16e
 2011-02-21 18:53:22 +00:00