Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | prosodyctl: Add message describing the distinguished name input expected | Kim Alvefur | 2013-04-29 | 1 | -0/+2 | |
| | | | | | | ||||||
| * | | | | | util.openssl: Write the distinguished_name part of the config in a ↵ | Kim Alvefur | 2013-04-29 | 1 | -1/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | consistent order | |||||
* | | | | | | Merge 0.9->trunk | Matthew Wild | 2013-04-29 | 1 | -6/+11 | |
|\| | | | | | ||||||
| * | | | | | MUC: Allow actor == true to set roles (like affiliations) | Matthew Wild | 2013-04-29 | 1 | -2/+3 | |
| | | | | | | ||||||
| * | | | | | MUC: Allow plugins to add and handle options in the MUC config form | Matthew Wild | 2013-04-29 | 1 | -4/+8 | |
| | | | | | | ||||||
* | | | | | | Merge 0.9->trunk | Matthew Wild | 2013-04-29 | 5 | -88/+156 | |
|\| | | | | | ||||||
| * | | | | | Merge with Florob | Matthew Wild | 2013-04-29 | 4 | -12/+13 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | util.hashes, util.sasl.scram: Implement SCRAM-SHA1's Hi in C | Florian Zeitz | 2013-04-28 | 2 | -13/+51 | |
| | | | | | | | ||||||
| * | | | | | | util.hmac, util.hashes: Implement HMAC functions in C, and move to util.hashes | Florian Zeitz | 2013-04-27 | 5 | -75/+105 | |
| | | | | | | | ||||||
* | | | | | | | Merge 0.9->trunk | Matthew Wild | 2013-04-29 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | mod_saslauth, mod_compression: Fix some cases where open_stream() was not ↵ | Matthew Wild | 2013-04-29 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | being passed to/from (see df3c78221f26 and issue #338) | |||||
* | | | | | | | Merge 0.9->trunk | Matthew Wild | 2013-04-29 | 6 | -13/+27 | |
|\| | | | | | | ||||||
| * | | | | | | mod_s2s: Ensure that to/from on stream headers are always correct, fixes #338 | Matthew Wild | 2013-04-29 | 1 | -6/+7 | |
| | | | | | | | ||||||
| * | | | | | | prosodyctl: Put keys and certificates in ./certs when in a source checkout | Kim Alvefur | 2013-04-28 | 1 | -4/+4 | |
| |/ / / / / | ||||||
| * | | | | | net.server*: Allow the TCP backlog parameter to be set in the config | Kim Alvefur | 2013-04-27 | 3 | -2/+8 | |
| | | | | | | ||||||
| * | | | | | moduleapi: in module:provides(), add the name of the module in item._provided_by | Kim Alvefur | 2013-04-27 | 1 | -0/+1 | |
| | | | | | | ||||||
| * | | | | | moduleapi: module:provides called without an item makes a copy of the ↵ | Kim Alvefur | 2013-04-27 | 1 | -1/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | environment instead. Fixes warnings about non-existent globals | |||||
* | | | | | | Merge 0.9->trunk | Matthew Wild | 2013-04-27 | 1 | -0/+16 | |
|\| | | | | | ||||||
| * | | | | | moduleapi: Add module:get_option_inherited_set() to return a set that ↵ | Matthew Wild | 2013-04-27 | 1 | -0/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | inherits items from a globally set set, if set | |||||
| * | | | | | moduleapi: Add module:context(host) to produce a fake API context for a ↵ | Matthew Wild | 2013-04-27 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | given host (or global). module:context("*"):get_option("foo") to get global options. | |||||
* | | | | | | Merge 0.9->trunk | Matthew Wild | 2013-04-27 | 1 | -2/+4 | |
|\| | | | | | ||||||
| * | | | | | util.prosodyctl: Initialize storagemanager on the host before initializing ↵ | Matthew Wild | 2013-04-27 | 1 | -2/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | usermanager. This fixes brokenness when the auth provider opens the store on load (as they all do since eeea0eb2602a) (thanks nulani) | |||||
* | | | | | | Merge 0.9->trunk | Matthew Wild | 2013-04-26 | 1 | -1/+2 | |
|\| | | | | | ||||||
| * | | | | | mod_s2s: Obey tcp_keepalives option for s2s too, and make it individually ↵ | Matthew Wild | 2013-04-26 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | configurable through s2s_tcp_keepalives (thanks yeled) | |||||
* | | | | | | Merge 0.9->trunk | Matthew Wild | 2013-04-25 | 4 | -39/+46 | |
|\| | | | | | ||||||
| * | | | | | mod_admin_telnet: Add muc:create(room) (thanks SkyBlue) | Matthew Wild | 2013-04-25 | 1 | -2/+12 | |
| | | | | | | ||||||
| * | | | | | MUC: add __tostring on room metatable | Matthew Wild | 2013-04-25 | 1 | -0/+4 | |
| | | | | | | ||||||
| * | | | | | mod_c2s: Refactor <stream:error> building to allways tostring() it and only ↵ | Kim Alvefur | 2013-04-25 | 1 | -9/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | call send once | |||||
| * | | | | | util.json: New, improved, fixed codepoint to UTF-8 conversion. | Waqas Hussain | 2013-04-23 | 1 | -26/+11 | |
| | | | | | | ||||||
| * | | | | | util.json: Make encode(decode("[]"))=="[]". | Waqas Hussain | 2013-04-23 | 1 | -2/+10 | |
| | | | | | | ||||||
* | | | | | | Merge 0.9->trunk | Matthew Wild | 2013-04-23 | 2 | -643/+561 | |
|\| | | | | | ||||||
| * | | | | | mod_admin_adhoc: Use util.adhoc | Florian Zeitz | 2013-04-23 | 1 | -643/+530 | |
| | | | | | | ||||||
| * | | | | | util.adhoc: New util for generating common adhoc handler patterns | Florian Zeitz | 2013-04-23 | 1 | -0/+31 | |
| | | | | | | ||||||
* | | | | | | Merges all the way down | Matthew Wild | 2013-04-23 | 0 | -0/+0 | |
|\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge 0.9->trunk | Kim Alvefur | 2013-04-19 | 7 | -40/+46 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge 0.9->trunk | Kim Alvefur | 2013-04-19 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ | Merge 0.9->trunk | Matthew Wild | 2013-04-23 | 13 | -51/+66 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | / / / / / | | |_|/ / / / / | |/| | | | | | | ||||||
| * | | | | | | | Merge | Matthew Wild | 2013-04-23 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | mod_c2s, mod_s2s, net.http, net.http.server: Improve tracebacks (omit ↵ | Matthew Wild | 2013-04-22 | 4 | -8/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | traceback function), to make it clearer where an error occured | |||||
| | * | | | | | | | net.server.http: Add a comment | Matthew Wild | 2013-04-22 | 1 | -0/+1 | |
| | | | | | | | | | ||||||
| | * | | | | | | | net.server.http: Ensure that event map cannot grow forever (limit to 10K ↵ | Matthew Wild | 2013-04-22 | 1 | -0/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wildcard-only entries) | |||||
| * | | | | | | | | mod_auth_internal_plain: Don't log passwords, even at debug level | Matthew Wild | 2013-04-23 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | mod_c2s, mod_s2s, net.http, net.http.server: Improve tracebacks (omit ↵ | Matthew Wild | 2013-04-22 | 4 | -8/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | traceback function), to make it clearer where an error occured | |||||
| * | | | | | | | | net.server.http: Add a comment | Matthew Wild | 2013-04-22 | 1 | -0/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | net.server.http: Ensure that event map cannot grow forever (limit to 10K ↵ | Matthew Wild | 2013-04-22 | 1 | -0/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wildcard-only entries) | |||||
| * | | | | | | | | storagemanager: Fix traceback in logging when store type is nil, and store ↵ | Waqas Hussain | 2013-04-22 | 1 | -1/+1 | |
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | is unsupported. | |||||
| * | | | | | | | mod_auth_internal_hashed, mod_auth_internal_plain, mod_privacy, mod_private, ↵ | Kim Alvefur | 2013-04-19 | 7 | -40/+46 | |
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | mod_register, mod_vcard, mod_muc: Use module:open_store() | |||||
| * | | | | | | moduleapi: Make module:open_store() open a store named after the calling ↵ | Kim Alvefur | 2013-04-19 | 1 | -1/+1 | |
| |/ / / / / | | | | | | | | | | | | | | | | | | | module by default | |||||
* | | | | | | Merge 0.9->trunk | Matthew Wild | 2013-04-19 | 1 | -0/+4 | |
|\| | | | | | ||||||
| * | | | | | moduleapi: Add module:open_store() as a front-end to storagemanager.open() | Matthew Wild | 2013-04-19 | 1 | -0/+4 | |
| | | | | | |