aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | |
* | | | Merge 0.10->trunkMatthew Wild2015-05-197-72/+74
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | loggingmanager: Rename function arguments to avoid name conflict [luacheck] ↵Matthew Wild2015-05-181-8/+8
| | | | | | | | | | | | (core/ is now luacheck-clean!)
| * | configmanager: Refactor function to avoid re-declaring local variable [luacheck]Matthew Wild2015-05-181-9/+11
| | |
| * | configmanager: Rename unused function arguments [luacheck]Matthew Wild2015-05-181-3/+3
| | |
| * | configmanager: Rename variable to avoid name conflicts [luacheck]Matthew Wild2015-05-181-10/+10
| | |
| * | configmanager: Rename unused function argument [luacheck]Matthew Wild2015-05-181-1/+1
| | |
| * | configmanager: Remove unnecessary function localizations [luacheck]Matthew Wild2015-05-181-2/+1
| | |
| * | configmanager: Rename variable to avoid name conflict [luacheck]Matthew Wild2015-05-181-15/+12
| | |
| * | configmanager: Rename variable to avoid name conflict [luacheck]Matthew Wild2015-05-181-3/+3
| | |
| * | prosodyctl: Soft-require LuaSec and LuaEvent so they show up in the module ↵Kim Alvefur2015-05-181-0/+2
| | | | | | | | | | | | version listing
| * | mod_tls: Treat session.ssl_ctx being false as a signal that TLS is disabledKim Alvefur2015-05-181-1/+1
| | |
| * | mod_tls: Build <starttls/> as a stanza instead of with string concatenationKim Alvefur2015-05-181-1/+2
| | |
| * | util.x509: Tell LuaSec we want UTF-8 dataKim Alvefur2015-05-181-0/+3
| | |
| * | mod_auth_internal_hashed: Use util.hexKim Alvefur2015-05-181-19/+2
| | |
| * | hostmanager: Metatable with __tostring on hostsKim Alvefur2015-05-181-0/+15
| | |
* | | Merge 0.10->trunkKim Alvefur2015-05-153-189/+42
|\| |
| * | mod_storage_xep0227: Silence luacheck warningsKim Alvefur2015-05-151-3/+3
| | |
| * | mod_storage_xep0227: Store data from mod_auth_internal_hashed in a private ↵Kim Alvefur2015-05-151-2/+19
| | | | | | | | | | | | namespace
| * | mod_storage_xep0227: Use the registered namespaceKim Alvefur2015-05-151-1/+1
| | |
| * | mod_storage_xep0227: Update open method for current APIKim Alvefur2015-05-151-8/+3
| | |
| * | mod_storage_xep0227: Return error from io.open if unable to open file for ↵Kim Alvefur2015-05-151-2/+2
| | | | | | | | | | | | writing
| * | mod_storage_xep0227: Open file for writing even if removing so os.remove has ↵Kim Alvefur2015-05-151-2/+3
| | | | | | | | | | | | a file to delete
| * | mod_storage_xep0227: Close file handle after readingKim Alvefur2015-05-151-0/+1
| | |
| * | mod_storage_xep0227: Use configured storage pathKim Alvefur2015-05-151-2/+3
| | |
| * | mod_storage_xep0227: Rename to reflect current naming practicesKim Alvefur2015-05-151-0/+0
| | |