aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | Merge 0.9->trunkKim Alvefur2013-05-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | mod_disco: Emit events for disco requests, which contain a node, on user ↵Florian Zeitz2013-05-172-10/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | accounts
| * | | | | | | | | | | | | | | | | | mod_pubsub: Split out handlers into a module libraryFlorian Zeitz2013-05-172-235/+248
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | net.server_event: Add support for listener.onreadtimeout(conn), which can ↵Matthew Wild2013-05-241-49/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | return true to prevent the connection from being closed when a read timeout occurs
| * | | | | | | | | | | | | | | | | | prosody.cfg.lua: Remove some more sneaky ';' characters from the configMatthew Wild2013-05-241-3/+3
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | prosody.cfg.lua.dist: Remove unnecessary ';' from default config (thanks ↵Matthew Wild2013-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vincent)
| * | | | | | | | | | | | | | | | | | Merge 0.9->trunkMatthew Wild2013-05-221-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | prosodyctl: check dns: Add check that proxy65 addresses resolve correctlyMatthew Wild2013-05-221-0/+19
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | prosodyctl: check config: Fix check for whether host is a componentMatthew Wild2013-05-221-1/+1
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | mod_muc: Remove some old TODO commentsMatthew Wild2013-05-211-2/+1
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | prosodyctl: check config: whitespace fixMatthew Wild2013-05-211-0/+1
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | prosodyctl: check config: Show a suggestion to change hosts that begin with ↵Matthew Wild2013-05-211-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jabber/xmpp/chat/im subdomains, and link to DNS documentation
| * | | | | | | | | | | | | | | | | | | prosody.cfg.lua.dist: Suggest 'prosodyctl check config' instead of 'luac -p'Matthew Wild2013-05-211-1/+1
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | mod_muc: Fix incorrect variable nameMatthew Wild2013-05-211-1/+1
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | mod_muc: Remove unused variableMatthew Wild2013-05-211-1/+1
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | mod_muc: Use stanza:maptags() instead of custom filtering functions, 7 ↵Matthew Wild2013-05-211-19/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | insertions, 19 deletions!
| * | | | | | | | | | | | | | | | | | | mod_muc: Replace getText() with get_child_text(), 1 insertion, 12 deletions!Matthew Wild2013-05-211-12/+1
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | prosodyctl: Use jid.split() to parse parameter to adduser/deluser/passwdMatthew Wild2013-05-201-3/+6
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | test_util_rfc6724: Update with new test vectors from RFC 6724Florian Zeitz2013-05-201-29/+75
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | util.ip: Fix protocol detection of IPv6 addresses beginning with :Matthew Wild2013-05-181-2/+4
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | test_util_ip.lua: Add more tests for util.ipMatthew Wild2013-05-181-3/+62
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | test_util_ip: Add tests for IP matchingMatthew Wild2013-05-181-5/+28
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | tests/test_core_configmanager.lua: Update to remove tests based on sections ↵Matthew Wild2013-05-181-13/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (now removed)
| * | | | | | | | | | | | | | | | | | | tests: Some much-needed cleanup...Matthew Wild2013-05-186-53/+21
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | util.ip: Add CIDR notation parsing and matchingMatthew Wild2013-05-181-1/+24
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | MergeMatthew Wild2013-05-182-5/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.9->trunkKim Alvefur2013-05-182-5/+18
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | mod_muc: Pass actor (requesting JID) when generating the config form, and to ↵Matthew Wild2013-05-181-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the muc-config-form event handler
| * | | | | | | | | | | | | | | | | | | | | mod_muc: Add getter/setter for 'whois' (fixes traceback)Matthew Wild2013-05-181-3/+14
| |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | Merge 0.9->trunkMatthew Wild2013-05-181-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | mod_admin_telnet: Use stanza:get_child_text()Kim Alvefur2013-05-171-6/+1
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | prosodyctl: check dns: Use socket.local_addresses() if availableMatthew Wild2013-05-171-1/+20
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | prosodyctl: check dns: Whitespace fix in outputMatthew Wild2013-05-171-1/+1
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | prosodyctl: check dns: More concise output (merged separate v4/v6 warnings)Matthew Wild2013-05-171-4/+9
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | prosodyctl: check dns: Correctly mark host as failed if expected SRV records ↵Matthew Wild2013-05-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are not found
| * | | | | | | | | | | | | | | | | | | | | util.ip: Add 'private' method/property to determine whether an IP address is ↵Matthew Wild2013-05-171-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generally expected to be internet-routeable (YMMV)
| * | | | | | | | | | | | | | | | | | | | | util.ip: Automatically determine protocol of IP address if none specified. ↵Matthew Wild2013-05-171-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return error if invalid.
| * | | | | | | | | | | | | | | | | | | | | mod_admin_telnet: List session flags (encryption, compression etc) the same ↵Kim Alvefur2013-05-171-18/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | way for c2s as s2s
| * | | | | | | | | | | | | | | | | | | | | prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the ↵Matthew Wild2013-05-171-1/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server's DNS records
| * | | | | | | | | | | | | | | | | | | | | prosodyctl: Add 'check' command, which currently checks the config file for ↵Matthew Wild2013-05-171-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some common mistakes
| * | | | | | | | | | | | | | | | | | | | | util.iterators: Small fix for variable scoping issueMatthew Wild2013-05-171-1/+1
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | util.iterators: Add filter() to run results through a filter functionMatthew Wild2013-05-171-1/+15
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | util.iterators: Various fixes and improvements, primarily use pack() where ↵Matthew Wild2013-05-171-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it should be used.
| * | | | | | | | | | | | | | | | | | | | | mod_muc: Refactor config form handling, and allow for clients to submit ↵Matthew Wild2013-05-162-81/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | incomplete forms. Fixes #246
| * | | | | | | | | | | | | | | | | | | | | mod_admin_telnet: Add server:memory() command to view details of Prosody's ↵Matthew Wild2013-05-161-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | memory usage
| * | | | | | | | | | | | | | | | | | | | | Merge 0.9->trunkMatthew Wild2013-05-143-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge merge merge mergeMatthew Wild2013-05-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.9->trunkKim Alvefur2013-05-101-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.9->trunkMatthew Wild2013-05-112-6/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge 0.9->trunkMatthew Wild2013-05-101-3/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \