Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge with 0.9 | Matthew Wild | 2012-04-19 | 1 | -4/+4 | |
|\ \ \ \ | ||||||
| * | | | | mod_bosh: Log error on BOSH parse failure (thanks daurnimator) | Matthew Wild | 2012-04-19 | 1 | -1/+4 | |
| |/ / / | ||||||
* | | | | util.debug: Move boundary markers to top of relevant sections of the stack ↵ | Matthew Wild | 2012-03-22 | 1 | -5/+3 | |
| | | | | | | | | | | | | | | | | trace (easier to follow) | |||||
* | | | | util.debug: Add a touch of colour to source locations | Matthew Wild | 2012-03-22 | 1 | -3/+4 | |
| | | | | ||||||
* | | | | util.debug: Add a bit of colour | Matthew Wild | 2012-03-22 | 1 | -6/+21 | |
| | | | | ||||||
* | | | | util.debug: Move optimal line length (default 65) into a variable | Matthew Wild | 2012-03-22 | 1 | -4/+6 | |
| | | | | ||||||
* | | | | util.debug: Add markers in the output when crossing source file boundaries | Matthew Wild | 2012-03-22 | 1 | -0/+14 | |
| | | | | ||||||
* | | | | util.debug: Add catch for an "error in error handling" | Matthew Wild | 2012-03-22 | 1 | -1/+9 | |
| | | | | ||||||
* | | | | util.debug: Attempt to get debug.traceback() parameter handling correct (again) | Matthew Wild | 2012-03-22 | 1 | -1/+5 | |
| | | | | ||||||
* | | | | Merge 0.9->trunk | Matthew Wild | 2012-03-09 | 2 | -3/+21 | |
|\| | | | ||||||
| * | | | mod_admin_telnet: Add flag for IPv6 | Kim Alvefur | 2012-03-05 | 1 | -0/+3 | |
| | | | | ||||||
| * | | | mod_admin_telnet: Add flag for stream management. | Kim Alvefur | 2012-03-05 | 1 | -0/+3 | |
| | | | | ||||||
| * | | | mod_admin_telnet: (encrypted) is redundant in combination with (secure) | Kim Alvefur | 2012-03-05 | 1 | -2/+1 | |
| | | | | ||||||
| * | | | mod_admin_telnet: Commond and flexible way to show stream properties. | Kim Alvefur | 2012-03-05 | 1 | -2/+15 | |
| | | | | ||||||
| * | | | core.s2smanager: Log the entire stream header. | Kim Alvefur | 2012-03-04 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge with 0.9 | Matthew Wild | 2012-02-25 | 1 | -1/+6 | |
|\| | | | ||||||
| * | | | core.s2smanager: Fix check_cert_status() for when the stream has no from attr | Kim Alvefur | 2012-02-21 | 1 | -1/+6 | |
| | | | | ||||||
* | | | | s2smanager: Fix traceback when socket.tcp6 isn't available | Matthew Wild | 2012-02-25 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge with 0.9 | Matthew Wild | 2012-02-12 | 1 | -1/+1 | |
|\| | | | ||||||
| * | | | hostmanager: Import select() (thanks Medics) | Matthew Wild | 2012-02-12 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge with 0.9 | Matthew Wild | 2012-02-12 | 1 | -4/+2 | |
|\| | | | ||||||
| * | | | mod_saslauth: Remove useless import of, and call to nodeprep. | Kim Alvefur | 2012-02-12 | 1 | -3/+0 | |
| | | | | ||||||
| * | | | mod_saslauth: Fire authentication-failure if make_authenticated() failed. | Kim Alvefur | 2012-02-12 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | mod_saslauth: Move authentication-success event to after session has been ↵ | Kim Alvefur | 2012-02-12 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | made authenticated. | |||||
* | | | | Merge with 0.9 | Matthew Wild | 2012-02-11 | 2 | -3/+4 | |
|\| | | | ||||||
| * | | | hostmanager: Import jid_split (thanks chris) | Matthew Wild | 2012-02-11 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | util.prosodyctl: Fix variable name clash introduced in 55ef5d83d00a (thanks ↵ | Matthew Wild | 2012-02-11 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | chris) | |||||
* | | | | Merge with 0.9 | Matthew Wild | 2012-02-08 | 2 | -2/+6 | |
|\| | | | ||||||
| * | | | util.prosodyctl: In the register command, check that the virtual exists ↵ | Kim Alvefur | 2012-02-08 | 1 | -1/+5 | |
| | | | | | | | | | | | | | | | | before proceeding. | |||||
| * | | | hostmanager: Add send() method to hosts | Matthew Wild | 2011-12-16 | 1 | -0/+12 | |
| | | | | ||||||
| * | | | prosody.cfg.lua.dist: Comment mod_legacyauth by default (thanks Zash) | Matthew Wild | 2012-01-31 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | tools/ejabberdsql2prosody: Handle INSERT statement form where column list is ↵ | Waqas Hussain | 2012-02-05 | 1 | -1/+6 | |
| | | | | | | | | | | | | | | | | specified (by skipping the column list). | |||||
* | | | | util.template: Refactoring to make the string->stanza conversion code more ↵ | Waqas Hussain | 2012-02-05 | 1 | -1/+15 | |
| | | | | | | | | | | | | | | | | generic. | |||||
* | | | | Merge with 0.9 | Matthew Wild | 2012-01-26 | 2 | -3/+5 | |
|\| | | | ||||||
| * | | | s2smanager: Log the host when marking it authenticated | Paul Aurich | 2012-01-24 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | mod_saslauth: "" ~= nil (thanks, Zash!) | Paul Aurich | 2012-01-24 | 1 | -2/+4 | |
| | | | | ||||||
| * | | | util.json: Added function encode_ordered(object). | Waqas Hussain | 2012-01-18 | 1 | -6/+25 | |
| | | | | ||||||
| * | | | util.dataforms: Fix verfication for booleans | Florian Zeitz | 2011-12-03 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | util.dataforms: Fix form verification | Florian Zeitz | 2011-12-02 | 1 | -7/+13 | |
| | | | | ||||||
* | | | | Merge with Zash | Matthew Wild | 2012-01-26 | 3 | -0/+225 | |
|\ \ \ \ | ||||||
| * | | | | prosodyctl: Add commands for generating certificates and keys | Kim Alvefur | 2012-01-20 | 1 | -0/+101 | |
| | | | | | ||||||
| * | | | | user.x509: Add some utility functions for generating OpenSSL configs | Kim Alvefur | 2012-01-20 | 1 | -0/+109 | |
| | | | | | ||||||
| * | | | | util.prosodyctl: Add getline() and show_prompt() | Kim Alvefur | 2012-01-20 | 1 | -0/+15 | |
| | |_|/ | |/| | | ||||||
* | | | | util.xmppstream: Optimize attribute processing. | Waqas Hussain | 2012-01-25 | 1 | -10/+9 | |
| | | | | ||||||
* | | | | util.xmppstream: Have faith in the XML parser matching start and end tags. | Waqas Hussain | 2012-01-25 | 1 | -10/+2 | |
| | | | | ||||||
* | | | | util.xmppstream: Remove some unnecessary code. | Waqas Hussain | 2012-01-25 | 1 | -2/+0 | |
|/ / / | ||||||
* | | | mod_compression: Change default compression level to 7 | Kim Alvefur | 2012-01-19 | 1 | -1/+1 | |
| | | | ||||||
* | | | mod_compression: Use get_option_number | Kim Alvefur | 2012-01-19 | 1 | -5/+1 | |
| | | | ||||||
* | | | Merge with trunk | Matthew Wild | 2012-01-18 | 1 | -6/+25 | |
|\ \ \ | ||||||
| * | | | util.json: Added function encode_ordered(object). | Waqas Hussain | 2012-01-18 | 1 | -6/+25 | |
| | | | |