aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.9->trunkMatthew Wild2013-04-063-3/+41
|\
| * util.json: Convert \uXXXX to UTF-8 when decodingMatthew Wild2013-04-061-1/+36
| * util.stanza: Use correct index when replacing the tag in .tags (thanks daurni...Matthew Wild2013-04-051-1/+1
| * moduleapi: assert() that prosody.core_post_stanza is not nilMatthew Wild2013-04-051-1/+4
* | Merge 0.9->trunkMatthew Wild2013-04-051-1/+1
|\|
| * portmanager: import pairs() (thanks Maranda)Matthew Wild2013-04-051-1/+1
* | Merge 0.9->trunkMatthew Wild2013-04-058-9/+101
|\|
| * Merge with MarandaMatthew Wild2013-04-054-4/+36
| |\
| | * rostermanager: do not save rosters for unexistant users.Marco Cirillo2013-04-051-0/+6
| | * prosody: load rostermanager after usermanager during environment initialization.Marco Cirillo2013-04-051-1/+1
| | * mod_http: disable ssl peer verification by default.Marco Cirillo2013-04-041-0/+1
| | * portmanager: add logic to allow specification of service default values for s...Marco Cirillo2013-04-041-3/+28
| * | mod_storage_none: A null-like storage provider that returns all stores as emp...Matthew Wild2013-04-051-0/+23
| |/
| * util.stanza: Add stanza:find(), a light weight XPath-like methodKim Alvefur2013-04-041-0/+26
| * mod_s2s: Add COMPAT cahin verification code for older LuaSec versionsKim Alvefur2013-04-041-2/+11
| * configure: Replaces tabs with spaces in --helpKim Alvefur2013-04-031-3/+3
| * configure: Add RUNWITH to --helpKim Alvefur2013-04-031-0/+2
* | Merge 0.9->trunkMatthew Wild2013-04-0317-78/+126
|\|
| * mod_pubsub: Don't send current items to new subscribers (I don't know why we ...Matthew Wild2013-04-031-10/+0
| * mod_groups: Remove unused importMatthew Wild2013-04-031-1/+1
| * mod_groups: Add a public function other modules can use to determine if a JID...Matthew Wild2013-04-031-0/+5
| * mod_presence: Remove some unused variablesMatthew Wild2013-04-031-2/+2
| * util.helpers: Helper helpers to log host eventsMatthew Wild2013-04-031-0/+8
| * util.stanza: :maptags(): Fixes to make loop more robust on item removalMatthew Wild2013-04-031-2/+4
| * configmanager: Some cleanup, remove unused variables and importsMatthew Wild2013-04-031-5/+4
| * moduleapi: have get_host_items wrap on get_items from modulemanager, also add...Marco Cirillo2013-04-011-17/+15
| * modulemanager: add missing ipairs import.Marco Cirillo2013-04-011-1/+1
| * modulemanager: add function to retrieve module items from a specific host ent...Marco Cirillo2013-04-011-1/+18
| * prosody.cfg.lua.dist: Update with new options and commentsMatthew Wild2013-04-011-14/+27
| * mod_s2s: Close incoming s2s with stream error when secure and we don't trust ...Matthew Wild2013-04-011-1/+5
| * INSTALL: Update from wikiMatthew Wild2013-03-311-7/+8
| * DEPENDS: Update (LuaSec now has a rock) and add link to /doc/dependsMatthew Wild2013-03-311-7/+9
| * TODO: Remove 0.9Matthew Wild2013-03-311-6/+1
| * net.http.server: Don't overwrite existing response.headers when returning a r...Matthew Wild2013-03-311-1/+7
| * AUTHORS: A small update...Matthew Wild2013-03-311-3/+9
| * tools/migration/Makefile: Apply Lua runtime override (see 53f741a5a73a)Kim Alvefur2013-03-311-1/+2
| * configure: Set to run with lua5.1 in the debian presetKim Alvefur2013-03-311-0/+1
* | Merge 0.9->trunkMatthew Wild2013-03-311-9/+11
|\|
| * portmanager: Log error and fail to bind when port is invalid (not a number)Matthew Wild2013-03-311-9/+11
* | Merge 0.9->trunkMatthew Wild2013-03-281-1/+1
|\|
| * mod_muc/muc.lib: Don't add messages without a body (such as chat state notifi...Matthew Wild2013-03-281-1/+1
* | Merge 0.9->trunkMatthew Wild2013-03-281-0/+5
|\|
| * util.json: Add json.encode_array() (thanks B)Matthew Wild2013-03-281-0/+5
* | Merge 0.9->trunkMatthew Wild2013-03-287-23/+63
|\|
| * mod_privacy: Drop stanzas of type groupchat, so users aren't kicked from thei...Tobias Markmann2013-03-281-0/+4
| * portmanager: Add use_ipv4 option, default to true.Kim Alvefur2013-03-271-2/+6
| * portmanager: use_ipv6 defaults to true if luasocket has ipv6 supportKim Alvefur2013-03-271-1/+2
| * mod_s2s: Prevent s2s to and from hosts we serve locallyKim Alvefur2013-03-271-0/+12
| * mod_s2s: Prevent traceback when replying to incoming connection to a host we ...Kim Alvefur2013-03-261-1/+1
| * mod_s2s: Reset secure flag on new connection attemptKim Alvefur2013-03-251-0/+4