| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | certmanager: Support ssl.protocol syntax like "tlsv1+" that disables older pr... | Kim Alvefur | 2014-04-15 | 1 | -2/+13 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | certmanager: Merge ssl.options, verify etc from core defaults and global ssl ... | Kim Alvefur | 2014-04-15 | 1 | -0/+29 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | certmanager: Wrap long line and add comment | Kim Alvefur | 2014-04-14 | 1 | -1/+5 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | certmanager: Concatenate cipher list if given as a table | Kim Alvefur | 2014-04-14 | 1 | -0/+6 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | certmanager: Allow non-server contexts to be without certificate and key | Kim Alvefur | 2014-04-14 | 1 | -2/+4 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | certmanager: Check for non-nil values instead of true-ish values, allows remo... | Kim Alvefur | 2014-04-14 | 1 | -2/+3 |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | net.http.server: Add prepare_header() and finish_response() to allow sending ... | Daurnimator | 2014-04-15 | 1 | -9/+17 |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_s2s: Revert e626ee2fe106 change, it broke Dialback | Kim Alvefur | 2014-04-10 | 1 | -0/+20 |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.9->0.10 | Kim Alvefur | 2014-04-10 | 3 | -3/+21 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prosody: Check dependencies later in the startup sequence | Kim Alvefur | 2014-04-09 | 1 | -3/+7 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | util.dependencies: Check for Lua 5.1. We don't currently support any other ve... | Waqas Hussain | 2014-04-09 | 1 | -0/+8 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_admin_telnet: muc:*: Fix nil index error when a room JID is passed with a... | Matthew Wild | 2014-04-05 | 1 | -0/+6 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_c2s, mod_s2s, mod_component, util.xmppstream: Move all session:open_strea... | Kim Alvefur | 2014-04-10 | 4 | -37/+17 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prosodyctl, util.prosodyctl: Update to reflect that mod_posix gets loaded by ... | Kim Alvefur | 2014-04-10 | 2 | -3/+7 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_posix: Remove compat code for 0.5 | Kim Alvefur | 2014-04-10 | 1 | -8/+0 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_storage_sql2: Build counter query without ORDER BY clause | Kim Alvefur | 2014-04-08 | 1 | -1/+1 |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_compression: Only iterate over correctly named and namespaced child tags ... | Kim Alvefur | 2014-04-03 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_compression: Use get_child() and get_child_text() | Kim Alvefur | 2014-04-03 | 1 | -3/+2 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_compression: Remove checks for impossible conditions | Kim Alvefur | 2014-04-03 | 1 | -3/+3 |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.9->0.10 | Matthew Wild | 2014-04-02 | 136 | -2257/+3484 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.9->0.10 | Kim Alvefur | 2014-03-25 | 3 | -3/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prosody.cfg.lua.dist: mod_posix is enabled by default on posix platforms now | Kim Alvefur | 2014-03-22 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | util.sasl: Fix logic for when mechanisms with channel binding support are off... | Kim Alvefur | 2014-03-22 | 1 | -6/+8 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.9->0.10 | Kim Alvefur | 2014-03-09 | 2 | -5/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.9->0.10 | Kim Alvefur | 2014-02-26 | 3 | -4/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_proxy65: Use mod_disco | Florian Zeitz | 2014-02-19 | 1 | -18/+1 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_auth_interal_hashed: Update salt and iteration count when setting a new p... | Florian Zeitz | 2014-02-12 | 1 | -5/+7 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.9 -> 0.10 | Kim Alvefur | 2014-02-12 | 2 | -2/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.9->0.10 | Kim Alvefur | 2014-02-06 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.9->0.10 | Kim Alvefur | 2014-02-03 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 W... | Kim Alvefur | 2014-01-26 | 3 | -1/+9 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_posix: Daemonize by default only when installed | Kim Alvefur | 2014-01-26 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.9->0.10 | Matthew Wild | 2014-01-21 | 2 | -3/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |