aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* MergeMatthew Wild2015-07-271-2/+2
|\
| * mod_muc: Fix a traceback when an owner joins a roomEmmanuel Gil Peyrot2015-07-251-2/+2
| |
* | plugins/muc: Move loading of optional muc libraries from muc.lib.lua to mod_mucdaurnimator2015-07-272-48/+49
|/
* Merge 0.10->trunkMatthew Wild2015-07-095-27/+82
|\
| * util.sql: Add safety check to ensure our chosen connection charset is ↵Matthew Wild2015-07-081-0/+12
| | | | | | | | actually being used (MySQL)
| * util.sql: Fix log level of debug messageMatthew Wild2015-07-081-1/+1
| |
| * util.sql: Log debug message when connecting to databaseMatthew Wild2015-07-081-0/+1
| |
| * util.sql: Make set_encoding() return failure of SET NAMESMatthew Wild2015-07-081-1/+7
| |
| * util.sql: Return failure if set_encoding() failsMatthew Wild2015-07-081-1/+4
| |
| * mod_storage_sql2: Upgrade table if its charset does not match our ↵Matthew Wild2015-07-081-6/+8
| | | | | | | | connection's charset (thanks Zash)
| * util.sql: Use appropriate collation for the chosen character set - fixes ↵Matthew Wild2015-07-081-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 Wild2015-07-081-1/+1
| | | | | | | | connection, also use corresponding _bin collation
| * util.sql: Allow onconnect callback to fail connection to the DB by returning ↵Matthew Wild2015-07-071-1/+4
| | | | | | | | false, err
| * mod_storage_sql2: Don't upgrade tables without admin interventionMatthew Wild2015-07-071-2/+2
| |
| * mod_storage_sql2: Add prosodyctl command to upgrade tables from the command-lineMatthew Wild2015-07-071-0/+33
| |
| * mod_storage_sql2: Add missing return to upgrade_table(), so we know if an ↵Matthew Wild2015-07-071-0/+1
| | | | | | | | upgrade is required
| * mod_storage_sql2: Rename variable to avoid name clashMatthew Wild2015-07-071-2/+2
| |
| * net.dns: Remove resolver:new(), as it needlessly and incorrectly duplicates ↵Matthew Wild2015-07-061-11/+0
| | | | | | | | dns.resolver()
| * Merge with 0.10Matthew Wild2015-07-065-12/+8
| |\
| | * prosodyctl: check: Add some more known global config optionsKim Alvefur2015-07-051-1/+2
| | |
| * | luacheckrc: Allow plugins to implement functions under module.* ↵Matthew Wild2015-06-291-0/+4
| | | | | | | | | | | | (module.load, etc.)
* | | Merge 0.10->trunkKim Alvefur2015-07-053-10/+5
|\ \ \ | | |/ | |/|
| * | util.sql: Call onconnect, provide noop dummy if not setKim Alvefur2015-07-021-0/+4
| | |
| * | Remove sql.lib.lua, not used anymoreKim Alvefur2015-06-271-9/+0
| | |
| * | mod_storage_sql2: Validate configuration after normalizing SQLite3 database ↵Kim Alvefur2015-06-271-1/+1
| | | | | | | | | | | | path (fixes traceback with default config)
* | | Merge 0.10->trunkKim Alvefur2015-06-255-209/+216
|\| |
| * | Merge 0.9->0.10Kim Alvefur2015-06-251-1/+1
| |\ \ | | |/ | |/|
| | * MUC: Prevent admins from being given affiliatons other than ownerKim Alvefur2015-06-251-1/+1
| | |
| | * Backed out changeset bea3862b6bde in favor of a different approachKim Alvefur2015-06-251-0/+5
| | |
| | * MUC: Remove half of monkeypatch that was supposed to make admins always be ↵Kim Alvefur2015-06-161-5/+0
| | | | | | | | | | | | room owners, fixes #458
| * | Merge with 0.10Matthew Wild2015-06-241-5/+8
| |\ \
| * | | mod_storage_sql2: Break up monolithic code into functions, theoretically no ↵Matthew Wild2015-06-241-100/+115
| | | | | | | | | | | | | | | | functionality changes.
| * | | mod_storage_sql2: Improve logging when database read failsMatthew Wild2015-06-241-2/+5
| | | |
| * | | mod_storage_sql2: Some reformatting and variable name improvementsMatthew Wild2015-06-241-4/+4
| | | |
| * | | mod_storage_sql2: Add some commentsMatthew Wild2015-06-241-0/+8
| | | |
| * | | util.sql: Remove built-in engine caching. This is the wrong layer to do ↵Matthew Wild2015-06-031-8/+3
| | | | | | | | | | | | | | | | this, and unintentionally sharing connections could cause problems (e.g. when interleaving multiple queries and result fetching)
| * | | util.sql: Expose db2uri helper functionMatthew Wild2015-06-031-1/+1
| | | |
| * | | util.sql: Rename some variable to match conventionsMatthew Wild2015-06-031-6/+6
| | | |
| * | | tests: Add tests for util.queueMatthew Wild2015-06-031-0/+68
| | | |
| * | | util.queue: Allow optional wrap-around when pushing, overwriting oldest ↵Matthew Wild2015-06-031-2/+7
| | | | | | | | | | | | | | | | unread item
| * | | util.sql: Remove unused functions and unused commented codeMatthew Wild2015-05-301-87/+0
| | | |
* | | | Merge 0.10->trunkKim Alvefur2015-05-211-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | mod_storage_sql2: Fix argument compat thing from 41725f3df3cc, it was backwardsKim Alvefur2015-05-211-1/+1
| | | |
* | | | Merge 0.10->trunkKim Alvefur2015-05-191-5/+8
|\| | |
| * | | mod_storage_sql2: Add a 'caps' table for indicating support for optional ↵Kim Alvefur2015-05-191-0/+3
| | | | | | | | | | | | | | | | features
| * | | mod_storage_sql2: Change order of arguments to :append to be the same as ↵Kim Alvefur2015-05-191-3/+3
| | | | | | | | | | | | | | | | return values from :find iterator
| * | | mod_storage_sql2: Include 'with' field from iterator like some 3rd party ↵Kim Alvefur2015-05-191-2/+2
| |/ / | | | | | | | | | archive-capable storage modules
* | | Merge with trunkMatthew Wild2015-05-191-0/+77
|\ \ \
| * | | Merge 0.10->trunkKim Alvefur2015-05-198-72/+151
| |\| |
| | * | util.interpolation: A template engine for textKim Alvefur2015-05-191-0/+77
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 16:27:46 +0000