| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge 0.10->trunk | Matthew Wild | 2014-01-21 | 3 | -5/+9 |
| |\ |
|
| | * | Merge 0.9->0.10 | Matthew Wild | 2014-01-21 | 2 | -3/+4 |
| | |\ |
|
| | | * | tools/ejabberd2prosody: Disable generating a config, as the format it generat... | Waqas Hussain | 2014-01-18 | 1 | -2/+2 |
| | | * | tools/ejabberd2prosody: ?xmlelement? can be ?xmlel? in newer ejabberd (thanks... | Waqas Hussain | 2014-01-18 | 1 | -1/+1 |
| | | * | MUC: Fire muc-room-destroyed event when the last participant leaves a non-per... | Kim Alvefur | 2014-01-18 | 1 | -0/+1 |
| | * | | mod_storage_sql2: Only attempt to delete conflicting items if an ID/key is given | Kim Alvefur | 2014-01-21 | 1 | -2/+5 |
| | * | | mod_storage_sql2: Fix another SQL syntax error that slipped trough | Kim Alvefur | 2014-01-21 | 1 | -1/+1 |
| * | | | Merge 0.10->trunk | Matthew Wild | 2014-01-18 | 3 | -14/+85 |
| |\| | |
|
| | * | | Merge 0.9->0.10 | Matthew Wild | 2014-01-18 | 3 | -14/+85 |
| | |\| |
|
| | | * | tools/ejabberd2prosody: Add support for importing MUC rooms. | Waqas Hussain | 2014-01-18 | 1 | -0/+51 |
| | | * | tools/ejabberdsql2prosody: Skip invalid XML in data, and print out errors. | Waqas Hussain | 2014-01-16 | 1 | -10/+24 |
| | | * | additional fix for erlparse loading in ejabberd2prosody.lua | Vadim Misbakh-Soloviov | 2013-06-14 | 1 | -0/+1 |
| | | * | package{,c}path fixes for migration tools | Vadim Misbakh-Soloviov | 2013-06-14 | 5 | -5/+34 |
| | | * | mod_tls: Let s2s_secure_auth override s2s_require_encryption and warn if they... | Kim Alvefur | 2014-01-15 | 1 | -0/+6 |
| | | * | mod_tls: Rename variables to be less confusing | Kim Alvefur | 2014-01-15 | 1 | -4/+4 |
| * | | | 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 |
