Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | 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 | |
| | | | ||||||
| | * | 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 |