| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge 0.10->trunk | Matthew Wild | 2016-06-28 | 3 | -2/+11 |
|\ |
|
| * | util.time: New tiny library to abstract LuaSocket's gettime() function, so we... | Matthew Wild | 2016-06-28 | 1 | -0/+8 |
| * | Merge 0.9->0.10 | Kim Alvefur | 2016-06-24 | 0 | -0/+0 |
| |\ |
|
| | * | mod_privacy: Fix selecting the top resource (fixes #694) | Kim Alvefur | 2016-06-22 | 1 | -1/+1 |
| * | | util.openssl: Handle return value from os.execute being true in Lua 5.2 | Kim Alvefur | 2016-06-23 | 1 | -1/+2 |
| * | | util.prosodyctl: Handle os.execute in Lua 5.2 returning true when command ter... | Kim Alvefur | 2016-06-23 | 1 | -1/+1 |
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-06-12 | 2 | -4/+9 |
|\| | |
|
| * | | prosodyctl: Warn if encryption is required but mod_tls is not enabled (see #617) | Kim Alvefur | 2016-06-12 | 1 | -1/+7 |
| * | | mod_pep: Use correct field for full JID (thanks Milan*) | Kim Alvefur | 2016-06-10 | 1 | -1/+1 |
| * | | mod_pep: Include the bare user jid in event | Kim Alvefur | 2016-06-09 | 1 | -3/+2 |
* | | | s2smanager: Include a stub thread on destroyed sessions (thanks Link Mauve) | Kim Alvefur | 2016-06-09 | 1 | -0/+1 |
* | | | mod_s2s: Add util.async support | Kim Alvefur | 2016-05-30 | 1 | -9/+37 |
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-05-30 | 2 | -4/+0 |
|\| | |
|
| * | | mod_s2s: Remove compat with namespace issue from Prosody pre-0.6.2 | Kim Alvefur | 2016-05-30 | 1 | -3/+0 |
| * | | core.stanza_router: Remove compatibility with Jabiru not including id attribu... | Kim Alvefur | 2016-05-30 | 1 | -1/+0 |
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-05-30 | 2 | -3/+3 |
|\| | |
|
| * | | util.dataforms: Fix including default value for list-single when given as fie... | Kim Alvefur | 2016-05-29 | 1 | -1/+1 |
| * | | prosodyctl: Fix typo (thanks av6) | Kim Alvefur | 2016-05-28 | 1 | -2/+2 |
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-05-28 | 2 | -5/+14 |
|\| | |
|
| * | | MUC: Allow members (or above) in members-only non-anonymous rooms to see the ... | Kim Alvefur | 2016-05-28 | 1 | -1/+2 |
| * | | util.dataforms: Allow separation of options from values in list fields | Kim Alvefur | 2016-05-27 | 1 | -4/+12 |
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-05-25 | 2 | -1/+14 |
|\| | |
|
| * | | util.pposix: Ask for shared file descriptor table using rfork() on *BSD (fixe... | Kim Alvefur | 2016-05-25 | 1 | -0/+13 |
| * | | util.crand: Silence compiler warning | Kim Alvefur | 2016-05-25 | 1 | -1/+1 |
* | | | Merge 0.10->trunk | Matthew Wild | 2016-05-22 | 1 | -0/+22 |
|\| | |
|
| * | | util.cache: Add support for creating a proxy table to a cache, that looks and... | Matthew Wild | 2016-05-22 | 1 | -0/+22 |
* | | | tests: Add initial tests for util.async | Matthew Wild | 2016-05-22 | 2 | -0/+149 |
* | | | util.async: Add some more comments for clarity | Matthew Wild | 2016-05-22 | 1 | -0/+15 |
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-05-22 | 3 | -0/+4 |
|\| | |
|
| * | | Merge 0.9->0.10 | Kim Alvefur | 2016-05-22 | 1 | -0/+1 |
| |\| |
|
| | * | mod_presence: Re-probe for contacts presence after outgoing 'subscribed' (fix... | Kim Alvefur | 2016-05-21 | 1 | -0/+1 |
| * | | util.datamanager: Import tostring and type (fix global access) | Kim Alvefur | 2016-05-22 | 1 | -0/+2 |
| * | | util.sql: Import type too (fix global access) | Kim Alvefur | 2016-05-22 | 1 | -0/+1 |
* | | | Merge 0.10->trunk | Matthew Wild | 2016-05-22 | 1 | -1/+1 |
|\| | |
|
| * | | util.sql: Import pcall (fixes #677) | Matthew Wild | 2016-05-22 | 1 | -1/+1 |
* | | | MUC: Send participant list and subject on explicit joins (thanks daurnimator) | Kim Alvefur | 2016-05-15 | 1 | -2/+2 |
* | | | Backed out changeset 63141a85beea, broke multi-session nicks | Kim Alvefur | 2016-05-14 | 1 | -8/+3 |
* | | | Merge 0.10->trunk | Matthew Wild | 2016-05-12 | 1 | -1/+1 |
|\| | |
|
| * | | util.events: Fix comparison of event_name with nil instead of false (fixes #554) | Matthew Wild | 2016-05-12 | 1 | -1/+1 |
* | | | MUC: Treat explicit join presence as join | Kim Alvefur | 2016-05-07 | 1 | -3/+8 |
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-05-04 | 2 | -6/+7 |
|\| | |
|
| * | | portmanager: Set default read size back to 4K | Kim Alvefur | 2016-05-04 | 1 | -1/+1 |
| * | | net.server_event: Schedule another read callback if there is still data left ... | Kim Alvefur | 2016-05-04 | 1 | -1/+5 |
| * | | net.server_event: Collect entire one line function on one line | Kim Alvefur | 2016-05-04 | 1 | -4/+1 |
* | | | MUC: Move status text out of <x> element (thanks Tobias) | Kim Alvefur | 2016-05-04 | 1 | -2/+2 |
* | | | MUC: Lower priority of hook so plugins hooks run before | Kim Alvefur | 2016-05-04 | 1 | -1/+1 |
* | | | MUC: Restore last message from state, not room config (missing change from cb... | Kim Alvefur | 2016-04-30 | 1 | -3/+3 |
* | | | MUC: Separate config from live state | Kim Alvefur | 2016-04-29 | 2 | -13/+22 |
* | | | MUC: Separate force-save parameter from save-entire-state flag | Kim Alvefur | 2016-04-29 | 2 | -10/+10 |
* | | | MUC: Stricter validation of deserialized data | Kim Alvefur | 2016-04-29 | 1 | -2/+2 |