| Commit message (Expand) | Author | Age | Files | Lines |
* | 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.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 |
* | | 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 | 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 |
| * | | 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 |
* | | | 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 fails0.9.3 | 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 ‘err... | Waqas Hussain | 2014-01-03 | 1 | -4/+8 |
* | | 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.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 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.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 |
* | | Merge 0.9->0.10 | Matthew Wild | 2013-12-11 | 2 | -1/+9 |
|\| |
|
| * | Tagging 0.9.2 (again) | Matthew Wild | 2013-12-04 | 0 | -0/+0 |
| * | Makefile, configure: Add option for disabling generation of example certificates0.9.2 | Kim Alvefur | 2013-11-30 | 2 | -1/+9 |
* | | Merge 0.9->0.10 | Matthew Wild | 2013-11-29 | 0 | -0/+0 |
|\| |
|
| * | Tagging 0.9.2 | Matthew Wild | 2013-11-29 | 0 | -0/+0 |
* | | Merge 0.9->0.10 | Kim Alvefur | 2013-11-28 | 1 | -0/+2 |
|\| |
|
| * | util.pposix: Verify that file handle is open | Kim Alvefur | 2013-11-28 | 1 | -0/+2 |
* | | Merge 0.9->0.10 | Kim Alvefur | 2013-11-24 | 4 | -37/+25 |
|\| |
|
| * | Makefile, certs: Generate example certificates on build, remove the old stati... | Kim Alvefur | 2013-11-22 | 4 | -37/+25 |
* | | Merge 0.9->0.10 | Matthew Wild | 2013-11-21 | 1 | -1/+1 |
|\| |
|
| * | certmanager: Further cipher string tweaking. Re-enable ciphers required for D... | Matthew Wild | 2013-11-21 | 1 | -1/+1 |
* | | util.sql: Fix previous commit | Kim Alvefur | 2013-11-12 | 1 | -1/+1 |