aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge with trunkMatthew Wild2012-01-2230-388/+559
| |\
| | * mod_admin_telnet: Use module:shared() to expose commands table and default co...Matthew Wild2012-01-221-4/+2
| | * moduleapi: Add module:shared(), a way to easily share data between multiple l...Matthew Wild2012-01-221-0/+23
| | * moduleapi: Add module:depends(), a way to safely depend upon another module a...Matthew Wild2012-01-221-0/+29
| | * modulemanager: load(): Return and use the correct module objectMatthew Wild2012-01-221-2/+2
| | * util.helpers: After nearly 'fixing' this code, I conclude it instead only des...Matthew Wild2012-01-221-1/+1
| | * modulemanager: Cleanup some unused variables, imports, whitespace and add a c...Matthew Wild2012-01-221-3/+1
| | * modulemanager, moduleapi: Replace hooks multitable with an event_handlers map...Matthew Wild2012-01-222-21/+12
| | * modulemanager: Drop unnecessary prosody_events localMatthew Wild2012-01-221-3/+1
| | * modulemanager: Some reorganisation. Only external change is (should be) that ...Matthew Wild2012-01-221-62/+94
| | * modulemanager: Move in-module API functions to core.moduleapi (half the file ...Matthew Wild2012-01-222-212/+240
| * | configmanager: get(): Make section (core) optional (hurrah)Matthew Wild2011-12-101-0/+3
* | | Merge with Markus K?tterMatthew Wild2012-04-242-7/+35
|\ \ \
| * | | muc - implement per channel history limitsMarkus K?tter2012-04-132-7/+35
* | | | Merge with 0.9Matthew Wild2012-04-191-4/+4
|\ \ \ \
| * | | | mod_bosh: Log error on BOSH parse failure (thanks daurnimator)Matthew Wild2012-04-191-1/+4
| |/ / /
* | | | util.debug: Move boundary markers to top of relevant sections of the stack tr...Matthew Wild2012-03-221-5/+3
* | | | util.debug: Add a touch of colour to source locationsMatthew Wild2012-03-221-3/+4
* | | | util.debug: Add a bit of colourMatthew Wild2012-03-221-6/+21
* | | | util.debug: Move optimal line length (default 65) into a variableMatthew Wild2012-03-221-4/+6
* | | | util.debug: Add markers in the output when crossing source file boundariesMatthew Wild2012-03-221-0/+14
* | | | util.debug: Add catch for an "error in error handling"Matthew Wild2012-03-221-1/+9
* | | | util.debug: Attempt to get debug.traceback() parameter handling correct (again)Matthew Wild2012-03-221-1/+5
* | | | Merge 0.9->trunkMatthew Wild2012-03-092-3/+21
|\| | |
| * | | mod_admin_telnet: Add flag for IPv6Kim Alvefur2012-03-051-0/+3
| * | | mod_admin_telnet: Add flag for stream management.Kim Alvefur2012-03-051-0/+3
| * | | mod_admin_telnet: (encrypted) is redundant in combination with (secure)Kim Alvefur2012-03-051-2/+1
| * | | mod_admin_telnet: Commond and flexible way to show stream properties.Kim Alvefur2012-03-051-2/+15
| * | | core.s2smanager: Log the entire stream header.Kim Alvefur2012-03-041-1/+1
* | | | Merge with 0.9Matthew Wild2012-02-251-1/+6
|\| | |
| * | | core.s2smanager: Fix check_cert_status() for when the stream has no from attrKim Alvefur2012-02-211-1/+6
* | | | s2smanager: Fix traceback when socket.tcp6 isn't availableMatthew Wild2012-02-251-1/+1
* | | | Merge with 0.9Matthew Wild2012-02-121-1/+1
|\| | |
| * | | hostmanager: Import select() (thanks Medics)Matthew Wild2012-02-121-1/+1
* | | | Merge with 0.9Matthew Wild2012-02-121-4/+2
|\| | |
| * | | mod_saslauth: Remove useless import of, and call to nodeprep.Kim Alvefur2012-02-121-3/+0
| * | | mod_saslauth: Fire authentication-failure if make_authenticated() failed.Kim Alvefur2012-02-121-0/+1
| * | | mod_saslauth: Move authentication-success event to after session has been mad...Kim Alvefur2012-02-121-1/+1
* | | | Merge with 0.9Matthew Wild2012-02-112-3/+4
|\| | |
| * | | hostmanager: Import jid_split (thanks chris)Matthew Wild2012-02-111-0/+1
| * | | util.prosodyctl: Fix variable name clash introduced in 55ef5d83d00a (thanks c...Matthew Wild2012-02-111-3/+3
* | | | Merge with 0.9Matthew Wild2012-02-082-2/+6
|\| | |
| * | | util.prosodyctl: In the register command, check that the virtual exists befor...Kim Alvefur2012-02-081-1/+5
| * | | hostmanager: Add send() method to hostsMatthew Wild2011-12-161-0/+12
| * | | prosody.cfg.lua.dist: Comment mod_legacyauth by default (thanks Zash)Matthew Wild2012-01-311-1/+1
* | | | tools/ejabberdsql2prosody: Handle INSERT statement form where column list is ...Waqas Hussain2012-02-051-1/+6
* | | | util.template: Refactoring to make the string->stanza conversion code more ge...Waqas Hussain2012-02-051-1/+15
* | | | Merge with 0.9Matthew Wild2012-01-262-3/+5
|\| | |
| * | | s2smanager: Log the host when marking it authenticatedPaul Aurich2012-01-241-1/+1
| * | | mod_saslauth: "" ~= nil (thanks, Zash!)Paul Aurich2012-01-241-2/+4