| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge 0.10->trunk | Matthew Wild | 2015-09-02 | 7 | -19/+27 |
|\ |
|
| * | configure, Makefile: Make compatible with plain Bourne shell as used on Solar... | Matthew Wild | 2015-09-02 | 2 | -9/+9 |
| * | storagemanager: Check if drivers support purging, warn otherwise | Kim Alvefur | 2015-09-02 | 1 | -3/+8 |
| * | prosody: Set a luasocket global, fixes undefined global access in loop() (pen... | Kim Alvefur | 2015-09-02 | 1 | -0/+1 |
| * | storagemanager: Export purge (fixes deleting users from usermanager) (thanks mt) | Kim Alvefur | 2015-09-02 | 1 | -0/+1 |
| * | util.sql: Export db2uri (mod_storage_sql2 command uses it) (thanks mike) | Kim Alvefur | 2015-09-02 | 1 | -0/+1 |
| * | util.sql: Log when transactions begin | Kim Alvefur | 2015-08-30 | 1 | -0/+1 |
| * | mod_carbons: Get full_ and bare_sessions from the prosody global [luacheck] | Kim Alvefur | 2015-08-27 | 1 | -1/+1 |
| * | mod_carbons: Carbon chat messages or normal messages that have a body | Kim Alvefur | 2015-08-26 | 1 | -5/+3 |
| * | util.hex: Normalize hex to lowercase and discard non-hex input | Kim Alvefur | 2015-08-26 | 1 | -1/+2 |
* | | plugins/muc/muc.lib: Fix issue #505 where unavailable presences were never used | daurnimator | 2015-08-24 | 1 | -4/+4 |
* | | MUC: Remove duplicated import of muc/persistent (4caef6d53304 and this fixes ... | Kim Alvefur | 2015-08-26 | 1 | -1/+0 |
* | | Merge 0.10->trunk | Kim Alvefur | 2015-08-26 | 2 | -1/+18 |
|\| |
|
| * | Merge 0.9->0.10 | Kim Alvefur | 2015-08-26 | 1 | -1/+16 |
| |\ |
|
| | * | ejabberd2prosody: Support password stored as SCRAM hashes | Kim Alvefur | 2015-08-20 | 1 | -1/+16 |
| * | | mod_admin_adhoc: Declare local variable, don't set a global [luacheck] | Kim Alvefur | 2015-08-26 | 1 | -0/+1 |
| * | | mod_admin_adhoc: Import missing util.set (fixes #518) | Kim Alvefur | 2015-08-26 | 1 | -0/+1 |
* | | | Merge 0.10->trunk | Kim Alvefur | 2015-08-22 | 1 | -1/+1 |
|\| | |
|
| * | | mod_websocket: Import sessionmanager (fixes traceback) | Kim Alvefur | 2015-08-21 | 1 | -1/+1 |
* | | | storagemanager: Add forward declaration to fix use of open() before it's defined | Kim Alvefur | 2015-08-20 | 1 | -1/+4 |
* | | | Merge 0.10->trunk | Kim Alvefur | 2015-08-20 | 65 | -502/+739 |
|\| | |
|
| * | | luacheckrc: Ignore unused _ENV variable | Kim Alvefur | 2015-08-20 | 1 | -1/+1 |
| * | | util-src/*.c: Invert Lua 5.2 compat to be 5.2+ by default and a macro to supp... | Kim Alvefur | 2015-04-26 | 6 | -21/+21 |
| * | | portmanager: Add forward declarations | Kim Alvefur | 2015-04-08 | 1 | -2/+6 |
| * | | rostermanager: Add forward declarations | Kim Alvefur | 2015-04-08 | 1 | -3/+9 |
| * | | util.sasl.scram: Get rid of module call | Kim Alvefur | 2015-04-07 | 1 | -4/+7 |
| * | | util.json: Remove use of newproxy | Kim Alvefur | 2015-03-13 | 1 | -5/+2 |
| * | | prosodyctl: Import LuaSocket to a local, don't assume that a global will be set | Kim Alvefur | 2015-03-13 | 1 | -1/+1 |
| * | | util.helpers: Fix order of functions using each other [fixes 00412b36166f] | Kim Alvefur | 2015-03-03 | 1 | -8/+8 |
| * | | net.server_{select,event}: Don't rely on LuaSocket and LuaSec being present i... | Kim Alvefur | 2015-02-23 | 2 | -11/+11 |
| * | | mod_admin_telnet: Remove now broken importing of modulemanager from various c... | Kim Alvefur | 2015-02-22 | 1 | -15/+8 |
| * | | net.*: Remove use of module() function | Kim Alvefur | 2015-02-21 | 5 | -34/+44 |
| * | | core.*: Remove use of module() function | Kim Alvefur | 2015-02-21 | 13 | -104/+188 |
| * | | util.dependencies: Only abort on Lua versions before 5.1, log a warning about... | Kim Alvefur | 2015-02-21 | 1 | -2/+5 |
| * | | util.*: Remove use of module() function, make all module functions local and ... | Kim Alvefur | 2015-02-21 | 35 | -302/+435 |
* | | | MUC: Fix logic error | Kim Alvefur | 2015-08-17 | 1 | -1/+1 |
* | | | Merge 0.10->trunk | Kim Alvefur | 2015-08-11 | 4 | -37/+46 |
|\| | |
|
| * | | Merge 0.9->0.10 | Kim Alvefur | 2015-08-10 | 1 | -15/+16 |
| |\| |
|
| | * | mod_component: Fire an event on successful component authentication (For Goffi) | Kim Alvefur | 2015-08-10 | 1 | -0/+1 |
| * | | util.interpolation: Add support for filter functions | Kim Alvefur | 2015-08-07 | 1 | -1/+9 |
| * | | util.{interpolation,prosodyctl,sql}: Trim trailing whitespace | Kim Alvefur | 2015-07-17 | 3 | -21/+21 |
* | | | Merge | Matthew Wild | 2015-07-27 | 1 | -2/+2 |
|\ \ \ |
|
| * | | | mod_muc: Fix a traceback when an owner joins a room | Emmanuel Gil Peyrot | 2015-07-25 | 1 | -2/+2 |
* | | | | plugins/muc: Move loading of optional muc libraries from muc.lib.lua to mod_muc | daurnimator | 2015-07-27 | 2 | -48/+49 |
|/ / / |
|
* | | | Merge 0.10->trunk | Matthew Wild | 2015-07-09 | 5 | -27/+82 |
|\| | |
|
| * | | util.sql: Add safety check to ensure our chosen connection charset is actuall... | Matthew Wild | 2015-07-08 | 1 | -0/+12 |
| * | | util.sql: Fix log level of debug message | Matthew Wild | 2015-07-08 | 1 | -1/+1 |
| * | | util.sql: Log debug message when connecting to database | Matthew Wild | 2015-07-08 | 1 | -0/+1 |
| * | | util.sql: Make set_encoding() return failure of SET NAMES | Matthew Wild | 2015-07-08 | 1 | -1/+7 |
| * | | util.sql: Return failure if set_encoding() fails | Matthew Wild | 2015-07-08 | 1 | -1/+4 |