aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * mod_s2s: session.from_host does not allways exist on incoming connections, tr...Kim Alvefur2013-03-251-1/+1
| * mod_s2s: Keep the dns answer object around a while so plugins can look at itKim Alvefur2013-03-231-1/+1
| * net.server, _select: Reorganise configuration of server_select to be more lik...Kim Alvefur2013-03-232-4/+23
| * prosody, prosodyctl: Remove last trace of "core" \o/Kim Alvefur2013-03-232-11/+11
| * net.server: No sections in config anymoreKim Alvefur2013-03-231-2/+2
* | mod_privacy: Drop stanzas of type groupchat, so users aren't kicked from thei...Tobias Markmann2013-03-281-0/+4
* | Merge 0.9->trunkKim Alvefur2013-03-2329-52/+48
|\|
| * configmanager: Fix so unset variables are searched for in the global sectionKim Alvefur2013-03-231-1/+1
| * util.{prosodyctl,openssl}: More use of config sections removedKim Alvefur2013-03-232-7/+7
| * mod_tls: More use of config sections removedKim Alvefur2013-03-231-2/+2
| * core.*: Complete removal of all traces of the "core" section and section-rela...Kim Alvefur2013-03-237-23/+20
| * MUC: Access prosody.hosts instead of the old global hostsKim Alvefur2013-03-231-1/+1
| * mod_proxy65: Fix typo in commentKim Alvefur2013-03-231-1/+1
| * mod_http: Import portmanagerKim Alvefur2013-03-231-0/+1
| * mod_groups: Use module API for reading configKim Alvefur2013-03-231-1/+1
| * mod_roster: Remove unused variableKim Alvefur2013-03-231-1/+0
| * mod_motd, mod_register, mod_private, mod_http_errors, mod_admin_adhoc: Remove...Kim Alvefur2013-03-235-8/+2