Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.10->trunk | Matthew Wild | 2014-08-28 | 0 | -0/+0 |
|\ | |||||
| * | Merge 0.9->0.10 | Matthew Wild | 2014-08-28 | 0 | -0/+0 |
| |\ | |||||
| | * | Tagging 0.9.5 | Matthew Wild | 2014-08-28 | 0 | -0/+0 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2014-08-28 | 10 | -21/+37 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Matthew Wild | 2014-08-28 | 10 | -20/+36 |
| |\| | |||||
| | * | util.filters: Ignore filters being added twice (fixes issues on removal) | Matthew Wild | 2014-08-28 | 1 | -0/+2 |
| | | | |||||
| | * | mod_privacy: Fix to correctly sort privacy list rules by order (thanks Flow) | Matthew Wild | 2014-08-28 | 1 | -1/+1 |
| | | | |||||
| | * | mod_c2s, mod_s2s: Log received invalid stream headers | Matthew Wild | 2014-08-23 | 2 | -1/+2 |
| | | | |||||
| | * | util.xmppstream: When error is 'no-stream', pass the received tagname to the ↵ | Matthew Wild | 2014-08-23 | 1 | -1/+1 |
| | | | | | | | | | | | | error handler | ||||
| | * | mod_s2s: Reset stream ID when resetting stream [compliance] | Kim Alvefur | 2014-08-27 | 1 | -0/+1 |
| | | | |||||
| | * | modulemanager: Reduce warning to debug level message about modules already ↵ | Kim Alvefur | 2014-08-27 | 1 | -1/+1 |
| | | | | | | | | | | | | being loaded, it's probably just module:depends() | ||||
| | * | net.http.server: Comment out a log message | Kim Alvefur | 2014-08-27 | 1 | -1/+1 |
| | | | |||||
| | * | mod_s2s: Mark stream as opened earlier for outgoing connections, fixes ↵ | Kim Alvefur | 2014-08-26 | 1 | -1/+2 |
| | | | | | | | | | | | | double stream headers on policy failures | ||||
| | * | mod_compression: Handle compression setup errors by logging a warning about ↵ | Kim Alvefur | 2014-08-26 | 1 | -0/+6 |
| | | | | | | | | | | | | it (fixes #408) | ||||
| | * | mod_posix: Make sure that 'pidfile' is a string | Kim Alvefur | 2014-08-26 | 1 | -1/+1 |
| | | | |||||
| | * | prosodyctl: Verify that 'pidfile' is a string, show friendly error otherwise | Kim Alvefur | 2014-08-26 | 2 | -0/+5 |
| | | | |||||
| * | | util.xmppstream: Don't include empty stream ID in stream header (got here ↵ | Kim Alvefur | 2014-08-27 | 1 | -1/+1 |
| | | | | | | | | | | | | from mod_c2s) | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2014-08-13 | 1 | -6/+6 |
|\| | | |||||
| * | | mod_private: Fix traceback due to missing table index | Kim Alvefur | 2014-08-13 | 1 | -1/+1 |
| | | | |||||
| * | | mod_blocklist: Use full word as variable name, we can afford that | Kim Alvefur | 2014-08-12 | 1 | -4/+4 |
| | | | |||||
| * | | mod_blocklist: Correct comment | Kim Alvefur | 2014-08-12 | 1 | -1/+1 |
| | | | |||||
| * | | mod_blocklist: Fix any unblock emptying the blocklist | Kim Alvefur | 2014-08-12 | 1 | -1/+1 |
| | | | |||||
* | | | mod_storage_sql2: DELETE then INSERT in map stores | Kim Alvefur | 2014-08-12 | 1 | -13/+8 |
| | | | |||||
* | | | mod_muc: Fix tracebacks (thanks nick1) | Kim Alvefur | 2014-08-11 | 1 | -5/+5 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2014-08-10 | 3 | -439/+277 |
|\| | | |||||
| * | | mod_privacy: Remove, leave a log message about being replaced by ↵ | Kim Alvefur | 2014-08-10 | 1 | -438/+3 |
| | | | | | | | | | | | | mod_blocklist and load that instead | ||||
| * | | prosody.cfg.lua.dist: Replace mod_privacy with mod_blocklist in the default ↵ | Kim Alvefur | 2014-08-10 | 1 | -1/+1 |
| | | | | | | | | | | | | config | ||||
| * | | mod_blocklist: XEP-0191 implementation written for speed and independence ↵ | Kim Alvefur | 2014-08-10 | 1 | -0/+273 |
| | | | | | | | | | | | | from mod_privacy | ||||
* | | | mod_private: Use map store | Kim Alvefur | 2014-08-09 | 1 | -12/+9 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2014-08-09 | 2 | -55/+39 |
|\| | | |||||
| * | | mod_private: Cleanup and more tailcalls | Kim Alvefur | 2014-08-09 | 1 | -30/+26 |
| | | | |||||
| * | | util.jid: Optimize bare | Kim Alvefur | 2014-08-07 | 1 | -5/+1 |
| | | | |||||
| * | | util.jid: Use existing join function in jid.prep | Kim Alvefur | 2014-08-07 | 1 | -15/+8 |
| | | | |||||
| * | | util.jid: Return early in join on invalid jids | Kim Alvefur | 2014-08-07 | 1 | -6/+5 |
| | | | |||||
| * | | mod_s2s: Remove unused locals | Kim Alvefur | 2014-07-25 | 1 | -2/+0 |
| | | | |||||
* | | | storagemanager: Fix map store shim if store is empty | Kim Alvefur | 2014-08-08 | 1 | -1/+1 |
| | | | |||||
* | | | plugins/mod_storage_sql2: Return correct arguments from map_store operations | daurnimator | 2014-08-07 | 1 | -2/+6 |
| | | | |||||
* | | | plugins/muc/mod_muc: persistent rooms keyval store needs username as nil | daurnimator | 2014-08-07 | 1 | -4/+4 |
| | | | |||||
* | | | plugins/muc/mod_muc: Use map store for room persistence | daurnimator | 2014-08-07 | 1 | -59/+72 |
| | | | |||||
* | | | plugins/muc/mod_muc: Remove unused import | daurnimator | 2014-08-07 | 1 | -1/+0 |
| | | | |||||
* | | | plugins/mod_storage_sql2: Add map store support | daurnimator | 2014-08-07 | 1 | -0/+35 |
| | | | |||||
* | | | core/storagemanager: When map store isn't available, fallback to keyval store | daurnimator | 2014-08-07 | 1 | -0/+33 |
| | | | |||||
* | | | mod_muc: Import util.stanza into the config handler modules that need it. ↵ | Matthew Wild | 2014-08-05 | 3 | -0/+6 |
| | | | | | | | | | | | | Fixes #432. | ||||
* | | | mod_muc: Fix use of undefined global. Fixes #431. | Matthew Wild | 2014-08-05 | 1 | -1/+2 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2014-07-31 | 2 | -4/+7 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Matthew Wild | 2014-07-31 | 2 | -4/+7 |
| |\| | |||||
| | * | prosodyctl: Remove nonsensical warning | Matthew Wild | 2014-07-31 | 1 | -1/+0 |
| | | | |||||
| | * | prosodyctl: Improve JID splitting and normalization for adduser/passwd/deluser | Matthew Wild | 2014-07-31 | 1 | -3/+5 |
| | | | |||||
| | * | configmanager: nameprep VirtualHost and Component names | Matthew Wild | 2014-07-31 | 1 | -0/+5 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2014-07-25 | 3 | -36/+47 |
|\ \ \ |