aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.7->trunkMatthew Wild2010-05-053-28/+100
|\
| * mod_proxy65: Send error reply to activation stanza if one or both parties wer...Matthew Wild2010-05-051-0/+10
| * mod_proxy65: Return service-unavailable error when receiving an iq we didn't ...Matthew Wild2010-05-051-0/+3
| * mod_proxy65: Use new server.link to link proxied connections, now works with ...Matthew Wild2010-05-051-24/+4
| * net.server_select, net.server_event: Add server.link() to link 2 connections ...Matthew Wild2010-05-052-0/+44
| * net.server_select, net.server_event: Support for ondrain listener callback fo...Matthew Wild2010-05-052-1/+9
| * net.server_select, net.server_event: Rename :pattern() method to :set_mode() ...Matthew Wild2010-05-052-2/+9
| * net.server_select, net.server_event: Support for :pause() and :resume() on co...Matthew Wild2010-05-052-1/+21
* | usermanager: Give the default auth provider a name, you'll never guess what i...Matthew Wild2010-05-051-1/+1
* | Merge Tobias's fancy SASL branch->trunkMatthew Wild2010-05-056-83/+142
|\ \
| * \ Merge with tip.Tobias Markmann2010-03-1211-73/+84
| |\ \
| * | | util.sasl: 2009 -> 2010 in copyright header.Tobias Markmann2010-03-126-5/+8
| * | | util.sasl.scram: Adjusting authentication backend name to conform with the st...Tobias Markmann2010-02-281-2/+2
| * | | util.sasl.plain: Adding plain_hashed authentication backend support.Tobias Markmann2010-02-281-1/+10
| * | | util.sasl.scram: Adding documentation on SCRAM authentication backend.Tobias Markmann2010-02-281-0/+10
| * | | util.sasl.anonymous: Adding documentation on anonymous authentication backend.Tobias Markmann2010-02-281-0/+10
| * | | util.sasl: Moving SASL authentication backends documentation to the mechanism...Tobias Markmann2010-02-283-21/+30
| * | | util.sasl: Abstracting out the hash function used since SCRAM is independent ...Tobias Markmann2010-02-281-57/+75
* | | | Merge 0.7->trunkMatthew Wild2010-05-051-1/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | net.server_event: Be sure to fire onincoming for backwards-compatibility with...Matthew Wild2010-05-051-1/+2
* | | | usermanager: Support for pluggable authentication providersMatthew Wild2010-05-051-48/+83
* | | | eventmanager, prosody: Adapt eventmanager to use prosody.events, as a step to...Matthew Wild2010-05-042-22/+9
* | | | Merge 0.7->trunk (with MUC needing checking, waqas)Matthew Wild2010-05-044-126/+147
|\| | |
| * | | Merge 0.6 into 0.7.Waqas Hussain2010-05-014-129/+118
| |\ \ \
| | * | | Tagging 0.6.2Matthew Wild2010-04-140-0/+0
| | * | | prosody.cfg.lua.dist: Refactor the default config file based on feedback from...vault/0.6.20.6.2Matthew Wild2010-04-141-88/+82
| | * | | hostmanager: Re-word log messages in line with config changesMatthew Wild2010-04-141-3/+3
| | * | | configmanager: Add VirtualHost as an alias for HostMatthew Wild2010-04-141-3/+3
| | * | | MUC: Allow moderators which are not owners to change roles.Waqas Hussain2010-04-141-1/+1
| * | | | MUC: Include <status code='100'/> in a message, not in presence. Fixes variou...Waqas Hussain2010-04-191-3/+5
| * | | | modulemanager: Log proper tracebacks on errors during module load/unload.Waqas Hussain2010-04-191-1/+9
| * | | | prosody: Set metatable on functions to allow easy access to upvalues.Waqas Hussain2010-04-191-0/+24
* | | | | configmanager: Fix very wacky indentationMatthew Wild2010-05-041-10/+13
* | | | | configmanager: Fix some wacky indentationMatthew Wild2010-05-041-4/+5
* | | | | Merge 0.7->trunkMatthew Wild2010-04-111-2/+2
|\| | | |
| * | | | net.server_event: Call listener.onconnect if it exists, otherwise stick to li...Matthew Wild2010-04-111-2/+2
* | | | | Merge 0.7->trunkMatthew Wild2010-04-111-1/+10
|\| | | |
| * | | | net.server_select: Support for listener.onconnectMatthew Wild2010-04-111-1/+10
* | | | | Merge 0.7->trunkMatthew Wild2010-04-091-1/+1
|\| | | |
| * | | | Merge 0.6->0.7Matthew Wild2010-04-091-1/+1
| |\| | |
| | * | | net.server: Fix logic error causing traceback when receiving a non-number portMatthew Wild2010-04-091-1/+1
* | | | | loggingmanager: Fix syntax error :)Matthew Wild2010-04-071-1/+1
* | | | | Merge 0.7->trunkMatthew Wild2010-04-071-2/+3
|\| | | |
| * | | | util.timer: When using libevent hold onto the event handle to stop it being c...Matthew Wild2010-04-071-2/+3
* | | | | loggingmanager: Observe 'debug' config setting for console logging tooMatthew Wild2010-04-071-1/+1
* | | | | Merge 0.7->trunkMatthew Wild2010-04-033-5/+5
|\| | | |
| * | | | Merge 0.6->0.7Matthew Wild2010-04-033-5/+5
| |\| | |
| | * | | Merge 0.6/MattJ -> 0.6Matthew Wild2010-04-033-6/+8
| | |\ \ \
| | | * | | util.ztact: Fixed global accesses.Waqas Hussain2010-04-011-2/+2
| | | * | | util.uuid: Use a local instead of a global.Waqas Hussain2010-04-011-1/+1