aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | * util.stanza: Fixed some more nil global accesses.Waqas Hussain2010-04-011-3/+3
| | | * util.stanza: Fixed a nil global access.Waqas Hussain2010-04-011-0/+2
| | * | mod_bosh: Default stanza namespace should be jabber:client (fixes BOSH to wor...Matthew Wild2010-04-031-2/+2
| | |/
* | | Merge 0.7->trunkMatthew Wild2010-03-305-14/+14
|\| |
| * | Merge 0.7/waqas->0.7/MattJMatthew Wild2010-03-301-4/+4
| |\ \
| | * | net.server_event: Fixed spelling fail.Waqas Hussain2010-03-261-4/+4
| * | | Merge 0.6->0.7Matthew Wild2010-03-304-10/+10
| |\ \ \ | | |/ / | |/| / | | |/
| | * xmppserver_listener: Compatibility fix for older Prosodies with the s2s xmlns...Matthew Wild2010-03-301-0/+3
| | * stanza_router, s2smanager, modulemanager: Fix for handling of the default nam...Matthew Wild2010-03-303-10/+7
* | | Merge 0.7->trunkMatthew Wild2010-03-251-30/+42
|\| |
| * | tools/erlparse: Discard erlang PIDs instead of choking on them as a syntax errorMatthew Wild2010-03-251-0/+6
| * | tools/erlparse: Report the line number when showing a syntax error in the inp...Matthew Wild2010-03-251-2/+6
| * | tools/erlparse: Optimisations aplenty for faster processing of large filesMatthew Wild2010-03-251-28/+30
* | | Merge 0.7->trunkMatthew Wild2010-03-251-0/+2
|\| |
| * | tools/ejabberd2prosody: Create prosody singleton so datamanager can detect th...Matthew Wild2010-03-251-0/+2
* | | Merge 0.7->trunkMatthew Wild2010-03-251-1/+1
|\| |
| * | net.server_event: Don't re-try a write if the connection closed (thanks Flo)Matthew Wild2010-03-251-1/+1
* | | Merge 0.7->trunkMatthew Wild2010-03-241-3/+3
|\| |
| * | net.server_event: Bump timeout values up somewhatMatthew Wild2010-03-241-3/+3
* | | Merge 0.7->trunkMatthew Wild2010-03-246-104/+120
|\| |
| * | Merge 0.7/waqas->0.7/MattJMatthew Wild2010-03-243-4/+12
| |\ \
| | * | util.sasl.digest-md5: Removed unnnecessary check (which included a nil global...Waqas Hussain2010-03-241-2/+0
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 12:37:17 +0000