Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.10 -> trunk | Kim Alvefur | 2014-02-12 | 5 | -9/+12 |
|\ | |||||
| * | Merge 0.9 -> 0.10 | Kim Alvefur | 2014-02-12 | 2 | -2/+4 |
| |\ | |||||
| | * | mod_admin_telnet: Prep jids for user:create() etc. | Kim Alvefur | 2014-02-09 | 1 | -2/+1 |
| | | | |||||
| | * | mod_s2s: Log a warning if no local addresses are found, as this breaks s2sout | Kim Alvefur | 2014-02-09 | 1 | -0/+3 |
| | | | |||||
| * | | mod_saslauth: Make sure sasl handler has add_cb_handler (fixes #392) | Kim Alvefur | 2014-02-12 | 1 | -1/+1 |
| | | | |||||
| * | | mod_storage_sql2: archive:delete() with username = true deletes for all users | Kim Alvefur | 2014-02-09 | 1 | -0/+4 |
| | | | |||||
| * | | mod_ping: Use type-specific event | Kim Alvefur | 2014-02-09 | 1 | -6/+3 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2014-02-06 | 1 | -1/+1 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2014-02-06 | 1 | -1/+1 |
| |\| | |||||
| | * | mod_motd: Strip indentation only, leave multiple newlines | Kim Alvefur | 2014-02-06 | 1 | -1/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2014-02-03 | 5 | -7/+26 |
|\| | | |||||
| * | | mod_c2s: Break out stream opening into a separate function | Florian Zeitz | 2014-01-31 | 1 | -6/+16 |
| | | | |||||
| * | | MUC: Tag PMs with <x>, like presence stanzas | Kim Alvefur | 2014-01-28 | 1 | -0/+1 |
| | | | |||||
| * | | modulemanager: Always load a platform-specific module, add stub modules for ↵ | Kim Alvefur | 2014-01-26 | 2 | -0/+8 |
| | | | | | | | | | | | | Windows and unknown platforms | ||||
| * | | mod_posix: Daemonize by default only when installed | Kim Alvefur | 2014-01-26 | 1 | -1/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2014-01-21 | 2 | -2/+6 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Matthew Wild | 2014-01-21 | 1 | -0/+1 |
| |\| | |||||
| | * | MUC: Fire muc-room-destroyed event when the last participant leaves a ↵ | Kim Alvefur | 2014-01-18 | 1 | -0/+1 |
| | | | | | | | | | | | | non-persistent room | ||||
| * | | 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 | 1 | -4/+10 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Matthew Wild | 2014-01-18 | 1 | -4/+10 |
| |\| | |||||
| | * | mod_tls: Let s2s_secure_auth override s2s_require_encryption and warn if ↵ | Kim Alvefur | 2014-01-15 | 1 | -0/+6 |
| | | | | | | | | | | | | they differ | ||||
| | * | 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 | 2 | -6/+6 |
|\| | | |||||
| * | | Merge | Matthew Wild | 2014-01-12 | 2 | -12/+15 |
| |\ \ | |||||
| | * | | 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 | 1 | -4/+4 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | 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 |
| | | | | |||||
* | | | | Merge 0.10->trunk and Happy New Year! | Kim Alvefur | 2013-12-31 | 2 | -12/+15 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | mod_pubsub: Don't sent error replies from service disco events, let ↵ | Kim Alvefur | 2013-12-30 | 1 | -6/+3 |
| | | | | | | | | | | | | | | | | mod_disco handle that | ||||
| * | | | mod_storage_sql2: Expose the unique key argument, allowing arbitrary ids. ↵ | Kim Alvefur | 2013-12-25 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | Conflicting items are removed. | ||||
| * | | | mod_storage_sql2: Include user, host and store in id lookup | Kim Alvefur | 2013-12-25 | 1 | -4/+6 |
| |/ / | |||||
* | | | 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 |
| | | | |||||
| | * | mod_muc: Remove extra parenthesis (thanks janhouse) | Kim Alvefur | 2013-12-14 | 1 | -1/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2013-12-16 | 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 | 1 | -1/+1 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Matthew Wild | 2013-12-13 | 1 | -1/+1 |
| |\| | |||||
| | * | mod_muc: Allow admins to always bypass restrict_room_creation (thanks Chris B) | Matthew Wild | 2013-12-13 | 1 | -1/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2013-11-11 | 1 | -1/+1 |
|\| | |