aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge with trunkMatthew Wild2009-09-241-1/+3
|\
| * MUC: Added MUC feature to the disco#info replies of rooms.Waqas Hussain2009-09-221-1/+3
* | Merge with 0.5Matthew Wild2009-09-243-3/+9
|\ \ | |/ |/|
| * net.dns: Respect commented nameserver entries in resolv.conf (thanks Remko)Matthew Wild2009-09-241-2/+2
| * mod_welcome: Change $user to $username in default welcome message (thanks to ...Matthew Wild2009-09-231-1/+1
| * Re-tagging 0.5.2Matthew Wild2009-09-210-0/+0
| * mod_httpserver: Configurable filesystem path to serve fromMatthew Wild2009-09-211-1/+1
| * Re-tagging 0.5.2Matthew Wild2009-09-210-0/+0
| * prosody.cfg.lua.dist: Add example of declaring admins for a serverMatthew Wild2009-09-211-0/+6
| * net.dns: Accidentally committed a hard-coded 4.2.2.1 nameserverMatthew Wild2009-09-211-1/+0
* | net.dns: (for some reason this commit didn't pull over from 0.5) Remove hard-...Matthew Wild2009-09-211-1/+0
* | Merge with 0.5Matthew Wild2009-09-213-1/+7
|\|
| * core.s2smanager: Don't recurse CNAMEs infinitely :)Matthew Wild2009-09-212-1/+6
| * net.server: Fix traceback when closing connections with buffered data get clo...Matthew Wild2009-09-211-0/+1
* | Merge with 0.5Matthew Wild2009-09-200-0/+0
|\|
| * Tagging 0.5.2Matthew Wild2009-09-200-0/+0
* | Merge with 0.5Matthew Wild2009-09-200-0/+0
|\|
| * mod_vcard: Handle vcard requests from local components.Waqas Hussain2009-09-201-1/+1
* | Merge with 0.5Matthew Wild2009-09-200-0/+0
|\|
| * mod_console: Show status and priority of clientsMatthew Wild2009-07-261-2/+11
* | Merge with 0.5Matthew Wild2009-09-201-0/+22
|\|
| * s2smanager: Timeout unauthed s2s connectionsMatthew Wild2009-09-201-0/+22
* | util.helpers: It would be a good idea to fire an event when we say we areMatthew Wild2009-09-201-0/+1
* | Merge with 0.5Matthew Wild2009-09-191-1/+11
|\|
| * s2smanager: Compatibility with domains which use CNAMEsMatthew Wild2009-09-191-1/+11
* | Merge with 0.5Matthew Wild2009-09-191-1/+29
|\|
| * s2smanager: Pass A-record lookups through adns moduleMatthew Wild2009-09-191-1/+29
* | prosody: Add prosody.installed flag to indicate whether Prosody has been inst...Matthew Wild2009-09-191-0/+5
* | prosody: Add prosody.platform which can be either 'windows', 'posix' or 'unkn...Matthew Wild2009-09-191-0/+6
* | Merge with 0.5Matthew Wild2009-09-182-10/+67
|\|
| * net.adns: Utilise new net.dns API to handle DNS network errorsMatthew Wild2009-09-181-4/+18
| * net.dns: Multiple internal changes and API extensions to allow for more relia...Matthew Wild2009-09-181-9/+62
| * net.server: Add checking for nil sockets to prevent tracebackMatthew Wild2009-08-181-7/+13
* | ejabberd2prosody: Fixed a problem with null roster groups.Waqas Hussain2009-09-181-1/+5
* | ejabberd2prosody: Fixed escape code processing when parsing strings.Waqas Hussain2009-09-181-3/+13
* | ejabberd2prosody: Added support for ask='both' in subscriptions.Waqas Hussain2009-09-181-3/+10
* | MUC: Removed some debug logging.Waqas Hussain2009-09-141-4/+0
* | MUC: Added a send() method to the component. Fixes issues with local mod_vcard.Waqas Hussain2009-09-141-0/+5
* | mod_vcard: Handle vcard requests from local components.Waqas Hussain2009-09-141-1/+1
* | MUC: Correct routing of vCard requests to bare JID.Waqas Hussain2009-09-131-4/+31
* | configmanager: Assign a chunk name to config files loaded using the default c...Waqas Hussain2009-09-121-4/+4
* | mod_offline: Fixed undefined global access.Waqas Hussain2009-09-121-1/+2
* | ComponentManager: Removed unused variable.Waqas Hussain2009-09-111-1/+0
* | ComponentManager: Removed dependency on core_route_stanza. The default compon...Waqas Hussain2009-09-111-4/+1
* | ComponentManager: Fixed: Default handler sent error replies on result stanzas.Waqas Hussain2009-09-111-1/+1
* | ComponentManager: Fixed a bit of logging.Waqas Hussain2009-09-111-2/+1
* | Merge with 0.5 (no changes!)Matthew Wild2009-09-110-0/+0
|\|
| * mod_httpserver: Backport from trunk more thorough validation of URLs prior to...Matthew Wild2009-09-111-1/+25
* | MUC: Preserve stanza attributes for private messages.Waqas Hussain2009-09-091-1/+2
* | MUC: Don't kick on errors in private messages.Waqas Hussain2009-09-091-3/+5