Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.10->trunk | Kim Alvefur | 2015-06-25 | 2 | -106/+132 |
|\ | |||||
| * | 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 |
| | | | | |||||
* | | | | 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 | ||||
| * | | | mod_storage_sql2: Include 'with' field from iterator like some 3rd party ↵ | Kim Alvefur | 2015-05-19 | 1 | -2/+2 |
| |/ / | | | | | | | | | | archive-capable storage modules | ||||
* | | | Merge 0.10->trunk | Matthew Wild | 2015-05-19 | 2 | -21/+5 |
|\| | | |||||
| * | | mod_tls: Treat session.ssl_ctx being false as a signal that TLS is disabled | Kim Alvefur | 2015-05-18 | 1 | -1/+1 |
| | | | |||||
| * | | mod_tls: Build <starttls/> as a stanza instead of with string concatenation | Kim Alvefur | 2015-05-18 | 1 | -1/+2 |
| | | | |||||
| * | | mod_auth_internal_hashed: Use util.hex | Kim Alvefur | 2015-05-18 | 1 | -19/+2 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2015-05-15 | 2 | -186/+33 |
|\| | | |||||
| * | | mod_storage_xep0227: Silence luacheck warnings | Kim Alvefur | 2015-05-15 | 1 | -3/+3 |
| | | | |||||
| * | | mod_storage_xep0227: Store data from mod_auth_internal_hashed in a private ↵ | Kim Alvefur | 2015-05-15 | 1 | -2/+19 |
| | | | | | | | | | | | | namespace | ||||
| * | | mod_storage_xep0227: Use the registered namespace | Kim Alvefur | 2015-05-15 | 1 | -1/+1 |
| | | | |||||
| * | | mod_storage_xep0227: Update open method for current API | Kim Alvefur | 2015-05-15 | 1 | -8/+3 |
| | | | |||||
| * | | mod_storage_xep0227: Return error from io.open if unable to open file for ↵ | Kim Alvefur | 2015-05-15 | 1 | -2/+2 |
| | | | | | | | | | | | | writing | ||||
| * | | mod_storage_xep0227: Open file for writing even if removing so os.remove has ↵ | Kim Alvefur | 2015-05-15 | 1 | -2/+3 |
| | | | | | | | | | | | | a file to delete | ||||
| * | | mod_storage_xep0227: Close file handle after reading | Kim Alvefur | 2015-05-15 | 1 | -0/+1 |
| | | | |||||
| * | | mod_storage_xep0227: Use configured storage path | Kim Alvefur | 2015-05-15 | 1 | -2/+3 |
| | | | |||||
| * | | mod_storage_xep0227: Rename to reflect current naming practices | Kim Alvefur | 2015-05-15 | 1 | -0/+0 |
| | | | |||||
| * | | xep227store.lib.lua: Remove mostly duplicated code | Kim Alvefur | 2015-05-15 | 1 | -168/+0 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2015-05-13 | 2 | -28/+28 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2015-05-13 | 2 | -28/+28 |
| |\| | |||||
| | * | mod_s2s: Mark stream as opened directly after opening stream, prevents ↵ | Kim Alvefur | 2015-05-13 | 1 | -1/+1 |
| | | | | | | | | | | | | session.close opening it again | ||||
| | * | mod_s2s: Don't cache session.sends2s (or do it later), prevents sending data ↵ | Kim Alvefur | 2015-05-13 | 1 | -4/+3 |
| | | | | | | | | | | | | after session was closed | ||||
| | * | mod_s2s/s2sout: Use the local address assigned to UDP sockets instead of ↵ | Kim Alvefur | 2015-05-13 | 1 | -22/+24 |
| | | | | | | | | | | | | util.net to enumerate possible source addresses | ||||
| | * | mod_s2s/s2sout: Remove now unused config option dns_max_depth | Kim Alvefur | 2015-05-13 | 1 | -1/+0 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2015-05-06 | 2 | -2/+7 |
|\| | | |||||
| * | | mod_s2s: Fire read timeout event on correct virtualhost for incoming connections | Kim Alvefur | 2015-05-06 | 1 | -1/+2 |
| | | | |||||
| * | | mod_pubsub: Add option for default affiliation of non-existent nodes (thanks ↵ | Kim Alvefur | 2015-05-05 | 1 | -1/+5 |
| | | | | | | | | | | | | Flow) | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2015-04-26 | 5 | -23/+18 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2015-04-26 | 1 | -12/+0 |
| |\| | |||||
| | * | net.dns, mod_s2s: Add chasing of CNAMEs to net.dns and remove it from mod_s2s | Kim Alvefur | 2015-04-24 | 1 | -12/+0 |
| | | | |||||
| * | | mod_c2s, mod_s2s: Collect statistics on number of connections | Kim Alvefur | 2015-04-26 | 2 | -0/+8 |
| | | | |||||
| * | | mod_blocklist: Some cleanup [luacheck] | Kim Alvefur | 2015-04-25 | 1 | -9/+8 |
| | | | |||||
| * | | mod_admin_adhoc: Remove special treatment of the "pending" roster entry | Kim Alvefur | 2015-04-25 | 1 | -2/+2 |
| | | | |||||
* | | | mod_s2s: Catch attempt to close dummy origin of s2s error replies (fixes a ↵ | Kim Alvefur | 2015-04-05 | 1 | -0/+3 |
| | | | | | | | | | | | | top level error) | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2015-04-03 | 2 | -11/+7 |
|\| | | |||||
| * | | rostermanager, mod_roster, mod_presence: Move pending roster items to roster ↵ | Kim Alvefur | 2015-04-03 | 2 | -11/+7 |
| | | | | | | | | | | | | metadata field | ||||
| * | | Merge 0.9->0.10 again | Kim Alvefur | 2015-03-27 | 2 | -0/+14 |
| |\| |