Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Merge 0.9->trunk | Kim Alvefur | 2013-05-18 | 2 | -5/+18 | |
| |\| | ||||||
| | * | mod_admin_telnet: Verify that the host exists in user commands (Thanks SkyBlue) | Kim Alvefur | 2013-05-18 | 1 | -3/+9 | |
| | | | ||||||
| | * | util.ip: Convert IPv4 mapped addresses to hex. | Kim Alvefur | 2013-05-18 | 1 | -0/+7 | |
| | | | ||||||
| | * | mod_admin_telnet: Don't rely on getpeerchain returning an empty list | Kim Alvefur | 2013-05-18 | 1 | -2/+2 | |
| | | | ||||||
* | | | mod_muc: Pass actor (requesting JID) when generating the config form, and to ↵ | Matthew Wild | 2013-05-18 | 1 | -4/+4 | |
| | | | | | | | | | | | | the muc-config-form event handler | |||||
* | | | mod_muc: Add getter/setter for 'whois' (fixes traceback) | Matthew Wild | 2013-05-18 | 1 | -3/+14 | |
|/ / | ||||||
* | | Merge 0.9->trunk | Matthew Wild | 2013-05-18 | 1 | -2/+2 | |
|\| | ||||||
| * | mod_s2s: Fix interaction between s2s_secure_auth and s2s_require_encryption, ↵ | Matthew Wild | 2013-05-18 | 1 | -2/+2 | |
| | | | | | | | | in particular ensure that when s2s_require_encryption is NOT set, do not require encryption on s2s_insecure_domains. | |||||
* | | mod_admin_telnet: Use stanza:get_child_text() | Kim Alvefur | 2013-05-17 | 1 | -6/+1 | |
| | | ||||||
* | | prosodyctl: check dns: Use socket.local_addresses() if available | Matthew Wild | 2013-05-17 | 1 | -1/+20 | |
| | | ||||||
* | | prosodyctl: check dns: Whitespace fix in output | Matthew Wild | 2013-05-17 | 1 | -1/+1 | |
| | | ||||||
* | | prosodyctl: check dns: More concise output (merged separate v4/v6 warnings) | Matthew Wild | 2013-05-17 | 1 | -4/+9 | |
| | | ||||||
* | | prosodyctl: check dns: Correctly mark host as failed if expected SRV records ↵ | Matthew Wild | 2013-05-17 | 1 | -0/+2 | |
| | | | | | | | | are not found | |||||
* | | util.ip: Add 'private' method/property to determine whether an IP address is ↵ | Matthew Wild | 2013-05-17 | 1 | -0/+15 | |
| | | | | | | | | generally expected to be internet-routeable (YMMV) | |||||
* | | util.ip: Automatically determine protocol of IP address if none specified. ↵ | Matthew Wild | 2013-05-17 | 1 | -1/+9 | |
| | | | | | | | | Return error if invalid. | |||||
* | | mod_admin_telnet: List session flags (encryption, compression etc) the same ↵ | Kim Alvefur | 2013-05-17 | 1 | -18/+20 | |
| | | | | | | | | way for c2s as s2s | |||||
* | | prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the ↵ | Matthew Wild | 2013-05-17 | 1 | -1/+142 | |
| | | | | | | | | server's DNS records | |||||
* | | prosodyctl: Add 'check' command, which currently checks the config file for ↵ | Matthew Wild | 2013-05-17 | 1 | -0/+52 | |
| | | | | | | | | some common mistakes | |||||
* | | util.iterators: Small fix for variable scoping issue | Matthew Wild | 2013-05-17 | 1 | -1/+1 | |
| | | ||||||
* | | util.iterators: Add filter() to run results through a filter function | Matthew Wild | 2013-05-17 | 1 | -1/+15 | |
| | | ||||||
* | | util.iterators: Various fixes and improvements, primarily use pack() where ↵ | Matthew Wild | 2013-05-17 | 1 | -8/+12 | |
| | | | | | | | | it should be used. | |||||
* | | mod_muc: Refactor config form handling, and allow for clients to submit ↵ | Matthew Wild | 2013-05-16 | 2 | -81/+46 | |
| | | | | | | | | incomplete forms. Fixes #246 | |||||
* | | mod_admin_telnet: Add server:memory() command to view details of Prosody's ↵ | Matthew Wild | 2013-05-16 | 1 | -0/+21 | |
| | | | | | | | | memory usage | |||||
* | | Merge 0.9->trunk | Matthew Wild | 2013-05-14 | 3 | -0/+7 | |
|\| | ||||||
| * | mod_muc: Fire muc-room-created and muc-room-destroyed events (thanks nik) | Matthew Wild | 2013-05-14 | 2 | -0/+2 | |
| | | ||||||
| * | util.hashes: inttypes.h not available with MS Windows SDK, use MS specific ↵ | Waqas Hussain | 2013-05-13 | 1 | -0/+5 | |
| | | | | | | | | __int32 instead. | |||||
* | | Merge merge merge merge | Matthew Wild | 2013-05-11 | 0 | -0/+0 | |
|\ \ | ||||||
| * \ | Merge 0.9->trunk | Kim Alvefur | 2013-05-10 | 1 | -1/+1 | |
| |\ \ | ||||||
* | \ \ | Merge 0.9->trunk | Matthew Wild | 2013-05-11 | 2 | -6/+7 | |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | ||||||
| * | | prosody.cfg.lua.dist: Fix my s2s_secure(_auth) mess | Matthew Wild | 2013-05-11 | 1 | -5/+6 | |
| |/ | ||||||
| * | mod_c2s: Fix session:close() when a stanza is passed as reason | Kim Alvefur | 2013-05-10 | 1 | -1/+1 | |
| | | ||||||
* | | Merge 0.9->trunk | Matthew Wild | 2013-05-10 | 1 | -3/+0 | |
|\| | ||||||
| * | mod_pubsub: Remove nodeid check added in 989acb4ad1de that wasn't needed | Kim Alvefur | 2013-05-09 | 1 | -3/+0 | |
| | | ||||||
* | | Merge 0.9->trunk | Matthew Wild | 2013-05-10 | 4 | -195/+203 | |
|\| | ||||||
| * | mod_admin_telnet: Add some DNS commands. | Kim Alvefur | 2013-05-07 | 1 | -0/+41 | |
| | | ||||||
| * | net.dns: Add nicer API to cached records | Kim Alvefur | 2013-05-07 | 1 | -0/+4 | |
| | | ||||||
| * | util.json: New, faster, stricter, more compliant JSON decoder. Now returns ↵ | Waqas Hussain | 2013-05-07 | 1 | -192/+155 | |
| | | | | | | | | nil,err instead of throwing errors on invalid input. | |||||
| * | util.array: Wrap tostring() output in {} (otherwise empty arrays print as ""). | Waqas Hussain | 2013-05-07 | 1 | -1/+1 | |
| | | ||||||
| * | util.json: Make setmetatable local. | Waqas Hussain | 2013-05-06 | 1 | -1/+1 | |
| | | ||||||
| * | util.json: Fix variable name typo which broke util.json when util.array was ↵ | Waqas Hussain | 2013-05-06 | 1 | -1/+1 | |
| | | | | | | | | missing. | |||||
| * | util.json: Optimize long string parsing. | Waqas Hussain | 2013-05-05 | 1 | -5/+5 | |
| | | ||||||
* | | Merge tls branch | Matthew Wild | 2013-05-01 | 0 | -0/+0 | |
|\ \ | ||||||
| * | | Close 'tls' branchorigin/vault/tlsorigin/tlstls | Matthew Wild | 2013-05-01 | 0 | -0/+0 | |
| | | | ||||||
* | | | Merge s2s branch | Matthew Wild | 2013-05-01 | 0 | -0/+0 | |
|\ \ \ | ||||||
| * | | | Close 's2s' branchorigin/vault/s2sorigin/s2ss2s | Matthew Wild | 2013-05-01 | 0 | -0/+0 | |
| | | | | ||||||
* | | | | Merge sasl branch | Matthew Wild | 2013-05-01 | 0 | -0/+0 | |
|\ \ \ \ | ||||||
| * | | | | Close 'sasl' branchorigin/vault/saslorigin/saslsasl | Matthew Wild | 2013-05-01 | 0 | -0/+0 | |
| | | | | | ||||||
* | | | | | Merge 0.9->trunk | Matthew Wild | 2013-05-01 | 8 | -27/+82 | |
|\ \ \ \ \ | | |_|_|/ | |/| | | | ||||||
| * | | | | Merge with Florob | Matthew Wild | 2013-05-01 | 1 | -1/+1 | |
| |\ \ \ \ | ||||||
| | * | | | | util.dataforms: Add support for generating type='fixed' fields | Florian Zeitz | 2013-02-11 | 1 | -1/+1 | |
| | | | | | |