Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 ↵ | Kim Alvefur | 2015-04-26 | 6 | -21/+21 |
| | | | | | | | | support 5.1 | ||||
| * | 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 ↵ | Kim Alvefur | 2015-02-23 | 2 | -11/+11 |
| | | | | | | | | in the globals table | ||||
| * | mod_admin_telnet: Remove now broken importing of modulemanager from various ↵ | Kim Alvefur | 2015-02-22 | 1 | -15/+8 |
| | | | | | | | | commands, use upvalue defined at top of file (thanks daurnimator) | ||||
| * | 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 ↵ | Kim Alvefur | 2015-02-21 | 1 | -2/+5 |
| | | | | | | | | about 5.2 and above for now | ||||
| * | util.*: Remove use of module() function, make all module functions local and ↵ | Kim Alvefur | 2015-02-21 | 35 | -302/+435 |
| | | | | | | | | return them in a table at the end | ||||
* | | 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 ↵ | Matthew Wild | 2015-07-08 | 1 | -0/+12 |
| | | | | | | | | | | | | actually being used (MySQL) | ||||
| * | | 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 |
| | | | |||||
| * | | mod_storage_sql2: Upgrade table if its charset does not match our ↵ | Matthew Wild | 2015-07-08 | 1 | -6/+8 |
| | | | | | | | | | | | | connection's charset (thanks Zash) | ||||
| * | | util.sql: Use appropriate collation for the chosen character set - fixes ↵ | Matthew Wild | 2015-07-08 | 1 | -1/+1 |
| | | | | | | | | | | | | MySQL silently ignoring our SET NAMES command when we use utf8mb4 | ||||
| * | | util.sql: Create table with same charset as the charset we selected for our ↵ | Matthew Wild | 2015-07-08 | 1 | -1/+1 |
| | | | | | | | | | | | | connection, also use corresponding _bin collation | ||||
| * | | util.sql: Allow onconnect callback to fail connection to the DB by returning ↵ | Matthew Wild | 2015-07-07 | 1 | -1/+4 |
| | | | | | | | | | | | | false, err | ||||
| * | | mod_storage_sql2: Don't upgrade tables without admin intervention | Matthew Wild | 2015-07-07 | 1 | -2/+2 |
| | | | |||||
| * | | mod_storage_sql2: Add prosodyctl command to upgrade tables from the command-line | Matthew Wild | 2015-07-07 | 1 | -0/+33 |
| | | | |||||
| * | | mod_storage_sql2: Add missing return to upgrade_table(), so we know if an ↵ | Matthew Wild | 2015-07-07 | 1 | -0/+1 |
| | | | | | | | | | | | | upgrade is required | ||||
| * | | mod_storage_sql2: Rename variable to avoid name clash | Matthew Wild | 2015-07-07 | 1 | -2/+2 |
| | | | |||||
| * | | net.dns: Remove resolver:new(), as it needlessly and incorrectly duplicates ↵ | Matthew Wild | 2015-07-06 | 1 | -11/+0 |
| | | | | | | | | | | | | dns.resolver() | ||||
| * | | Merge with 0.10 | Matthew Wild | 2015-07-06 | 5 | -12/+8 |
| |\ \ | |||||
| | * | | prosodyctl: check: Add some more known global config options | Kim Alvefur | 2015-07-05 | 1 | -1/+2 |
| | | | | |||||
| * | | | luacheckrc: Allow plugins to implement functions under module.* ↵ | Matthew Wild | 2015-06-29 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | (module.load, etc.) | ||||
* | | | | Merge 0.10->trunk | Kim Alvefur | 2015-07-05 | 3 | -10/+5 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | util.sql: Call onconnect, provide noop dummy if not set | Kim Alvefur | 2015-07-02 | 1 | -0/+4 |
| | | | | |||||
| * | | | Remove sql.lib.lua, not used anymore | Kim Alvefur | 2015-06-27 | 1 | -9/+0 |
| | | | | |||||
| * | | | mod_storage_sql2: Validate configuration after normalizing SQLite3 database ↵ | Kim Alvefur | 2015-06-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | path (fixes traceback with default config) | ||||
* | | | | 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 |
| | | |