aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automated merge with http://waqas.ath.cx:8000/Matthew Wild2009-06-121-4/+5
|\
| * net.http: (Re-)add url[en|de]code functionsMatthew Wild2009-06-121-4/+5
* | mod_pep: Add host identity pubsub/pepWaqas Hussain2009-06-121-0/+2
* | modulemanager: Added function add_identity(category, type) to the modules APIWaqas Hussain2009-06-121-0/+21
* | MergeWaqas Hussain2009-06-123-1/+21
|\|
| * modulemanager: Use module_name in log entry to fix 'error initialising module...Matthew Wild2009-06-081-1/+1
| * mod_message: Require stanza lib to prevent traceback on error repliesMatthew Wild2009-06-071-0/+1
| * Automated merge with http://waqas.ath.cx:8000/Matthew Wild2009-06-072-0/+19
| |\
| | * mod_console: Show total incoming/outgoing s2s connectionsMatthew Wild2009-06-061-0/+8
| | * modulemanager: Don't require xmlns to be non-nilMatthew Wild2009-06-061-1/+1
| | * modulemanager: module:log() -> self:log() fixMatthew Wild2009-06-061-1/+1
| | * modulemanager: Allow setting priority of stanza handlersMatthew Wild2009-06-061-5/+5
| | * modulemanager: Add module:hook([xmlns, ] name, handler) which uses new stanza...Matthew Wild2009-06-061-0/+11
* | | mod_pep: Fix a nil index bugWaqas Hussain2009-06-121-1/+1
|/ /
* | mod_pep: Give the presence handler a higher than default priorityWaqas Hussain2009-06-071-1/+1
* | modulemanager: Allow setting a priority while adding an event handler via the...Waqas Hussain2009-06-071-2/+2
* | mod_pep: Send items to contacts coming onlineWaqas Hussain2009-06-071-0/+27
* | mod_pep: Fix undefined global accessWaqas Hussain2009-06-071-1/+1
* | mod_pep: Maintain user nodes for delayed deliveryWaqas Hussain2009-06-061-1/+9
|/
* mod_console: Allow running code in the global environment by prefixing with '>'Matthew Wild2009-06-051-1/+9
* mod_console: Some "improvements" to the useless server:reload() command :)Matthew Wild2009-06-051-0/+2
* mod_console: Much improved module load/unload/reload commandsMatthew Wild2009-06-051-16/+79
* prosody: prosody_reload_config => prosody.reload_config (guess I accidentally...Matthew Wild2009-06-051-1/+1
* prosody: Prefix hg: to changeset ids in the versionMatthew Wild2009-06-051-0/+3
* mod_version: Use version from prosody.versionMatthew Wild2009-06-051-2/+2
* prosody: Read version from prosody.version file and set, er, prosody.version!Matthew Wild2009-06-051-0/+11
* Makefile: Experimental support for recording the version of an installed ProsodyMatthew Wild2009-06-051-1/+9
* modulemanager: Load mod_message, mod_iq and mod_presence implicitlyWaqas Hussain2009-06-041-1/+6
* s2smanager: Use a UUID as the dialback secretWaqas Hussain2009-06-041-1/+1
* stanza_router: Remove unused s2s dialback functionsWaqas Hussain2009-06-041-3/+0
* Merge with trunkWaqas Hussain2009-06-044-6/+31
|\
| * Makefile: Set data directory permissions to 750 on install [thanks Dwayne Bent]Matthew Wild2009-06-041-1/+2
| * Makefile: Specify permissions on installed executables [thanks mhavela]Matthew Wild2009-06-041-2/+2
| * prosody: Add support for general 'interface' option which is used as the defa...Matthew Wild2009-06-041-1/+3
| * net.server: Display server port in error messagesMatthew Wild2009-06-041-2/+2
| * Adding .hgignoreMatthew Wild2009-06-041-0/+22
* | util.sasl: Remove some nastinessWaqas Hussain2009-06-041-2/+0
* | util.uuid: Added function seed(string) to allow further seeding of the PRNGWaqas Hussain2009-06-041-3/+5
* | util.uuid: Now generates RFC 4122 complaint UUIDs (version 4 - random)Waqas Hussain2009-06-041-1/+15
* | util.uuid: More uniqueness!Waqas Hussain2009-06-041-3/+18
* | sessionmanager: It really is username@host, not host@username :)Waqas Hussain2009-06-041-1/+1
|/
* My merge!!!!Waqas Hussain2009-06-042-2/+6
|\
| * prosody.cfg.lua.dist: Enable mod_register by default, but with registration d...Matthew Wild2009-06-021-1/+5
| * sessionmanager: It's username@host, not host@username :)Matthew Wild2009-06-021-1/+1
* | stanza_router: workaround for a Pidgin bug which sets 'to' to the SRV resultWaqas Hussain2009-06-031-0/+1
* | mod_privacy: Initial commitWaqas Hussain2009-06-031-0/+23
* | stanza_router: Remove the 'to' attribute when it's value is the bare JID of t...Waqas Hussain2009-06-031-0/+3
|/
* mod_message: Fix global accessWaqas Hussain2009-06-021-0/+2
* mod_iq: Limit sub-events to get and set IQsWaqas Hussain2009-06-021-2/+2
* mod_presence: Fix a global accessWaqas Hussain2009-06-021-1/+1