Kim Alvefur [Wed, 28 May 2014 19:11:02 +0000 (21:11 +0200)]
util.vcard: Add support for converting to vcard4
Kim Alvefur [Wed, 28 May 2014 18:12:13 +0000 (20:12 +0200)]
util.vcard: Library for parsing vCards
Matthew Wild [Wed, 28 May 2014 11:44:50 +0000 (12:44 +0100)]
Merge 0.10->trunk
Matthew Wild [Wed, 28 May 2014 11:43:34 +0000 (12:43 +0100)]
mod_admin_telnet: Add command to list MUC rooms
Kim Alvefur [Sat, 24 May 2014 09:17:26 +0000 (11:17 +0200)]
mod_s2s: Fire a 's2s-created' event when new s2s connections are initialized
Kim Alvefur [Fri, 23 May 2014 23:27:09 +0000 (01:27 +0200)]
Merge 0.10->trunk
Matthew Wild [Fri, 23 May 2014 19:37:16 +0000 (20:37 +0100)]
Merge with daurnimator
Kim Alvefur [Thu, 22 May 2014 20:49:43 +0000 (22:49 +0200)]
mod_s2s: Remove redundant setting of session.direction
Kim Alvefur [Thu, 22 May 2014 20:48:06 +0000 (22:48 +0200)]
mod_s2s: Move filter initialization to common place
Kim Alvefur [Thu, 22 May 2014 20:45:58 +0000 (22:45 +0200)]
mod_s2s: Decide on log function once
daurnimator [Wed, 21 May 2014 17:19:57 +0000 (13:19 -0400)]
plugins/muc/muc.lib: Even unavailable session need to be routed to sometimes (e.g. their own leave)
daurnimator [Wed, 21 May 2014 17:11:00 +0000 (13:11 -0400)]
plugins/muc/muc: Only set role to nil if it's the last session to leave
daurnimator [Mon, 19 May 2014 17:47:28 +0000 (13:47 -0400)]
plugins/muc/occupant: Check for type == nil rather than type ~= unavailable
daurnimator [Mon, 19 May 2014 17:40:54 +0000 (13:40 -0400)]
plugins/muc/muc: Better check for live sessions
daurnimator [Mon, 19 May 2014 17:40:24 +0000 (13:40 -0400)]
plugins/muc/muc: Always send occupant list to joining sessions
daurnimator [Mon, 19 May 2014 17:39:45 +0000 (13:39 -0400)]
plugins/muc/mod_muc: Get rid of room global; use module:shared to get it
Matthew Wild [Sat, 17 May 2014 17:17:34 +0000 (18:17 +0100)]
Merge with daurnimator
Kim Alvefur [Sun, 11 May 2014 23:16:17 +0000 (01:16 +0200)]
mod_admin_telnet: Remove dead code
Kim Alvefur [Sun, 11 May 2014 23:07:40 +0000 (01:07 +0200)]
mod_admin_telnet: Show which hosts are components and what type of component in host:list()
Kim Alvefur [Sun, 11 May 2014 17:13:36 +0000 (19:13 +0200)]
mod_admin_telnet: Add c2s:show_tls(), behaves like s2s:show_tls()
Kim Alvefur [Sun, 11 May 2014 17:12:03 +0000 (19:12 +0200)]
mod_admin_telnet: Move generation of log tag for s2s:show() (adds it to c2s:show() too)
Kim Alvefur [Sun, 11 May 2014 16:51:08 +0000 (18:51 +0200)]
mod_admin_telnet: Add s2s:show_tls() for showing ciphers used on s2s connections
Kim Alvefur [Sun, 11 May 2014 17:03:23 +0000 (19:03 +0200)]
mod_admin_telnet: Move extraction of c2s presence info into session_flags()
Kim Alvefur [Sun, 11 May 2014 16:28:00 +0000 (18:28 +0200)]
mod_admin_telnet: Split (secure) into (authenticated) + (secure)
Kim Alvefur [Sun, 11 May 2014 16:22:17 +0000 (18:22 +0200)]
mod_admin_telnet: Send NUL byte as keepalive on read timeouts
Matthew Wild [Sat, 10 May 2014 20:30:00 +0000 (21:30 +0100)]
mod_muc/muc.lib: Fix parameters to send_history() (thanks Peter Villeneuve)
Kim Alvefur [Sun, 11 May 2014 23:18:27 +0000 (01:18 +0200)]
Merge 0.10->trunk
Kim Alvefur [Fri, 9 May 2014 21:35:54 +0000 (23:35 +0200)]
Merge 0.10->trunk
Kim Alvefur [Fri, 9 May 2014 21:28:09 +0000 (23:28 +0200)]
Merge 0.9->0.10
Kim Alvefur [Fri, 9 May 2014 17:59:49 +0000 (19:59 +0200)]
configmanager: Delay importing LuaFileSystem until needed by an Include line
Kim Alvefur [Fri, 9 May 2014 17:35:29 +0000 (19:35 +0200)]
core.certmanager, core.moduleapi, mod_storage_sql, mod_storage_sql2: Import from util.paths
Kim Alvefur [Fri, 9 May 2014 17:34:35 +0000 (19:34 +0200)]
core.configmanager: Move path utility functions into util.paths
Matthew Wild [Thu, 8 May 2014 17:09:59 +0000 (18:09 +0100)]
Merge with Prosody trunk
Kim Alvefur [Mon, 5 May 2014 22:37:08 +0000 (00:37 +0200)]
Merge 0.10->trunk
Kim Alvefur [Fri, 2 May 2014 06:56:03 +0000 (08:56 +0200)]
prosodyctl: Check that there is at least one enabled VirtualHost (or Component) defined
Kim Alvefur [Fri, 2 May 2014 06:27:29 +0000 (08:27 +0200)]
prosodyctl: Use correct variable in check certs
Kim Alvefur [Fri, 2 May 2014 06:21:56 +0000 (08:21 +0200)]
prosodyctl: Check for deprecated config options
Kim Alvefur [Fri, 2 May 2014 06:16:26 +0000 (08:16 +0200)]
prosodyctl: Add check that points out any disabled hosts
Kim Alvefur [Fri, 2 May 2014 06:11:11 +0000 (08:11 +0200)]
prosodyctl: Only perform checks on enabled hosts
daurnimator [Wed, 30 Apr 2014 16:43:47 +0000 (12:43 -0400)]
plugins/muc/mod_muc: Place adhoc section into own scope
daurnimator [Wed, 30 Apr 2014 16:43:04 +0000 (12:43 -0400)]
plugins/muc/mod_muc: Don't use rooms object directory in adhoc section
daurnimator [Wed, 30 Apr 2014 17:12:32 +0000 (13:12 -0400)]
plugins/muc/mod_muc.lua: Add "each_room" function to iterate over rooms (instead of accessing directly)
daurnimator [Tue, 29 Apr 2014 23:35:25 +0000 (19:35 -0400)]
plugins/muc/mod_muc: Remove attempt_room_creation and create_room function. Instead have a 'track_room' function called from the end of the pre-create hook, and just create an un-tracked room object when we get a presence
daurnimator [Tue, 29 Apr 2014 23:00:45 +0000 (19:00 -0400)]
plugins/muc/mod_muc: Move `restrict_room_creation` into own area. now uses pre-create hook
daurnimator [Tue, 29 Apr 2014 22:50:30 +0000 (18:50 -0400)]
plugins/muc/lock.lib: lock inside of pre-create instead of 'created'
daurnimator [Tue, 29 Apr 2014 21:18:14 +0000 (17:18 -0400)]
plugins/muc/mod_muc: Use module:shared instead of save/restore
daurnimator [Tue, 29 Apr 2014 19:13:06 +0000 (15:13 -0400)]
plugins/muc: Move 'module:get_option_number("max_history_messages")' from mod_muc into history lib; remove from muclib exports
daurnimator [Tue, 29 Apr 2014 18:50:13 +0000 (14:50 -0400)]
plugins/muc/mod_muc: Remove support for `host_session.muc`
daurnimator [Tue, 29 Apr 2014 18:24:50 +0000 (14:24 -0400)]
plugins/muc/mod_muc: Move room persistence to own block
daurnimator [Tue, 29 Apr 2014 16:54:04 +0000 (12:54 -0400)]
plugins/muc: Add room:has_occupant() method
daurnimator [Mon, 28 Apr 2014 20:31:21 +0000 (16:31 -0400)]
plugins/muc/mod_muc: No need to treat the host room specially
daurnimator [Mon, 28 Apr 2014 20:33:54 +0000 (16:33 -0400)]
plugins/muc/mod_muc: Use get_option_string instead of get_option and checking
daurnimator [Mon, 28 Apr 2014 20:30:53 +0000 (16:30 -0400)]
plugins/muc/mod_muc: Move affiliation monkey patch into own scope
Kim Alvefur [Sat, 26 Apr 2014 23:02:54 +0000 (01:02 +0200)]
Merge 0.10->trunk
Kim Alvefur [Sat, 26 Apr 2014 23:02:20 +0000 (01:02 +0200)]
Merge 0.9->0.10
Kim Alvefur [Fri, 25 Apr 2014 00:47:09 +0000 (02:47 +0200)]
util.x509: Remove unused imports
Kim Alvefur [Fri, 25 Apr 2014 00:41:55 +0000 (02:41 +0200)]
util.pposix: Fix error reporting from really old Linux fallocate() that did not use errno for some reason (thanks pro)
Kim Alvefur [Thu, 24 Apr 2014 22:36:01 +0000 (00:36 +0200)]
util.pposix: Fix error reporting from posix_fallocate, it doesn't use errno (thanks pro)
Kim Alvefur [Thu, 24 Apr 2014 21:38:47 +0000 (23:38 +0200)]
util.x509: And functions for converting between DER and PEM
Waqas Hussain [Wed, 23 Apr 2014 15:38:34 +0000 (11:38 -0400)]
util.indexedbheap: Fix a possible traceback when removing the last item.
Kim Alvefur [Tue, 22 Apr 2014 22:23:46 +0000 (00:23 +0200)]
Merge 0.10->trunk
Kim Alvefur [Tue, 22 Apr 2014 22:22:36 +0000 (00:22 +0200)]
Merge 0.9->0.10
Kim Alvefur [Tue, 22 Apr 2014 21:36:26 +0000 (23:36 +0200)]
util.dataforms: Add support for XEP-0221: Data Forms Media Element
Kim Alvefur [Tue, 22 Apr 2014 21:14:53 +0000 (23:14 +0200)]
tools/jabberd14sql2prosody: Fix package.path (thanks daurnimator)
Kim Alvefur [Tue, 22 Apr 2014 19:56:06 +0000 (21:56 +0200)]
mod_s2s: Follow XMPP Core on when a stream is to be considered ready
daurnimator [Mon, 21 Apr 2014 21:51:32 +0000 (17:51 -0400)]
plugins/muc/muc.lib: Move sending of occupant list to joining user out of hook, and into main flow: It has to occur before publication of their status
daurnimator [Mon, 21 Apr 2014 21:49:57 +0000 (17:49 -0400)]
plugins/muc/members_only.lib: Compare affiliations via rank; wrap some long lines
daurnimator [Mon, 21 Apr 2014 21:39:18 +0000 (17:39 -0400)]
plugins/muc/muc.lib: Remove reversed conditionals when firing pre- events
Matthew Wild [Mon, 21 Apr 2014 16:42:44 +0000 (17:42 +0100)]
Merge daurnimator->trunk
Kim Alvefur [Mon, 21 Apr 2014 00:43:38 +0000 (02:43 +0200)]
Merge 0.10->trunk
Kim Alvefur [Mon, 21 Apr 2014 00:43:09 +0000 (02:43 +0200)]
certmanager: Move ssl.protocol handling to after ssl.options is a table (thanks Ralph)
Kim Alvefur [Sun, 20 Apr 2014 21:39:45 +0000 (23:39 +0200)]
Merge 0.10->trunk
Kim Alvefur [Sun, 20 Apr 2014 19:25:26 +0000 (21:25 +0200)]
certmanager: Fix traceback if no global 'ssl' section set (thanks albert)
Kim Alvefur [Sat, 19 Apr 2014 19:59:53 +0000 (21:59 +0200)]
mod_http: Update to disable peer verification with the new certmanager
daurnimator [Fri, 18 Apr 2014 16:20:07 +0000 (12:20 -0400)]
plugins/muc/subject.lib: If subject is not set by an occupant, it should come from room jid itself
daurnimator [Fri, 18 Apr 2014 16:19:33 +0000 (12:19 -0400)]
plugins/muc/muc.lib: When user leaves; set their role to nil
daurnimator [Fri, 18 Apr 2014 16:19:04 +0000 (12:19 -0400)]
plugins/muc: Move 'moderated' code to seperate file; changes default "muc-get-default-role" behaviour
Kim Alvefur [Fri, 18 Apr 2014 05:51:41 +0000 (07:51 +0200)]
mod_s2s: Replace open_stream() with function that only adds s2s/dialback attributes to stream header
Kim Alvefur [Fri, 18 Apr 2014 05:50:44 +0000 (07:50 +0200)]
util.xmppstream: Check for callback that may add stream header attributes
Matthew Wild [Thu, 17 Apr 2014 08:01:32 +0000 (09:01 +0100)]
Merge with daurnimator
daurnimator [Wed, 16 Apr 2014 18:16:14 +0000 (14:16 -0400)]
plugins/muc: Move 'hidden' ('public') code to own file
daurnimator [Wed, 16 Apr 2014 17:54:51 +0000 (13:54 -0400)]
plugins/muc: Move subject code to seperate module
daurnimator [Tue, 15 Apr 2014 22:20:56 +0000 (18:20 -0400)]
plugins/muc/muc.lib: Refactor subject logic; fix bug of mixed up subject/author
daurnimator [Tue, 15 Apr 2014 21:06:04 +0000 (17:06 -0400)]
plugins/muc: Move persistent room configuration to own module
Kim Alvefur [Tue, 15 Apr 2014 19:54:44 +0000 (21:54 +0200)]
Merge 0.10->trunk
Daurnimator [Tue, 15 Apr 2014 18:51:49 +0000 (14:51 -0400)]
net.http.server: Fix some typos introduced in
420c0d3b8583.
Kim Alvefur [Tue, 15 Apr 2014 18:36:39 +0000 (20:36 +0200)]
Merge 0.10->trunk
Matthew Wild [Tue, 15 Apr 2014 17:08:16 +0000 (18:08 +0100)]
Merge 0.10->trunk
Daurnimator [Tue, 15 Apr 2014 17:07:45 +0000 (18:07 +0100)]
net.http.server: Add prepare_header() and finish_response() to allow sending chunked responses via the API
Kim Alvefur [Mon, 14 Apr 2014 23:02:56 +0000 (01:02 +0200)]
certmanager: Update ssl_compression when config is reloaded
Kim Alvefur [Mon, 14 Apr 2014 22:49:17 +0000 (00:49 +0200)]
certmanager: Reformat core ssl defaults
Kim Alvefur [Mon, 14 Apr 2014 22:45:07 +0000 (00:45 +0200)]
certmanager: Support ssl.protocol syntax like "tlsv1+" that disables older protocols
Kim Alvefur [Mon, 14 Apr 2014 22:32:11 +0000 (00:32 +0200)]
certmanager: Merge ssl.options, verify etc from core defaults and global ssl settings with inheritance while allowing options to be disabled per virtualhost
Kim Alvefur [Mon, 14 Apr 2014 21:41:26 +0000 (23:41 +0200)]
certmanager: Wrap long line and add comment
Kim Alvefur [Mon, 14 Apr 2014 21:34:35 +0000 (23:34 +0200)]
certmanager: Concatenate cipher list if given as a table
Kim Alvefur [Mon, 14 Apr 2014 21:09:28 +0000 (23:09 +0200)]
certmanager: Allow non-server contexts to be without certificate and key
Kim Alvefur [Mon, 14 Apr 2014 21:00:44 +0000 (23:00 +0200)]
certmanager: Check for non-nil values instead of true-ish values, allows removing defaults
Kim Alvefur [Thu, 10 Apr 2014 14:52:03 +0000 (16:52 +0200)]
Merge 0.10->trunk
Kim Alvefur [Thu, 10 Apr 2014 14:49:59 +0000 (16:49 +0200)]
mod_s2s: Revert
e626ee2fe106 change, it broke Dialback
Kim Alvefur [Thu, 10 Apr 2014 11:16:54 +0000 (13:16 +0200)]
Merge 0.10->trunk