aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | 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
| * | | util.json: Added function encode_ordered(object).Waqas Hussain2012-01-181-6/+25
| * | | util.dataforms: Fix verfication for booleansFlorian Zeitz2011-12-031-1/+1
| * | | util.dataforms: Fix form verificationFlorian Zeitz2011-12-021-7/+13
* | | | Merge with ZashMatthew Wild2012-01-263-0/+225
|\ \ \ \
| * | | | prosodyctl: Add commands for generating certificates and keysKim Alvefur2012-01-201-0/+101
| * | | | user.x509: Add some utility functions for generating OpenSSL configsKim Alvefur2012-01-201-0/+109
| * | | | util.prosodyctl: Add getline() and show_prompt()Kim Alvefur2012-01-201-0/+15
| | |_|/ | |/| |
* | | | util.xmppstream: Optimize attribute processing.Waqas Hussain2012-01-251-10/+9
* | | | util.xmppstream: Have faith in the XML parser matching start and end tags.Waqas Hussain2012-01-251-10/+2
* | | | util.xmppstream: Remove some unnecessary code.Waqas Hussain2012-01-251-2/+0
|/ / /
* | | mod_compression: Change default compression level to 7Kim Alvefur2012-01-191-1/+1
* | | mod_compression: Use get_option_numberKim Alvefur2012-01-191-5/+1
* | | Merge with trunkMatthew Wild2012-01-181-6/+25
|\ \ \
| * | | util.json: Added function encode_ordered(object).Waqas Hussain2012-01-181-6/+25
* | | | Merge with 0.9Matthew Wild2012-01-181-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | mod_watchregistrations: Fixed an undefined global access (thanks Medics).Waqas Hussain2011-12-121-1/+1
| * | | prosodyctl: Adjust description of 'reload' command (thanks crocket)Matthew Wild2012-01-171-1/+1
* | | | mod_tls: Fix log statement (thanks Zash)Matthew Wild2012-01-181-1/+1
| |/ / |/| |
* | | xmppserver_listener: Only re-attempt connection on disconnect if it was an un...Matthew Wild2012-01-171-1/+1