Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.10->trunk | Kim Alvefur | 2015-06-25 | 5 | -209/+216 |
|\ | |||||
| * | Merge 0.9->0.10 | Kim Alvefur | 2015-06-25 | 1 | -1/+1 |
| |\ | |||||
| | * | MUC: Prevent admins from being given affiliatons other than owner | Kim Alvefur | 2015-06-25 | 1 | -1/+1 |
| | | | |||||
| | * | Backed out changeset bea3862b6bde in favor of a different approach | Kim Alvefur | 2015-06-25 | 1 | -0/+5 |
| | | | |||||
| | * | MUC: Remove half of monkeypatch that was supposed to make admins always be ↵ | Kim Alvefur | 2015-06-16 | 1 | -5/+0 |
| | | | | | | | | | | | | room owners, fixes #458 | ||||
| * | | Merge with 0.10 | Matthew Wild | 2015-06-24 | 1 | -5/+8 |
| |\ \ | |||||
| * | | | mod_storage_sql2: Break up monolithic code into functions, theoretically no ↵ | Matthew Wild | 2015-06-24 | 1 | -100/+115 |
| | | | | | | | | | | | | | | | | functionality changes. | ||||
| * | | | mod_storage_sql2: Improve logging when database read fails | Matthew Wild | 2015-06-24 | 1 | -2/+5 |
| | | | | |||||
| * | | | mod_storage_sql2: Some reformatting and variable name improvements | Matthew Wild | 2015-06-24 | 1 | -4/+4 |
| | | | | |||||
| * | | | mod_storage_sql2: Add some comments | Matthew Wild | 2015-06-24 | 1 | -0/+8 |
| | | | | |||||
| * | | | util.sql: Remove built-in engine caching. This is the wrong layer to do ↵ | Matthew Wild | 2015-06-03 | 1 | -8/+3 |
| | | | | | | | | | | | | | | | | this, and unintentionally sharing connections could cause problems (e.g. when interleaving multiple queries and result fetching) | ||||
| * | | | util.sql: Expose db2uri helper function | Matthew Wild | 2015-06-03 | 1 | -1/+1 |
| | | | | |||||
| * | | | util.sql: Rename some variable to match conventions | Matthew Wild | 2015-06-03 | 1 | -6/+6 |
| | | | | |||||
| * | | | tests: Add tests for util.queue | Matthew Wild | 2015-06-03 | 1 | -0/+68 |
| | | | | |||||
| * | | | util.queue: Allow optional wrap-around when pushing, overwriting oldest ↵ | Matthew Wild | 2015-06-03 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | unread item | ||||
| * | | | util.sql: Remove unused functions and unused commented code | Matthew Wild | 2015-05-30 | 1 | -87/+0 |
| | | | | |||||
* | | | | 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 ↵ | Kim Alvefur | 2015-05-19 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | features | ||||
| * | | | mod_storage_sql2: Change order of arguments to :append to be the same as ↵ | Kim Alvefur | 2015-05-19 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | return values from :find iterator | ||||
| * | | | mod_storage_sql2: Include 'with' field from iterator like some 3rd party ↵ | Kim Alvefur | 2015-05-19 | 1 | -2/+2 |
| |/ / | | | | | | | | | | archive-capable storage modules | ||||
* | | | 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 |
| | | | | | | | | | | | | (core/ is now luacheck-clean!) | ||||
| * | | 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 ↵ | Kim Alvefur | 2015-05-18 | 1 | -0/+2 |
| | | | | | | | | | | | | version listing | ||||
| * | | 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 ↵ | Kim Alvefur | 2015-05-15 | 1 | -2/+19 |
| | | | | | | | | | | | | namespace | ||||
| * | | 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 ↵ | Kim Alvefur | 2015-05-15 | 1 | -2/+2 |
| | | | | | | | | | | | | writing | ||||
| * | | mod_storage_xep0227: Open file for writing even if removing so os.remove has ↵ | Kim Alvefur | 2015-05-15 | 1 | -2/+3 |
| | | | | | | | | | | | | a file to delete | ||||
| * | | 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 |
| | | |