aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | | | | | | util.ip: Add 'private' method/property to determine whether an IP address is ...Matthew Wild2013-05-171-0/+15
| * | | | | | | | | | | | | | | | | | | | | util.ip: Automatically determine protocol of IP address if none specified. Re...Matthew Wild2013-05-171-1/+9
| * | | | | | | | | | | | | | | | | | | | | mod_admin_telnet: List session flags (encryption, compression etc) the same w...Kim Alvefur2013-05-171-18/+20
| * | | | | | | | | | | | | | | | | | | | | prosodyctl: Add 'prosodyctl check dns' to make an attempt at verifying the se...Matthew Wild2013-05-171-1/+142
| * | | | | | | | | | | | | | | | | | | | | prosodyctl: Add 'check' command, which currently checks the config file for s...Matthew Wild2013-05-171-0/+52
| * | | | | | | | | | | | | | | | | | | | | 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 it...Matthew Wild2013-05-171-8/+12
| * | | | | | | | | | | | | | | | | | | | | mod_muc: Refactor config form handling, and allow for clients to submit incom...Matthew Wild2013-05-162-81/+46
| * | | | | | | | | | | | | | | | | | | | | mod_admin_telnet: Add server:memory() command to view details of Prosody's me...Matthew Wild2013-05-161-0/+21
| * | | | | | | | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.9->trunkMatthew Wild2013-05-104-195/+203
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tls branchMatthew Wild2013-05-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Close 'tls' branchorigin/vault/tlsorigin/tlstlsMatthew Wild2013-05-010-0/+0
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge s2s branchMatthew Wild2013-05-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Close 's2s' branchorigin/vault/s2sorigin/s2ss2sMatthew Wild2013-05-010-0/+0
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge sasl branchMatthew Wild2013-05-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Close 'sasl' branchorigin/vault/saslorigin/saslsaslMatthew Wild2013-05-010-0/+0
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.9->trunkMatthew Wild2013-05-018-27/+82
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.9->trunkMatthew Wild2013-04-291-6/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.9->trunkMatthew Wild2013-04-295-88/+156
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.9->trunkMatthew Wild2013-04-292-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.9->trunkMatthew Wild2013-04-296-13/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.9->trunkMatthew Wild2013-04-271-0/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.9->trunkMatthew Wild2013-04-271-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.9->trunkMatthew Wild2013-04-261-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.9->trunkMatthew Wild2013-04-254-39/+46
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.9->trunkMatthew Wild2013-04-232-643/+561
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merges all the way downMatthew Wild2013-04-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \