| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge 0.7->trunk | Matthew Wild | 2010-05-17 | 1 | -22/+23 |
|\ |
|
| * | Merge 0.7/MattJ with 0.7 | Matthew Wild | 2010-05-17 | 2 | -1/+6 |
| |\ |
|
| * \ | Merge with 0.6 | Matthew Wild | 2010-05-17 | 4 | -25/+28 |
| |\ \ |
|
| | * | | mod_bosh: Always give requests a destroy handler, so that the management of e... | Matthew Wild | 2010-05-17 | 1 | -13/+15 |
| | * | | mod_bosh: Fix handling of rids by not dropping requests with repeated rids (a... | Matthew Wild | 2010-05-17 | 1 | -2/+3 |
| | * | | mod_bosh: Remove some hacky code for pruning dead requests that hopefully nev... | Matthew Wild | 2010-05-17 | 1 | -5/+0 |
| | * | | mod_bosh: Remove requests from the session table using table.remove(), preven... | Matthew Wild | 2010-05-17 | 1 | -2/+5 |
* | | | | prosodyctl: Support for the new usermanager, refactor host creation and fail ... | Matthew Wild | 2010-05-15 | 1 | -6/+41 |
* | | | | usermanager: Export new_default_provider() | Matthew Wild | 2010-05-15 | 1 | -0/+2 |
* | | | | usermanager: Handle auth providers for components. | Waqas Hussain | 2010-05-13 | 1 | -2/+4 |
* | | | | usermanager: Fix logic for per-host admin tables (thanks Maranda) | Matthew Wild | 2010-05-12 | 1 | -6/+8 |
* | | | | net.xmppclient_listener: Port to util.xmppstream \o/ | Matthew Wild | 2010-05-09 | 1 | -21/+18 |
* | | | | prosody: Load util.xmppstream :( | Matthew Wild | 2010-05-09 | 1 | -0/+1 |
* | | | | util.xmppstream: Stream objects now just have feed/reset methods | Matthew Wild | 2010-05-09 | 1 | -4/+22 |
* | | | | usermanager: Bump log level of incorrect config option warnings | Matthew Wild | 2010-05-07 | 1 | -2/+2 |
* | | | | usermanager: Fix for is_admin to work with the new auth provider architecture | Matthew Wild | 2010-05-07 | 1 | -7/+16 |
* | | | | Merge 0.7->trunk | Waqas Hussain | 2010-05-07 | 3 | -3/+10 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | Merge 0.6->0.7 | Waqas Hussain | 2010-05-07 | 2 | -2/+4 |
| |\ \ \
| | | |/
| | |/| |
|
| | * | | mod_console: Set a chunk name for loadstring calls (nicer errors). | Waqas Hussain | 2010-05-07 | 1 | -2/+3 |
| | * | | mod_posix: Fixed a global access. | Waqas Hussain | 2010-05-07 | 1 | -0/+1 |
| * | | | mod_console: Ensure that a null byte is printed after sending the banner. | Waqas Hussain | 2010-05-07 | 1 | -0/+1 |
| * | | | prosody: Modified function metatable for better string representation of func... | Waqas Hussain | 2010-05-07 | 1 | -0/+4 |
| * | | | prosody: Lowered log level for a log message. | Waqas Hussain | 2010-05-07 | 1 | -1/+1 |
* | | | | mod_posix: Don't add a server-starting event handler while the server-startin... | Waqas Hussain | 2010-05-07 | 1 | -10/+12 |
* | | | | net.server_select: Remove some debugging code. | Waqas Hussain | 2010-05-06 | 1 | -3/+0 |
* | | | | Merge 0.7->trunk | Waqas Hussain | 2010-05-06 | 1 | -1/+1 |
|\| | | |
|
| * | | | Merge 0.6->0.7 | Waqas Hussain | 2010-05-06 | 0 | -0/+0 |
| |\| | |
|
| | * | | loggingmanager: Enable debug level for default console logging when 'debug' m... | Waqas Hussain | 2010-05-06 | 1 | -1/+1 |
| * | | | loggingmanager: Enable debug level for default console logging when 'debug' m... | Waqas Hussain | 2010-05-06 | 1 | -1/+1 |
| | |/
| |/| |
|
* | | | util.sasl.scram: Fixed global access. | Waqas Hussain | 2010-05-06 | 1 | -2/+2 |
* | | | prosodyctl: Use the global events objects for hosts (again) (thanks albert) (... | Matthew Wild | 2010-05-05 | 1 | -1/+1 |
* | | | prosodyctl: Give each host an independant events object, because it seems to ... | Matthew Wild | 2010-05-05 | 1 | -3/+1 |
* | | | prosodyctl: Relocate global prosody object creation (see fff153f7f4de) | Matthew Wild | 2010-05-05 | 1 | -2/+8 |
* | | | Merge configmanager->trunk | Matthew Wild | 2010-05-05 | 1 | -3/+4 |
|\ \ \ |
|
| * | | | configmanager: Add VirtualHost as an alias for Host (re-applied in trunk due ... | Matthew Wild | 2010-04-14 | 1 | -3/+3 |
* | | | | Merge 0.7->trunk | Matthew Wild | 2010-05-05 | 2 | -63/+63 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | mod_console: Make use of the new onconnect callback to initialise session and... | Matthew Wild | 2010-05-05 | 1 | -62/+62 |
| * | | | net.server_select: Fix typo affecting connections with an onconnect listener ... | Matthew Wild | 2010-05-05 | 1 | -1/+1 |
* | | | | Merge 0.7->trunk | Matthew Wild | 2010-05-05 | 3 | -28/+100 |
|\| | | |
|
| * | | | mod_proxy65: Send error reply to activation stanza if one or both parties wer... | Matthew Wild | 2010-05-05 | 1 | -0/+10 |
| * | | | mod_proxy65: Return service-unavailable error when receiving an iq we didn't ... | Matthew Wild | 2010-05-05 | 1 | -0/+3 |
| * | | | mod_proxy65: Use new server.link to link proxied connections, now works with ... | Matthew Wild | 2010-05-05 | 1 | -24/+4 |
| * | | | net.server_select, net.server_event: Add server.link() to link 2 connections ... | Matthew Wild | 2010-05-05 | 2 | -0/+44 |
| * | | | net.server_select, net.server_event: Support for ondrain listener callback fo... | Matthew Wild | 2010-05-05 | 2 | -1/+9 |
| * | | | net.server_select, net.server_event: Rename :pattern() method to :set_mode() ... | Matthew Wild | 2010-05-05 | 2 | -2/+9 |
| * | | | net.server_select, net.server_event: Support for :pause() and :resume() on co... | Matthew Wild | 2010-05-05 | 2 | -1/+21 |
* | | | | usermanager: Give the default auth provider a name, you'll never guess what i... | Matthew Wild | 2010-05-05 | 1 | -1/+1 |
* | | | | Merge Tobias's fancy SASL branch->trunk | Matthew Wild | 2010-05-05 | 6 | -83/+142 |
|\ \ \ \ |
|
| * \ \ \ | Merge with tip. | Tobias Markmann | 2010-03-12 | 11 | -73/+84 |
| |\ \ \ \ |
|
| * | | | | | util.sasl: 2009 -> 2010 in copyright header. | Tobias Markmann | 2010-03-12 | 6 | -5/+8 |