Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | mod_admin_adhoc: Fix node of the "Get List of Online Users" command | Florian Zeitz | 2013-06-29 | 1 | -1/+1 | |
| | | ||||||
* | | Merge | Matthew Wild | 2013-06-29 | 38 | -1093/+1666 | |
|\ \ | ||||||
| * | | Merge 0.9->trunk | Matthew Wild | 2013-06-29 | 2 | -1/+2 | |
| |\| | ||||||
| | * | util.pposix: setrlimit(): Add missing return on error when an incorrect ↵ | Matthew Wild | 2013-06-28 | 1 | -0/+1 | |
| | | | | | | | | | | | | number of arguments are passed | |||||
| * | | Merge 0.9->trunk | Matthew Wild | 2013-06-26 | 1 | -4/+13 | |
| |\ \ | ||||||
| * | | | mod_s2s: Add missing global hook for read-timeout | Kim Alvefur | 2013-06-26 | 1 | -0/+2 | |
| | | | | ||||||
| * | | | Merge 0.9->trunk | Matthew Wild | 2013-06-24 | 1 | -1/+1 | |
| |\ \ \ | ||||||
| * | | | | mod_admin_telnet: Refactor s2s:show() | Kim Alvefur | 2013-06-20 | 1 | -55/+55 | |
| | | | | | ||||||
| * | | | | mod_admin_telnet: Generate session names the same way as in s2smanager | Kim Alvefur | 2013-06-20 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | mod_admin_telnet: Refactor s2s:close and s2s:closeall | Kim Alvefur | 2013-06-20 | 1 | -53/+15 | |
| | | | | | ||||||
| * | | | | mod_register: Fix indentation | Kim Alvefur | 2013-06-19 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | mod_admin_telnet: Refactor s2s:showcert() | Kim Alvefur | 2013-06-19 | 1 | -8/+3 | |
| | | | | | ||||||
| * | | | | net.dns: Support IPv6 addresses in resolv.conf | Florian Zeitz | 2013-06-18 | 1 | -6/+13 | |
| | | | | | ||||||
| * | | | | Merge 0.9->trunk | Matthew Wild | 2013-06-18 | 3 | -23/+121 | |
| |\ \ \ \ | ||||||
| * | | | | | mod_tls: Remove debug statement | Kim Alvefur | 2013-06-16 | 1 | -1/+0 | |
| | | | | | | ||||||
| * | | | | | additional fix for erlparse loading in ejabberd2prosody.lua | Vadim Misbakh-Soloviov | 2013-06-14 | 1 | -0/+1 | |
| | | | | | | ||||||
| * | | | | | package{,c}path fixes for migration tools | Vadim Misbakh-Soloviov | 2013-06-14 | 5 | -5/+34 | |
| | | | | | | ||||||
| * | | | | | Merge the merge | Matthew Wild | 2013-06-13 | 9 | -223/+296 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | mod_muc: Add Ad-Hoc command to destroy MUC rooms | Florian Zeitz | 2013-06-05 | 1 | -0/+36 | |
| | | | | | | | ||||||
| | * | | | | | mod_muc: Utilize mod_disco, instead of reimplementing disco handling | Florian Zeitz | 2013-06-05 | 1 | -14/+9 | |
| | | | | | | | ||||||
| | * | | | | | mod_pubsub: Utilize mod_disco, instead of reimplementing disco handling | Florian Zeitz | 2013-06-05 | 1 | -130/+108 | |
| | | | | | | | ||||||
| | * | | | | | mod_disco: Allow ansering disco requests including nodes, and adding custom ↵ | Florian Zeitz | 2013-06-04 | 1 | -8/+35 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | items to disco#items requests | |||||
| | * | | | | | mod_http_files: Put the MIME type map in a global shared table | Kim Alvefur | 2013-06-13 | 1 | -1/+1 | |
| | | | | | | | ||||||
| | * | | | | | util.sasl.external: Add SASL EXTERNAL mechanism | Kim Alvefur | 2013-06-13 | 2 | -0/+26 | |
| | | | | | | | ||||||
| | * | | | | | prosody: Remove global ssl context, no longer used | Kim Alvefur | 2013-06-13 | 1 | -6/+0 | |
| | | | | | | | ||||||
| | * | | | | | mod_tls: Refactor to allow separate SSL configuration for c2s and s2s ↵ | Kim Alvefur | 2013-06-13 | 1 | -26/+36 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | connections | |||||
| | * | | | | | certmanager: Overhaul of how ssl configs are built. | Kim Alvefur | 2013-06-13 | 1 | -38/+45 | |
| | | | | | | | ||||||
| * | | | | | | Merge 0.9->trunk | Matthew Wild | 2013-06-13 | 1 | -1/+5 | |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | Merge 0.9->trunk | Matthew Wild | 2013-06-13 | 1 | -2/+3 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge 0.9->trunk | Matthew Wild | 2013-06-13 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge 0.9->trunk | Matthew Wild | 2013-06-13 | 1 | -0/+5 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge 0.9->trunk | Matthew Wild | 2013-06-13 | 2 | -1/+4 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge 0.9->trunk | Matthew Wild | 2013-06-11 | 1 | -0/+2 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | mod_c2s, mod_s2s: Fire an event on read timeouts | Kim Alvefur | 2013-06-11 | 2 | -3/+16 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | mod_c2s: Become a shared module and allow being disabled on some virtualhosts | Kim Alvefur | 2013-06-11 | 1 | -1/+3 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | mod_bosh: Reduce a little code. | Waqas Hussain | 2013-06-11 | 1 | -6/+2 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge 0.9->trunk | Kim Alvefur | 2013-06-10 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge 0.9->trunk | Kim Alvefur | 2013-06-09 | 1 | -1/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | mod_admin_telnet: Simplify IPv6 detection, fixes rare traceback | Kim Alvefur | 2013-06-09 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | mod_s2s: Set s2s_session.ip | Kim Alvefur | 2013-06-09 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | mod_bosh: Make waiting_requests and dead_sessions shared to preserve across ↵ | Matthew Wild | 2013-06-08 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reloads | |||||
| * | | | | | | | | | | | | | mod_muc: Include status code 332 on service shutdown (thanks mathieui) | Matthew Wild | 2013-06-08 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | mod_bosh: Don't tostring() stream:features when passing to session.send(). | Waqas Hussain | 2013-06-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | prosodyctl: Add 'prosodyctl check certs' for validating TLS/SSL certificates | Kim Alvefur | 2013-06-07 | 1 | -0/+75 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | certmanager: Complain if key or certificate is missing from SSL config. | Kim Alvefur | 2013-06-07 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | prosodyctl: Add 'prosodyctl check --help' | Kim Alvefur | 2013-06-07 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | mod_bosh: Only return CORS headers if the Origin header is received, and ↵ | Waqas Hussain | 2013-06-07 | 1 | -2/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CORS is enabled. | |||||
| * | | | | | | | | | | | | | mod_bosh: Return empty string from the OPTIONS event handler, don't return ↵ | Waqas Hussain | 2013-06-07 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the response object itself. | |||||
| * | | | | | | | | | | | | | mod_bosh: Rename event handler argument to event, not request. | Waqas Hussain | 2013-06-07 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Merge 0.9->trunk | Matthew Wild | 2013-06-07 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ |