|
Merge 0.9->trunk
|
Matthew Wild |
Sat, 27 Apr 2013 18:03:19 +0100 |
|
moduleapi: Add module:get_option_inherited_set() to return a set that inherits items from a globally set set, if set
|
Matthew Wild |
Sat, 27 Apr 2013 14:59:00 +0100 |
|
moduleapi: Add module:context(host) to produce a fake API context for a given host (or global). module:context("*"):get_option("foo") to get global options.
|
Matthew Wild |
Sat, 27 Apr 2013 14:57:24 +0100 |
|
Merge 0.9->trunk
|
Matthew Wild |
Sat, 27 Apr 2013 13:11:27 +0100 |
|
util.prosodyctl: Initialize storagemanager on the host before initializing usermanager. This fixes brokenness when the auth provider opens the store on load (as they all do since eeea0eb2602a) (thanks nulani)
|
Matthew Wild |
Sat, 27 Apr 2013 13:11:03 +0100 |
|
Merge 0.9->trunk
|
Matthew Wild |
Fri, 26 Apr 2013 12:25:53 +0100 |
|
mod_s2s: Obey tcp_keepalives option for s2s too, and make it individually configurable through s2s_tcp_keepalives (thanks yeled)
|
Matthew Wild |
Fri, 26 Apr 2013 12:25:25 +0100 |
|
Merge 0.9->trunk
|
Matthew Wild |
Thu, 25 Apr 2013 20:37:51 +0100 |
|
mod_admin_telnet: Add muc:create(room) (thanks SkyBlue)
|
Matthew Wild |
Thu, 25 Apr 2013 20:37:20 +0100 |
|
MUC: add __tostring on room metatable
|
Matthew Wild |
Thu, 25 Apr 2013 20:36:55 +0100 |
|
mod_c2s: Refactor <stream:error> building to allways tostring() it and only call send once
|
Kim Alvefur |
Thu, 25 Apr 2013 17:50:22 +0200 |
|
util.json: New, improved, fixed codepoint to UTF-8 conversion.
|
Waqas Hussain |
Tue, 23 Apr 2013 15:55:49 -0400 |
|
util.json: Make encode(decode("[]"))=="[]".
|
Waqas Hussain |
Tue, 23 Apr 2013 14:41:52 -0400 |
|
Merge 0.9->trunk
|
Matthew Wild |
Tue, 23 Apr 2013 15:38:38 +0100 |
|
mod_admin_adhoc: Use util.adhoc
|
Florian Zeitz |
Tue, 23 Apr 2013 14:49:48 +0200 |
|
util.adhoc: New util for generating common adhoc handler patterns
|
Florian Zeitz |
Tue, 23 Apr 2013 14:49:31 +0200 |
|
Merges all the way down
|
Matthew Wild |
Tue, 23 Apr 2013 15:15:52 +0100 |
|
Merge 0.9->trunk
|
Matthew Wild |
Tue, 23 Apr 2013 15:14:47 +0100 |
|
Merge
|
Matthew Wild |
Tue, 23 Apr 2013 15:14:22 +0100 |
|
mod_auth_internal_plain: Don't log passwords, even at debug level
|
Matthew Wild |
Tue, 23 Apr 2013 15:13:51 +0100 |
|
mod_c2s, mod_s2s, net.http, net.http.server: Improve tracebacks (omit traceback function), to make it clearer where an error occured
|
Matthew Wild |
Mon, 22 Apr 2013 12:35:52 +0100 |
|
net.server.http: Add a comment
|
Matthew Wild |
Mon, 22 Apr 2013 12:25:00 +0100 |
|
net.server.http: Ensure that event map cannot grow forever (limit to 10K wildcard-only entries)
|
Matthew Wild |
Mon, 22 Apr 2013 12:24:42 +0100 |
|
mod_c2s, mod_s2s, net.http, net.http.server: Improve tracebacks (omit traceback function), to make it clearer where an error occured
|
Matthew Wild |
Mon, 22 Apr 2013 12:35:52 +0100 |
|
net.server.http: Add a comment
|
Matthew Wild |
Mon, 22 Apr 2013 12:25:00 +0100 |
|
net.server.http: Ensure that event map cannot grow forever (limit to 10K wildcard-only entries)
|
Matthew Wild |
Mon, 22 Apr 2013 12:24:42 +0100 |
|
storagemanager: Fix traceback in logging when store type is nil, and store is unsupported.
|
Waqas Hussain |
Mon, 22 Apr 2013 11:54:15 -0400 |
|
Merge 0.9->trunk
|
Kim Alvefur |
Fri, 19 Apr 2013 16:16:09 +0200 |
