|
Merge 0.7->trunk
|
Matthew Wild |
Tue, 30 Mar 2010 19:48:04 +0100 |
|
Merge 0.7/waqas->0.7/MattJ
|
Matthew Wild |
Tue, 30 Mar 2010 19:46:53 +0100 |
|
net.server_event: Fixed spelling fail.
|
Waqas Hussain |
Fri, 26 Mar 2010 08:24:29 +0500 |
|
Merge 0.6->0.7
|
Matthew Wild |
Tue, 30 Mar 2010 19:45:56 +0100 |
|
xmppserver_listener: Compatibility fix for older Prosodies with the s2s xmlns bug
|
Matthew Wild |
Tue, 30 Mar 2010 19:44:50 +0100 |
|
stanza_router, s2smanager, modulemanager: Fix for handling of the default namespace on stanzas, causing sometimes jabber:client to be sent over s2s, and accepted
|
Matthew Wild |
Tue, 30 Mar 2010 19:40:16 +0100 |
|
Merge 0.7->trunk
|
Matthew Wild |
Thu, 25 Mar 2010 19:40:38 +0000 |
|
tools/erlparse: Discard erlang PIDs instead of choking on them as a syntax error
|
Matthew Wild |
Thu, 25 Mar 2010 19:34:41 +0000 |
|
tools/erlparse: Report the line number when showing a syntax error in the input file
|
Matthew Wild |
Thu, 25 Mar 2010 19:34:05 +0000 |
|
tools/erlparse: Optimisations aplenty for faster processing of large files
|
Matthew Wild |
Thu, 25 Mar 2010 19:32:35 +0000 |
|
Merge 0.7->trunk
|
Matthew Wild |
Thu, 25 Mar 2010 18:53:17 +0000 |
|
tools/ejabberd2prosody: Create prosody singleton so datamanager can detect the platform (set no platform to use lfs, pposix isn't necessary here)
|
Matthew Wild |
Thu, 25 Mar 2010 18:52:34 +0000 |
|
Merge 0.7->trunk
|
Matthew Wild |
Thu, 25 Mar 2010 12:33:45 +0000 |
|
net.server_event: Don't re-try a write if the connection closed (thanks Flo)
|
Matthew Wild |
Thu, 25 Mar 2010 12:32:25 +0000 |
|
Merge 0.7->trunk
|
Matthew Wild |
Wed, 24 Mar 2010 22:48:12 +0000 |
|
net.server_event: Bump timeout values up somewhat
|
Matthew Wild |
Wed, 24 Mar 2010 22:46:57 +0000 |
|
Merge 0.7->trunk
|
Matthew Wild |
Wed, 24 Mar 2010 22:41:43 +0000 |
|
Merge 0.7/waqas->0.7/MattJ
|
Matthew Wild |
Wed, 24 Mar 2010 22:40:53 +0000 |
|
util.sasl.digest-md5: Removed unnnecessary check (which included a nil global access).
|
Waqas Hussain |
Wed, 24 Mar 2010 00:07:17 +0500 |
|
mod_register: Use set_password to set passwords instead of create_user.
|
Waqas Hussain |
Wed, 24 Mar 2010 00:05:55 +0500 |
|
usermanager: Added function set_password.
|
Waqas Hussain |
Wed, 24 Mar 2010 00:03:31 +0500 |
|
Merge 0.6->0.7
|
Matthew Wild |
Wed, 24 Mar 2010 22:34:59 +0000 |
|
mod_tls: Add s2s_allow_encryption option which, when set to false, disabled TLS for s2s
|
Matthew Wild |
Wed, 24 Mar 2010 20:00:22 +0000 |
|
prosody.cfg.lua.dist: Whitespace fix.
|
Waqas Hussain |
Tue, 23 Mar 2010 20:55:28 +0500 |
|
prosody.cfg.lua.dist: Disable mod_privacy by default.
|
Waqas Hussain |
Tue, 23 Mar 2010 20:48:57 +0500 |
|
usermanager: Return sane errors/results when Cyrus SASL is in use.
|
Waqas Hussain |
Tue, 23 Mar 2010 20:24:56 +0500 |
|
mod_saslauth: Tidier code for SASL backend selection.
|
Waqas Hussain |
Tue, 23 Mar 2010 20:17:46 +0500 |
|
mod_saslauth: Fail with an error when the requested SASL backend cannot be used.
|
Waqas Hussain |
Tue, 23 Mar 2010 20:11:39 +0500 |
|
Merge 0.7->trunk
|
Matthew Wild |
Mon, 22 Mar 2010 17:26:12 +0000 |
|
Merge 0.6->0.7
|
Matthew Wild |
Mon, 22 Mar 2010 17:24:55 +0000 |
|
util.windows: Convert from Windows line endings
|
Matthew Wild |
Mon, 22 Mar 2010 17:16:28 +0000 |
|
Update copyright headers for 2010
|
Matthew Wild |
Mon, 22 Mar 2010 17:06:15 +0000 |
|
loggingmanager: Don't use non-standard format specifier to format the timestamp.
|
Waqas Hussain |
Mon, 22 Mar 2010 21:58:38 +0500 |
|
util.xmppstream: new() now returns a parser object
|
Matthew Wild |
Mon, 22 Mar 2010 16:55:10 +0000 |
|
util.xmppstream: Initial commit
|
Matthew Wild |
Mon, 22 Mar 2010 16:24:49 +0000 |
|
Merge 0.7->trunk
|
Matthew Wild |
Mon, 22 Mar 2010 15:05:35 +0000 |
|
stanza_router: Don't send error replies for stanzas of type 'error' and 'result' on unbound authenticated connections. [originally fa84451e9b35 in 0.6]
|
Waqas Hussain |
Mon, 22 Mar 2010 15:05:05 +0000 |
|
stanza_router: Allow non-jabber:client elements after auth, before bind. [originally 2c538d4bde13 in 0.6]
|
Waqas Hussain |
Mon, 22 Mar 2010 15:04:22 +0000 |
|
Merge 0.7->trunk
|
Matthew Wild |
Mon, 22 Mar 2010 14:59:03 +0000 |
|
sessionmanager, s2smanager: Add type of ?2s_destroyed to resting sessions (fixes a logging traceback, thanks Flo)
|
Matthew Wild |
Mon, 22 Mar 2010 14:58:25 +0000 |
|
Merge 0.7->trunk
|
Matthew Wild |
Mon, 22 Mar 2010 14:38:01 +0000 |
|
mod_groups: Ignore whitespace on group member JID lines (thanks Luis!)
|
Matthew Wild |
Mon, 22 Mar 2010 14:36:53 +0000 |
|
mod_groups: Fixes to make compatible with roster versioning - set version to 'true' to indicate that the roster is not being versioned
|
Matthew Wild |
Mon, 22 Mar 2010 14:35:02 +0000 |
|
mod_groups: Missed hunk from last commit, don't create the list of public group members unless necessary
|
Matthew Wild |
Mon, 22 Mar 2010 14:33:38 +0000 |
|
mod_groups: Only create group lists when necessary (now we can reliably detect when a user is in /any/ group, including public ones)
|
Matthew Wild |
Mon, 22 Mar 2010 14:32:23 +0000 |
|
rostermanager: Don't bump the roster version if it is == true (ie. we are not versioning the roster)
|
Matthew Wild |
Mon, 22 Mar 2010 14:28:25 +0000 |
|
mod_roster: Tidier code for the roster versioning logic
|
Matthew Wild |
Mon, 22 Mar 2010 01:54:22 +0000 |
|
mod_roster: Tidier code for the roster versioning logic
|
Matthew Wild |
Mon, 22 Mar 2010 01:54:22 +0000 |
