aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.10->trunkKim Alvefur2016-07-082-0/+20
|\
| * mod_c2s, mod_s2s: Bootstrap connection count statistic on module loadKim Alvefur2016-07-072-0/+20
| |
* | Merge 0.10->trunkMatthew Wild2016-07-071-1/+17
|\|
| * net.http: Add log messages for requests, including their id (so "calling ↵Matthew Wild2016-07-071-1/+13
| | | | | | | | callback" and tracebacks can be traced back to their initial request)
| * net.http: Add request.id to every request object (can be overridden by ↵Matthew Wild2016-07-071-0/+4
| | | | | | | | providing ex.id)
* | Merge 0.10->trunkMatthew Wild2016-06-283-2/+11
|\|
| * util.time: New tiny library to abstract LuaSocket's gettime() function, so ↵Matthew Wild2016-06-281-0/+8
| | | | | | | | we can use other sources in the future
| * Merge 0.9->0.10Kim Alvefur2016-06-240-0/+0
| |\
| | * mod_privacy: Fix selecting the top resource (fixes #694)Kim Alvefur2016-06-221-1/+1
| | |
| * | util.openssl: Handle return value from os.execute being true in Lua 5.2Kim Alvefur2016-06-231-1/+2
| | |
| * | util.prosodyctl: Handle os.execute in Lua 5.2 returning true when command ↵Kim Alvefur2016-06-231-1/+1
| | | | | | | | | | | | terminates successfully
* | | Merge 0.10->trunkKim Alvefur2016-06-122-4/+9
|\| |
| * | prosodyctl: Warn if encryption is required but mod_tls is not enabled (see #617)Kim Alvefur2016-06-121-1/+7
| | |
| * | mod_pep: Use correct field for full JID (thanks Milan*)Kim Alvefur2016-06-101-1/+1
| | |
| * | mod_pep: Include the bare user jid in eventKim Alvefur2016-06-091-3/+2
| | |
* | | s2smanager: Include a stub thread on destroyed sessions (thanks Link Mauve)Kim Alvefur2016-06-091-0/+1
| | |
* | | mod_s2s: Add util.async supportKim Alvefur2016-05-301-9/+37
| | |
* | | Merge 0.10->trunkKim Alvefur2016-05-302-4/+0
|\| |
| * | mod_s2s: Remove compat with namespace issue from Prosody pre-0.6.2Kim Alvefur2016-05-301-3/+0
| | |
| * | core.stanza_router: Remove compatibility with Jabiru not including id ↵Kim Alvefur2016-05-301-1/+0
| | | | | | | | | | | | attribute (originally added in 9b352c8a32e6)
* | | Merge 0.10->trunkKim Alvefur2016-05-302-3/+3
|\| |
| * | util.dataforms: Fix including default value for list-single when given as ↵Kim Alvefur2016-05-291-1/+1
| | | | | | | | | | | | field.value[].default
| * | prosodyctl: Fix typo (thanks av6)Kim Alvefur2016-05-281-2/+2
| | |
* | | Merge 0.10->trunkKim Alvefur2016-05-282-5/+14
|\| |
| * | MUC: Allow members (or above) in members-only non-anonymous rooms to see the ↵Kim Alvefur2016-05-281-1/+2
| | | | | | | | | | | | member list (fixes #445)
| * | util.dataforms: Allow separation of options from values in list fieldsKim Alvefur2016-05-271-4/+12
| | |
* | | Merge 0.10->trunkKim Alvefur2016-05-252-1/+14
|\| |
| * | util.pposix: Ask for shared file descriptor table using rfork() on *BSD ↵Kim Alvefur2016-05-251-0/+13
| | | | | | | | | | | | (fixes #412)
| * | util.crand: Silence compiler warningKim Alvefur2016-05-251-1/+1
| | |
* | | Merge 0.10->trunkMatthew Wild2016-05-221-0/+22
|\| |
| * | util.cache: Add support for creating a proxy table to a cache, that looks ↵Matthew Wild2016-05-221-0/+22
| | | | | | | | | | | | and acts (mostly) like a normal table. No tests yet.
* | | tests: Add initial tests for util.asyncMatthew Wild2016-05-222-0/+149
| | |
* | | util.async: Add some more comments for clarityMatthew Wild2016-05-221-0/+15
| | |
* | | Merge 0.10->trunkKim Alvefur2016-05-223-0/+4
|\| |
| * | Merge 0.9->0.10Kim Alvefur2016-05-221-0/+1
| |\|
| | * mod_presence: Re-probe for contacts presence after outgoing 'subscribed' ↵Kim Alvefur2016-05-211-0/+1
| | | | | | | | | | | | (fixes #673)
| * | util.datamanager: Import tostring and type (fix global access)Kim Alvefur2016-05-221-0/+2
| | |
| * | util.sql: Import type too (fix global access)Kim Alvefur2016-05-221-0/+1
| | |
* | | Merge 0.10->trunkMatthew Wild2016-05-221-1/+1
|\| |
| * | util.sql: Import pcall (fixes #677)Matthew Wild2016-05-221-1/+1
| | |
* | | MUC: Send participant list and subject on explicit joins (thanks daurnimator)Kim Alvefur2016-05-151-2/+2
| | |
* | | Backed out changeset 63141a85beea, broke multi-session nicksKim Alvefur2016-05-141-8/+3
| | |
* | | Merge 0.10->trunkMatthew Wild2016-05-121-1/+1
|\| |
| * | util.events: Fix comparison of event_name with nil instead of false (fixes #554)Matthew Wild2016-05-121-1/+1
| | |
* | | MUC: Treat explicit join presence as joinKim Alvefur2016-05-071-3/+8
| | |
* | | Merge 0.10->trunkKim Alvefur2016-05-042-6/+7
|\| |
| * | portmanager: Set default read size back to 4KKim Alvefur2016-05-041-1/+1
| | |
| * | net.server_event: Schedule another read callback if there is still data left ↵Kim Alvefur2016-05-041-1/+5
| | | | | | | | | | | | in buffer after reading (fixes #583 for real)
| * | net.server_event: Collect entire one line function on one lineKim Alvefur2016-05-041-4/+1
| | |
* | | MUC: Move status text out of <x> element (thanks Tobias)Kim Alvefur2016-05-041-2/+2
| | |