| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge 0.10->trunk | Kim Alvefur | 2015-05-21 | 1 | -1/+1 |
|\ |
|
| * | mod_storage_sql2: Fix argument compat thing from 41725f3df3cc, it was backwards | Kim Alvefur | 2015-05-21 | 1 | -1/+1 |
* | | Merge 0.10->trunk | Kim Alvefur | 2015-05-19 | 1 | -5/+8 |
|\| |
|
| * | mod_storage_sql2: Add a 'caps' table for indicating support for optional feat... | Kim Alvefur | 2015-05-19 | 1 | -0/+3 |
| * | mod_storage_sql2: Change order of arguments to :append to be the same as retu... | Kim Alvefur | 2015-05-19 | 1 | -3/+3 |
| * | mod_storage_sql2: Include 'with' field from iterator like some 3rd party arch... | Kim Alvefur | 2015-05-19 | 1 | -2/+2 |
* | | Merge with trunk | Matthew Wild | 2015-05-19 | 1 | -0/+77 |
|\ \ |
|
| * | | Merge 0.10->trunk | Kim Alvefur | 2015-05-19 | 8 | -72/+151 |
| |\| |
|
| | * | util.interpolation: A template engine for text | Kim Alvefur | 2015-05-19 | 1 | -0/+77 |
* | | | Merge 0.10->trunk | Matthew Wild | 2015-05-19 | 7 | -72/+74 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | loggingmanager: Rename function arguments to avoid name conflict [luacheck] (... | Matthew Wild | 2015-05-18 | 1 | -8/+8 |
| * | configmanager: Refactor function to avoid re-declaring local variable [luacheck] | Matthew Wild | 2015-05-18 | 1 | -9/+11 |
| * | configmanager: Rename unused function arguments [luacheck] | Matthew Wild | 2015-05-18 | 1 | -3/+3 |
| * | configmanager: Rename variable to avoid name conflicts [luacheck] | Matthew Wild | 2015-05-18 | 1 | -10/+10 |
| * | configmanager: Rename unused function argument [luacheck] | Matthew Wild | 2015-05-18 | 1 | -1/+1 |
| * | configmanager: Remove unnecessary function localizations [luacheck] | Matthew Wild | 2015-05-18 | 1 | -2/+1 |
| * | configmanager: Rename variable to avoid name conflict [luacheck] | Matthew Wild | 2015-05-18 | 1 | -15/+12 |
| * | configmanager: Rename variable to avoid name conflict [luacheck] | Matthew Wild | 2015-05-18 | 1 | -3/+3 |
| * | prosodyctl: Soft-require LuaSec and LuaEvent so they show up in the module ve... | Kim Alvefur | 2015-05-18 | 1 | -0/+2 |
| * | mod_tls: Treat session.ssl_ctx being false as a signal that TLS is disabled | Kim Alvefur | 2015-05-18 | 1 | -1/+1 |
| * | mod_tls: Build <starttls/> as a stanza instead of with string concatenation | Kim Alvefur | 2015-05-18 | 1 | -1/+2 |
| * | util.x509: Tell LuaSec we want UTF-8 data | Kim Alvefur | 2015-05-18 | 1 | -0/+3 |
| * | mod_auth_internal_hashed: Use util.hex | Kim Alvefur | 2015-05-18 | 1 | -19/+2 |
| * | hostmanager: Metatable with __tostring on hosts | Kim Alvefur | 2015-05-18 | 1 | -0/+15 |
* | | Merge 0.10->trunk | Kim Alvefur | 2015-05-15 | 3 | -189/+42 |
|\| |
|
| * | mod_storage_xep0227: Silence luacheck warnings | Kim Alvefur | 2015-05-15 | 1 | -3/+3 |
| * | mod_storage_xep0227: Store data from mod_auth_internal_hashed in a private na... | Kim Alvefur | 2015-05-15 | 1 | -2/+19 |
| * | mod_storage_xep0227: Use the registered namespace | Kim Alvefur | 2015-05-15 | 1 | -1/+1 |
| * | mod_storage_xep0227: Update open method for current API | Kim Alvefur | 2015-05-15 | 1 | -8/+3 |
| * | mod_storage_xep0227: Return error from io.open if unable to open file for wri... | Kim Alvefur | 2015-05-15 | 1 | -2/+2 |
| * | mod_storage_xep0227: Open file for writing even if removing so os.remove has ... | Kim Alvefur | 2015-05-15 | 1 | -2/+3 |
| * | mod_storage_xep0227: Close file handle after reading | Kim Alvefur | 2015-05-15 | 1 | -0/+1 |
| * | mod_storage_xep0227: Use configured storage path | Kim Alvefur | 2015-05-15 | 1 | -2/+3 |
| * | mod_storage_xep0227: Rename to reflect current naming practices | Kim Alvefur | 2015-05-15 | 1 | -0/+0 |
| * | xep227store.lib.lua: Remove mostly duplicated code | Kim Alvefur | 2015-05-15 | 1 | -168/+0 |
| * | net.http.codes: Update from registry | Kim Alvefur | 2015-05-14 | 1 | -3/+9 |
* | | Merge 0.10->trunk | Kim Alvefur | 2015-05-14 | 1 | -0/+1 |
|\| |
|
| * | Merge 0.9->0.10 | Kim Alvefur | 2015-05-14 | 1 | -0/+1 |
| |\ |
|
| | * | s2smanager: Make sure destroyed sessions have a sends2s method | Kim Alvefur | 2015-05-14 | 1 | -0/+1 |
* | | | Merge 0.10->trunk | Kim Alvefur | 2015-05-13 | 4 | -33/+37 |
|\| | |
|
| * | | Merge | Kim Alvefur | 2015-05-13 | 1 | -4/+4 |
| |\ \ |
|
| | * | | portmanager: Remove unused argument from function [luacheck] | Matthew Wild | 2015-05-13 | 1 | -1/+1 |
| | * | | portmanager: Rename variable to avoid name conflict [luacheck] | Matthew Wild | 2015-05-13 | 1 | -2/+2 |
| | * | | portmanager: Add luacheck annotations | Matthew Wild | 2015-05-13 | 1 | -1/+1 |
| * | | | Merge 0.9->0.10 | Kim Alvefur | 2015-05-13 | 3 | -29/+33 |
| |\ \ \
| | |/ /
| |/| /
| | |/ |
|
| | * | mod_s2s: Mark stream as opened directly after opening stream, prevents sessio... | Kim Alvefur | 2015-05-13 | 1 | -1/+1 |
| | * | mod_s2s: Don't cache session.sends2s (or do it later), prevents sending data ... | Kim Alvefur | 2015-05-13 | 1 | -4/+3 |
| | * | mod_s2s/s2sout: Use the local address assigned to UDP sockets instead of util... | Kim Alvefur | 2015-05-13 | 1 | -22/+24 |
| | * | util.datamanager: Fix traceback from trying to purge when storage is empty or... | Kim Alvefur | 2015-05-13 | 1 | -1/+5 |
| | * | mod_s2s/s2sout: Remove now unused config option dns_max_depth | Kim Alvefur | 2015-05-13 | 1 | -1/+0 |