| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge 0.10->trunk | Matthew Wild | 2014-01-18 | 3 | -14/+21 |
|\ |
|
| * | mod_storage_sql2: Fix SQL syntax | Kim Alvefur | 2014-01-18 | 1 | -2/+2 |
| * | MUC: Expose room metatable on module | Kim Alvefur | 2014-01-18 | 1 | -2/+3 |
| * | MUC: Split out sending of the topic into method separate from sending history | Kim Alvefur | 2014-01-18 | 1 | -0/+3 |
| * | MUC: Split saving to history into a separate method | Kim Alvefur | 2014-01-18 | 1 | -10/+13 |
* | | Merge 0.10->trunk | Matthew Wild | 2014-01-12 | 3 | -10/+14 |
|\| |
|
| * | Merge | Matthew Wild | 2014-01-12 | 3 | -19/+45 |
| |\ |
|
| | * | mod_storage_sql2: Fix syntax error in subquery (Thanks Lance) | Kim Alvefur | 2014-01-05 | 1 | -2/+2 |
| * | | Merge 0.9->0.10 | Matthew Wild | 2014-01-12 | 2 | -8/+12 |
| |\ \ |
|
| | * | | Tagging 0.9.3 | Matthew Wild | 2014-01-12 | 0 | -0/+0 |
| | * | | mod_tls: Log error when TLS initialization fails | Matthew Wild | 2014-01-12 | 1 | -2/+9 |
| | * | | mod_s2s: Include IP in log messages, if host is unavailable | Florian Zeitz | 2014-01-05 | 1 | -4/+4 |
| | * | | tools/migration/migrator/prosody_files: Fix undefined global access of ?error... | Waqas Hussain | 2014-01-03 | 1 | -4/+8 |
* | | | | Merge 0.10->trunk and Happy New Year! | Kim Alvefur | 2013-12-31 | 3 | -26/+45 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | util.pubsub: Separate data from node configuration | Kim Alvefur | 2013-12-30 | 1 | -7/+26 |
| * | | | util.pubsub: Fire events on more actions | Kim Alvefur | 2013-12-26 | 1 | -0/+4 |
| * | | | mod_pubsub: Don't sent error replies from service disco events, let mod_disco... | Kim Alvefur | 2013-12-30 | 1 | -6/+3 |
| * | | | mod_storage_sql2: Expose the unique key argument, allowing arbitrary ids. Con... | Kim Alvefur | 2013-12-25 | 1 | -2/+6 |
| * | | | mod_storage_sql2: Include user, host and store in id lookup | Kim Alvefur | 2013-12-25 | 1 | -4/+6 |
| |/ / |
|
* | | | net.server_{select,event}: addclient: Handle missing getaddrinfo | Kim Alvefur | 2013-12-23 | 2 | -8/+4 |
* | | | net.server_{select,event}: addclient: Use getaddrinfo to detect IP address ty... | Kim Alvefur | 2013-12-23 | 2 | -2/+17 |
* | | | net.server_{select,event}: addclient: Add argument for overriding socket type | Kim Alvefur | 2013-12-23 | 2 | -6/+22 |
* | | | net/http: Use server.addclient | daurnimator | 2013-12-18 | 1 | -11/+6 |
* | | | net/server: addclient: wrapclient already calls startconnection for us | daurnimator | 2013-12-18 | 1 | -2/+1 |
* | | | net/server_event: pcall require ssl rather than relying on globals | daurnimator | 2013-12-18 | 1 | -19/+11 |
* | | | net/server_select: Fix typo | daurnimator | 2013-12-18 | 1 | -1/+1 |
* | | | net/server_select: addclient: Check arguments | daurnimator | 2013-12-18 | 1 | -0/+15 |
* | | | net/server_select: addclient: Check for failure correctly; remove wrapconnect... | daurnimator | 2013-12-18 | 1 | -3/+3 |
* | | | net/server_event: add_client should have same arguments no-matter the server ... | daurnimator | 2013-12-18 | 1 | -21/+6 |
* | | | net/server_select: Check arguments to add_server correctly | daurnimator | 2013-12-18 | 1 | -3/+4 |
* | | | net/server_select: pcall require ssl (easy to forget to require ssl) | daurnimator | 2013-12-18 | 1 | -5/+5 |
* | | | Merge 0.10->trunk | Kim Alvefur | 2013-12-18 | 1 | -1/+7 |
|\| | |
|
| * | | Merge 0.9->0.10 | Kim Alvefur | 2013-12-18 | 1 | -1/+7 |
| |\| |
|
| | * | mod_component: Enable TCP keepalives on component streams | Kim Alvefur | 2013-12-18 | 1 | -0/+6 |
| | * | mod_component: Decrease priority of component auth hook | Kim Alvefur | 2013-12-18 | 1 | -1/+1 |
* | | | Merge 0.10->trunk | Matthew Wild | 2013-12-16 | 2 | -6/+3 |
|\| | |
|
| * | | Merge 0.9->0.10 | Matthew Wild | 2013-12-16 | 2 | -6/+3 |
| |\| |
|
| | * | net.server_select: Don't remove the socket from sendlist when we might have d... | Matthew Wild | 2013-12-16 | 1 | -5/+1 |
| | * | net.http: assert() for socket creation success so it doesn't silently fail (t... | Matthew Wild | 2013-12-16 | 1 | -1/+2 |
* | | | Merge with trunk | Matthew Wild | 2013-12-16 | 0 | -0/+0 |
|\ \ \ |
|
| * \ \ | Merge 0.10->trunk | Kim Alvefur | 2013-12-14 | 1 | -1/+1 |
| |\ \ \ |
|
* | \ \ \ | Merge 0.10->trunk | Matthew Wild | 2013-12-16 | 2 | -2/+5 |
|\ \ \ \ \
| |/ / / /
|/| | / /
| | |/ /
| |/| | |
|
| * | | | Merge 0.9->0.10 | Matthew Wild | 2013-12-16 | 1 | -1/+4 |
| |\ \ \
| | |/ /
| |/| /
| | |/ |
|
| | * | util.jid: Strip trailing '.' when normalizing hostnames | Matthew Wild | 2013-12-16 | 1 | -1/+4 |
| | * | mod_muc: Remove extra parenthesis (thanks janhouse) | Kim Alvefur | 2013-12-14 | 1 | -1/+1 |
| * | | mod_muc: Remove extra parenthesis (thanks janhouse) | Kim Alvefur | 2013-12-14 | 1 | -1/+1 |
* | | | Merge 0.10->trunk | Matthew Wild | 2013-12-13 | 2 | -2/+3 |
|\| | |
|
| * | | Merge 0.9->0.10 | Matthew Wild | 2013-12-13 | 2 | -2/+3 |
| |\| |
|
| | * | mod_muc: Allow admins to always bypass restrict_room_creation (thanks Chris B) | Matthew Wild | 2013-12-13 | 1 | -1/+1 |
| | * | prosody: Store the config file name so the same file can be used when reloading | Kim Alvefur | 2013-12-13 | 1 | -1/+2 |