|
mod_pubsub: Add max items to node config form
|
Kim Alvefur |
Sun, 28 Sep 2014 01:50:17 +0200 |
|
util.pubsub: Add support for limiting the number of item in a node (default to 20)
|
Kim Alvefur |
Sun, 28 Sep 2014 01:50:00 +0200 |
|
mod_pubsub: Add support for node configuration
|
Kim Alvefur |
Sun, 28 Sep 2014 01:46:17 +0200 |
|
util.pubsub: Add support for node configuration
|
Kim Alvefur |
Sun, 28 Sep 2014 01:45:59 +0200 |
|
util.pubsub: One less table allocated per pubsub object created
|
Kim Alvefur |
Sun, 28 Sep 2014 00:05:21 +0200 |
|
util.pubsub: Use local
|
Kim Alvefur |
Sat, 27 Sep 2014 19:57:33 +0200 |
|
mod_pubsub: Transplant pieces of cdcfd93e2f43 from trunk
|
Kim Alvefur |
Sat, 27 Sep 2014 19:53:39 +0200 |
|
net.server_select: When an SSL handshake is connected, if there is pending data to be written to the socket, mark the socket as waiting to send (thanks daurnimator)
|
Matthew Wild |
Fri, 26 Sep 2014 17:16:46 +0100 |
|
mod_pep_plus: Add pubsub service objects to an item list
|
Kim Alvefur |
Sat, 27 Sep 2014 19:00:09 +0200 |
|
muc: Add 'occupant' to muc-occupant-{joined,left,session-new} events (thanks daurnimator/fippo)
|
Matthew Wild |
Fri, 26 Sep 2014 17:34:15 +0100 |
|
hostmanager: Don't prevent host_session.send() from routing errors or iq results, so modules can handle them. This code was originally added for a reason, but I can't remember what it was.
|
Matthew Wild |
Fri, 26 Sep 2014 17:10:43 +0100 |
|
plugins/muc: Add muc-occupant-groupchat event
|
daurnimator |
Thu, 25 Sep 2014 17:43:00 -0400 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Tue, 23 Sep 2014 23:22:13 +0200 |
|
mod_saslauth: Fix encoding of missing vs empty SASL reply messages
|
Kim Alvefur |
Tue, 23 Sep 2014 19:46:29 +0200 |
|
mod_s2s: Close s2s connections that can not proceed due to mod_dialback not being present
|
Kim Alvefur |
Tue, 23 Sep 2014 19:41:10 +0200 |
|
mod_saslauth: Stricter SASL EXTERNAL handling more in line with XEP-0178
|
Kim Alvefur |
Tue, 23 Sep 2014 19:29:14 +0200 |
|
mod_dialback, mod_saslauth: Remove broken fallback to dialback on SASL EXTERNAL failure
|
Kim Alvefur |
Tue, 23 Sep 2014 14:23:01 +0200 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Tue, 23 Sep 2014 01:44:16 +0200 |
|
core.module{manager,api}: Fix for 010b141e91ed (Thanks v1ct0r)
|
Kim Alvefur |
Tue, 23 Sep 2014 00:23:33 +0200 |
|
util.random: Ensure at least 4 bytes of previous random state is used when generating new randomness
|
Kim Alvefur |
Thu, 18 Sep 2014 10:21:38 +0200 |
|
util.random: Switch to SHA512
|
Kim Alvefur |
Thu, 18 Sep 2014 10:16:59 +0200 |
|
plugins/muc/muc.lib: Fix iq results coming from the real jid, not the in-room jid (thanks Lance)
|
daurnimator |
Tue, 16 Sep 2014 17:11:29 -0400 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Thu, 18 Sep 2014 02:22:48 +0200 |
|
util.array: Add type() local
|
Kim Alvefur |
Wed, 17 Sep 2014 14:50:44 +0200 |
|
prosody: Fix getfenv replacement for Lua 5.2
|
Kim Alvefur |
Wed, 17 Sep 2014 14:50:00 +0200 |
|
core.modulemanager, core.moduleapi: Hack around dependency loop
|
Kim Alvefur |
Wed, 17 Sep 2014 14:48:49 +0200 |
|
core.moduleapi: Use require instead of global to get storagemanager in module:open_store()
|
Kim Alvefur |
Wed, 17 Sep 2014 14:47:52 +0200 |
|
util-src/*.c: Add macro for compiling with Lua 5.2
|
Kim Alvefur |
Wed, 17 Sep 2014 14:30:29 +0200 |
|
util-src/*.c: Use the more concise lua_setfield
|
Kim Alvefur |
Wed, 17 Sep 2014 02:23:17 +0200 |
|
util-src/*.c: Don't create globals when loaded
|
Kim Alvefur |
Tue, 16 Sep 2014 21:56:18 +0200 |
|
plugins/muc/muc.lib: Allow plugins to reject broadcasts in the muc-broadcast-message event.
|
daurnimator |
Tue, 16 Sep 2014 13:02:21 -0400 |
|
plugins/mod_muc_unique: Fix undefined global access (thanks Lance)
|
Waqas Hussain |
Tue, 16 Sep 2014 12:27:05 -0400 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Thu, 11 Sep 2014 01:17:56 +0200 |
|
net.websocket: Fix handling of 'protocol' argument
|
Kim Alvefur |
Thu, 11 Sep 2014 00:55:51 +0200 |
|
Makefile: Add net/websocket to install target
|
Kim Alvefur |
Thu, 11 Sep 2014 00:31:11 +0200 |
|
prosodyctl: Use sha256 for certificate requests and self-signed certificates
|
Kim Alvefur |
Thu, 11 Sep 2014 00:10:29 +0200 |
|
core.sessionmanager: Set a fake thread on destroyed sessions, fixes traceback if stanzas are emitted after a session is destroyed (thanks Sven Blumenstein)
|
Kim Alvefur |
Thu, 11 Sep 2014 00:09:07 +0200 |
|
core.stanza_router, mod_s2s: Move handling of S2S features to mod_s2s from stanza_router
|
Kim Alvefur |
Tue, 09 Sep 2014 15:05:46 +0200 |
|
Merge 0.9->0.10
|
Kim Alvefur |
Tue, 09 Sep 2014 14:42:33 +0200 |
|
core.stanza_router: Stricter validation of stanzas
|
Kim Alvefur |
Tue, 09 Sep 2014 14:42:10 +0200 |
|
util.vcard: Turn PHOTO fields into data-uris
|
Kim Alvefur |
Wed, 10 Sep 2014 16:47:55 +0200 |
|
Merge 0.10->trunk
|
Matthew Wild |
Fri, 05 Sep 2014 19:09:13 +0100 |
|
Merge with Florob
|
Matthew Wild |
Fri, 05 Sep 2014 19:08:42 +0100 |
|
mod_websocket: Initial commit (based on the prosody-modules version)
|
Florian Zeitz |
Fri, 05 Sep 2014 03:47:39 +0200 |
|
Check Sec-WebSocket-Protocol header
|
Florian Zeitz |
Fri, 05 Sep 2014 02:14:04 +0200 |
|
net/websocket: Add new websocket client code
|
daurnimator |
Wed, 03 Sep 2014 15:28:46 -0400 |
|
plugins/muc: Add affiliation_notify config option to send out status code 101
|
daurnimator |
Fri, 05 Sep 2014 12:16:53 -0400 |
|
plugins/muc/muc.lib: Add muc-set-affiliation event
|
daurnimator |
Fri, 05 Sep 2014 11:28:28 -0400 |
|
plugins/muc/muc.lib: Use get_affilation() inside of set_affiliation(), so that the override in mod_muc works
|
daurnimator |
Fri, 05 Sep 2014 11:20:54 -0400 |
|
plugins/muc/muc.lib: Add instant room support
|
daurnimator |
Fri, 05 Sep 2014 11:19:16 -0400 |
|
Merge 0.10->trunk
|
Matthew Wild |
Fri, 05 Sep 2014 09:04:37 +0100 |
|
net/websocket: Add new websocket client code
|
daurnimator |
Wed, 03 Sep 2014 15:28:46 -0400 |
|
Merge 0.10->trunk
|
Matthew Wild |
Wed, 03 Sep 2014 18:51:29 +0100 |
|
Merge 0.9->0.10
|
Matthew Wild |
Wed, 03 Sep 2014 18:50:20 +0100 |
|
net.http.parser: Support status code 101 and allow handling of the received data by someone else
|
Matthew Wild |
Wed, 03 Sep 2014 18:49:41 +0100 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Wed, 03 Sep 2014 03:35:48 +0200 |
|
util.hex: Use locals!
|
Kim Alvefur |
Wed, 03 Sep 2014 00:37:41 +0200 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Tue, 02 Sep 2014 22:34:32 +0200 |
|
Merge 0.9->0.10
|
Kim Alvefur |
Tue, 02 Sep 2014 22:33:11 +0200 |
|
net.server_select: 'listener'->'listeners' (fixes undefined global access)
|
Matthew Wild |
Tue, 02 Sep 2014 17:23:44 +0100 |
|
net.http, net.http.server, mod_c2s, mod_s2s, mod_component, mod_admin_telnet, mod_net_multiplex: Add ondetach to release connection from 'sessions' table (or equivalent)
|
Matthew Wild |
Fri, 29 Aug 2014 11:54:34 +0100 |
|
net.server_{select,event}: Add 'ondetach' callback for listener objects, to notify them when another listener is being assigned to a connection
|
Matthew Wild |
Fri, 29 Aug 2014 11:39:56 +0100 |
|
mod_s2s: Close offending s2s streams missing an 'id' attribute with a stream error instead of throwing an unhandled error
|
Kim Alvefur |
Tue, 02 Sep 2014 17:24:25 +0200 |
|
util.uuid: Use util.hex and util.random
|
Matthew Wild |
Tue, 02 Sep 2014 17:58:12 +0100 |
|
util.random: Generic util lib for generating strings of random bytes
|
Matthew Wild |
Tue, 02 Sep 2014 17:57:18 +0100 |
|
util.hex: Small util lib for converting to/from hex strings
|
Matthew Wild |
Tue, 02 Sep 2014 17:56:42 +0100 |
|
mod_dialback: Move d-w-d after to/from validation
|
Kim Alvefur |
Mon, 01 Sep 2014 20:20:05 +0200 |
|
mod_s2s_auth_certs: Warn about lack of certificate (Mostly jabberd14 not sending a client certificate)
|
Kim Alvefur |
Fri, 29 Aug 2014 02:24:49 +0200 |
|
mod_muc: Fix 'destroy rooms' adhoc command (Thanks Florob)
|
Kim Alvefur |
Sun, 31 Aug 2014 20:33:47 +0200 |
|
Merge 0.10->trunk
|
Matthew Wild |
Thu, 28 Aug 2014 12:24:15 +0100 |
|
Merge 0.9->0.10
|
Matthew Wild |
Thu, 28 Aug 2014 12:23:58 +0100 |
|
Tagging 0.9.5
|
Matthew Wild |
Thu, 28 Aug 2014 12:22:39 +0100 |
|
Merge 0.10->trunk
|
Matthew Wild |
Thu, 28 Aug 2014 12:05:18 +0100 |
|
Merge 0.9->0.10
|
Matthew Wild |
Thu, 28 Aug 2014 09:23:24 +0100 |
|
util.filters: Ignore filters being added twice (fixes issues on removal)
0.9.5
|
Matthew Wild |
Thu, 28 Aug 2014 09:20:33 +0100 |
|
mod_privacy: Fix to correctly sort privacy list rules by order (thanks Flow)
|
Matthew Wild |
Thu, 28 Aug 2014 09:17:07 +0100 |
|
mod_c2s, mod_s2s: Log received invalid stream headers
|
Matthew Wild |
Sat, 23 Aug 2014 09:29:17 +0100 |
|
util.xmppstream: When error is 'no-stream', pass the received tagname to the error handler
|
Matthew Wild |
Sat, 23 Aug 2014 09:22:05 +0100 |
|
mod_s2s: Reset stream ID when resetting stream [compliance]
|
Kim Alvefur |
Wed, 27 Aug 2014 13:20:08 +0200 |
|
modulemanager: Reduce warning to debug level message about modules already being loaded, it's probably just module:depends()
|
Kim Alvefur |
Wed, 27 Aug 2014 10:46:22 +0200 |
|
net.http.server: Comment out a log message
|
Kim Alvefur |
Wed, 27 Aug 2014 10:44:45 +0200 |
|
mod_s2s: Mark stream as opened earlier for outgoing connections, fixes double stream headers on policy failures
|
Kim Alvefur |
Tue, 26 Aug 2014 21:50:08 +0200 |
|
mod_compression: Handle compression setup errors by logging a warning about it (fixes #408)
|
Kim Alvefur |
Tue, 26 Aug 2014 12:19:27 +0200 |
|
mod_posix: Make sure that 'pidfile' is a string
|
Kim Alvefur |
Tue, 26 Aug 2014 12:02:41 +0200 |
|
prosodyctl: Verify that 'pidfile' is a string, show friendly error otherwise
|
Kim Alvefur |
Tue, 26 Aug 2014 12:00:51 +0200 |
|
util.xmppstream: Don't include empty stream ID in stream header (got here from mod_c2s)
|
Kim Alvefur |
Wed, 27 Aug 2014 13:00:04 +0200 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Wed, 13 Aug 2014 19:22:08 +0200 |
|
mod_private: Fix traceback due to missing table index
|
Kim Alvefur |
Wed, 13 Aug 2014 19:19:34 +0200 |
|
mod_blocklist: Use full word as variable name, we can afford that
|
Kim Alvefur |
Tue, 12 Aug 2014 15:42:20 +0200 |
|
mod_blocklist: Correct comment
|
Kim Alvefur |
Tue, 12 Aug 2014 15:40:00 +0200 |
|
mod_blocklist: Fix any unblock emptying the blocklist
|
Kim Alvefur |
Tue, 12 Aug 2014 15:38:48 +0200 |
|
mod_storage_sql2: DELETE then INSERT in map stores
|
Kim Alvefur |
Tue, 12 Aug 2014 11:38:12 +0200 |
|
mod_muc: Fix tracebacks (thanks nick1)
|
Kim Alvefur |
Mon, 11 Aug 2014 11:36:30 +0200 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Sun, 10 Aug 2014 10:31:18 +0200 |
|
mod_privacy: Remove, leave a log message about being replaced by mod_blocklist and load that instead
|
Kim Alvefur |
Sun, 10 Aug 2014 10:29:38 +0200 |
|
prosody.cfg.lua.dist: Replace mod_privacy with mod_blocklist in the default config
|
Kim Alvefur |
Sun, 10 Aug 2014 10:27:20 +0200 |
|
mod_blocklist: XEP-0191 implementation written for speed and independence from mod_privacy
|
Kim Alvefur |
Sun, 10 Aug 2014 10:27:00 +0200 |
|
mod_private: Use map store
|
Kim Alvefur |
Sat, 09 Aug 2014 21:52:32 +0200 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Sat, 09 Aug 2014 21:48:52 +0200 |
|
mod_private: Cleanup and more tailcalls
|
Kim Alvefur |
Sat, 09 Aug 2014 21:48:11 +0200 |
|
util.jid: Optimize bare
|
Kim Alvefur |
Thu, 07 Aug 2014 17:43:28 +0200 |
|
util.jid: Use existing join function in jid.prep
|
Kim Alvefur |
Thu, 07 Aug 2014 17:35:11 +0200 |
|
util.jid: Return early in join on invalid jids
|
Kim Alvefur |
Thu, 07 Aug 2014 17:20:51 +0200 |
|
mod_s2s: Remove unused locals
|
Kim Alvefur |
Fri, 25 Jul 2014 21:12:21 +0200 |
|
storagemanager: Fix map store shim if store is empty
|
Kim Alvefur |
Fri, 08 Aug 2014 12:38:35 +0200 |
|
plugins/mod_storage_sql2: Return correct arguments from map_store operations
|
daurnimator |
Thu, 07 Aug 2014 18:34:51 -0400 |
|
plugins/muc/mod_muc: persistent rooms keyval store needs username as nil
|
daurnimator |
Thu, 07 Aug 2014 18:03:31 -0400 |
|
plugins/muc/mod_muc: Use map store for room persistence
|
daurnimator |
Thu, 07 Aug 2014 12:35:12 -0400 |
|
plugins/muc/mod_muc: Remove unused import
|
daurnimator |
Thu, 07 Aug 2014 12:34:51 -0400 |
|
plugins/mod_storage_sql2: Add map store support
|
daurnimator |
Thu, 07 Aug 2014 12:16:16 -0400 |
|
core/storagemanager: When map store isn't available, fallback to keyval store
|
daurnimator |
Thu, 07 Aug 2014 12:15:15 -0400 |
|
mod_muc: Import util.stanza into the config handler modules that need it. Fixes #432.
|
Matthew Wild |
Tue, 05 Aug 2014 09:55:08 +0100 |
|
mod_muc: Fix use of undefined global. Fixes #431.
|
Matthew Wild |
Tue, 05 Aug 2014 09:16:29 +0100 |
|
Merge 0.10->trunk
|
Matthew Wild |
Thu, 31 Jul 2014 07:14:54 +0100 |
|
Merge 0.9->0.10
|
Matthew Wild |
Thu, 31 Jul 2014 07:11:54 +0100 |
|
prosodyctl: Remove nonsensical warning
|
Matthew Wild |
Thu, 31 Jul 2014 06:59:12 +0100 |
|
prosodyctl: Improve JID splitting and normalization for adduser/passwd/deluser
|
Matthew Wild |
Thu, 31 Jul 2014 06:58:15 +0100 |
|
configmanager: nameprep VirtualHost and Component names
|
Matthew Wild |
Thu, 31 Jul 2014 06:56:21 +0100 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Fri, 25 Jul 2014 21:16:52 +0200 |
|
mod_s2s: Remove unused locals
|
Kim Alvefur |
Fri, 25 Jul 2014 21:12:21 +0200 |
|
mod_s2s_auth_certs: Pick a logging function once and stick with it
|
Kim Alvefur |
Fri, 25 Jul 2014 21:03:16 +0200 |
|
mod_s2s_auth_certs: Split PKIX based certificate checking from mod_s2s into new plugin
|
Kim Alvefur |
Fri, 25 Jul 2014 20:41:54 +0200 |
|
mod_muc/muc.lib: Remove is_anonymous from event (fix for ec57067c1e0d)
|
Matthew Wild |
Fri, 25 Jul 2014 18:34:43 +0100 |
|
mod_muc/muc.lib: Pass all info to muc-broadcast-presence handlers that would be required to use room:build_item_list() - useful for plugins
|
Matthew Wild |
Fri, 25 Jul 2014 18:32:15 +0100 |
|
Merge 0.10->trunk
|
Matthew Wild |
Fri, 25 Jul 2014 13:54:47 +0100 |
|
Merge 0.9->0.10
|
Matthew Wild |
Fri, 25 Jul 2014 13:54:27 +0100 |
|
net.server_select/event: Switch sender mode to *a when reading, to make sure we get all available data
|
Matthew Wild |
Fri, 25 Jul 2014 13:53:39 +0100 |
|
Merge 0.10->trunk
|
Matthew Wild |
Fri, 25 Jul 2014 13:02:46 +0100 |
|
Merge 0.9->0.10
|
Matthew Wild |
Fri, 25 Jul 2014 13:01:57 +0100 |
|
mod_admin_telnet: Fix dns:(add,set)nameservers()
|
Kim Alvefur |
Fri, 25 Jul 2014 13:59:17 +0200 |
|
net.dns: Remove unused obsolete code
|
Matthew Wild |
Fri, 25 Jul 2014 12:54:31 +0100 |
|
net.dns: Ensure all pending requests get notified of a timeout when looking up a record (fix for d122420542fb)
|
Matthew Wild |
Fri, 25 Jul 2014 12:08:07 +0100 |
|
util.vcard: Add support for uri types in vcard4
|
Kim Alvefur |
Wed, 09 Jul 2014 08:23:16 +0200 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Wed, 09 Jul 2014 02:06:37 +0200 |
|
mod_dialback: Respect dwd config option
|
Kim Alvefur |
Wed, 09 Jul 2014 02:04:16 +0200 |
|
mod_pep_plus: Only broadcast newly added subscriptions
|
Kim Alvefur |
Tue, 08 Jul 2014 07:32:45 +0200 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Fri, 04 Jul 2014 23:05:27 +0200 |
|
mod_dialback.lua: Only check certificates on secure connections
|
Kim Alvefur |
Fri, 04 Jul 2014 23:04:56 +0200 |
|
mod_lastactivity, mod_legacyauth, mod_presence, mod_saslauth, mod_tls: Use the newer stanza:get_child APIs and optimize away some table lookups
|
Kim Alvefur |
Fri, 04 Jul 2014 22:52:34 +0200 |
|
mod_dialback: Short-circuit dialback auth if certificate is considered valid
|
Kim Alvefur |
Fri, 04 Jul 2014 21:48:25 +0200 |
|
mod_dialback: Keep the same dialback secret across module reloads
|
Kim Alvefur |
Thu, 03 Jul 2014 15:38:53 +0200 |
|
hostmanager, mod_dialback: Move generation of dialback secret out of core
|
Kim Alvefur |
Thu, 22 May 2014 15:21:22 +0200 |
|
Merge 0.9->0.10
|
Kim Alvefur |
Fri, 04 Jul 2014 15:54:37 +0200 |
|
mod_register: get_child_text! (thanks Lloyd)
|
Kim Alvefur |
Thu, 03 Jul 2014 17:53:24 +0200 |
|
mod_tls: Simplify and use new ssl config merging in certmanager
|
Kim Alvefur |
Thu, 03 Jul 2014 15:35:45 +0200 |
|
core.portmanager: Simplify and take advantage of new ssl config merging in certmanager
|
Kim Alvefur |
Thu, 03 Jul 2014 15:33:11 +0200 |
|
core.certmanager: Make create_context() support an arbitrary number of option sets, merging all
|
Kim Alvefur |
Thu, 03 Jul 2014 15:32:26 +0200 |
|
core.certmanager: Use util.sslconfig
|
Kim Alvefur |
Thu, 03 Jul 2014 15:31:12 +0200 |
|
util.sslconfig: Add lib to deal with LuaSec SSL context configs
|
Kim Alvefur |
Thu, 03 Jul 2014 15:27:49 +0200 |
|
mod_presence: Move presence/initial event to correct place so it actually fires
|
Kim Alvefur |
Thu, 03 Jul 2014 11:54:50 +0200 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Mon, 30 Jun 2014 13:12:16 +0200 |
|
Merge 0.9->0.10
|
Kim Alvefur |
Mon, 30 Jun 2014 13:11:01 +0200 |
|
net.dns: Fix duplicated cache insertions by limiting outstanding queries per name to one
|
Kim Alvefur |
Mon, 30 Jun 2014 12:45:53 +0200 |
|
net.adns: Add missing local declaration
|
Kim Alvefur |
Wed, 25 Jun 2014 15:33:49 +0200 |
|
net/server_*: Fix addclient: LuaSocket 3.0-rc1 sometimes returns EALREADY instead of EINPROGRESS when the dns lookup has multiple results
|
daurnimator |
Wed, 25 Jun 2014 12:15:00 -0400 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Sat, 21 Jun 2014 15:05:52 +0200 |
|
Merge 0.9->0.10
|
Kim Alvefur |
Sat, 21 Jun 2014 15:05:21 +0200 |
|
mod_storage_{none,internal,sql}: Return error for unsupported (everything but keyval) store types
|
Kim Alvefur |
Fri, 20 Jun 2014 16:22:23 +0200 |
|
mod_storage_sql2: Don't ignore failure in keyval_store:get() (thanks daurnimator)
|
Kim Alvefur |
Fri, 20 Jun 2014 16:16:33 +0200 |
|
mod_presence: Fire a presence/initial event on initial presence
|
Kim Alvefur |
Fri, 20 Jun 2014 16:10:04 +0200 |
|
tools/ejabberd2prosody.lua: Fix JID building, node-less jids became @hostname in some cases
|
Kim Alvefur |
Tue, 17 Jun 2014 11:01:51 +0200 |
|
mod_c2s: Fix traceback if c2s stream sent to component
|
Kim Alvefur |
Sat, 10 May 2014 02:12:51 +0200 |
|
plugins/muc/muc: Fire broadcast presences event before creating full/anon presences
|
daurnimator |
Tue, 17 Jun 2014 15:27:00 -0400 |
|
plugins/muc: Fix use of incorrect event on occupant join
|
daurnimator |
Tue, 17 Jun 2014 15:18:43 -0400 |
|
plugins/muc/mod_muc: fix wrong event for persistence
|
daurnimator |
Wed, 11 Jun 2014 17:54:23 -0400 |
|
plugins/muc/muc.lib: Deliver declines to in-room jids correctly
|
daurnimator |
Wed, 11 Jun 2014 14:59:59 -0400 |
|
plugins/muc/muc.lib: Don't add invite/decline bodies if they already have one
|
daurnimator |
Fri, 06 Jun 2014 14:34:01 -0400 |
|
plugins/muc/muc.lib: Use original decline as template for medated decline
|
daurnimator |
Fri, 06 Jun 2014 14:33:43 -0400 |
|
plugins/muc/muc: When forwarding mediated invites; use filtered version of original invite instead of new object
|
daurnimator |
Thu, 05 Jun 2014 17:08:05 -0400 |
|
plugins/muc: Move 'x' filtering from occupant to util
|
daurnimator |
Thu, 05 Jun 2014 17:07:14 -0400 |
|
mod_admin_telnet: Update muc:room(jid) and muc:list(host) to use the new MUC API
|
Waqas Hussain |
Thu, 05 Jun 2014 17:15:04 -0400 |
|
plugins/muc/muc.lib: Fix incorrect whois logic (thanks mva)
|
daurnimator |
Sun, 01 Jun 2014 15:40:04 -0400 |
|
plugins/muc/muc.lib: Fix whois check when broadcasting occupant presence
|
Waqas Hussain |
Sun, 01 Jun 2014 04:42:55 -0400 |
|
Merge with daurnimator
|
Waqas Hussain |
Fri, 30 May 2014 18:31:26 -0400 |
|
plugins/muc/muc.lib: Fire event for presence broadcast
|
daurnimator |
Thu, 29 May 2014 13:27:41 -0400 |
|
util.vcard: Add missing local declaration
|
Kim Alvefur |
Wed, 28 May 2014 22:09:32 +0200 |
|
mod_pep_plus: Expose get_pep_service()
|
Kim Alvefur |
Wed, 28 May 2014 21:52:57 +0200 |
|
util.vcard: Add support for converting to vcard4
|
Kim Alvefur |
Wed, 28 May 2014 21:11:02 +0200 |
|
util.vcard: Library for parsing vCards
|
Kim Alvefur |
Wed, 28 May 2014 20:12:13 +0200 |
|
Merge 0.10->trunk
|
Matthew Wild |
Wed, 28 May 2014 12:44:50 +0100 |
|
mod_admin_telnet: Add command to list MUC rooms
|
Matthew Wild |
Wed, 28 May 2014 12:43:34 +0100 |
|
mod_s2s: Fire a 's2s-created' event when new s2s connections are initialized
|
Kim Alvefur |
Sat, 24 May 2014 11:17:26 +0200 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Sat, 24 May 2014 01:27:09 +0200 |
|
mod_s2s: Remove redundant setting of session.direction
|
Kim Alvefur |
Thu, 22 May 2014 22:49:43 +0200 |
|
mod_s2s: Move filter initialization to common place
|
Kim Alvefur |
Thu, 22 May 2014 22:48:06 +0200 |
|
mod_s2s: Decide on log function once
|
Kim Alvefur |
Thu, 22 May 2014 22:45:58 +0200 |
|
Merge with daurnimator
|
Matthew Wild |
Fri, 23 May 2014 20:37:16 +0100 |
|
plugins/muc/muc.lib: Even unavailable session need to be routed to sometimes (e.g. their own leave)
|
daurnimator |
Wed, 21 May 2014 13:19:57 -0400 |
|
plugins/muc/muc: Only set role to nil if it's the last session to leave
|
daurnimator |
Wed, 21 May 2014 13:11:00 -0400 |
|
plugins/muc/occupant: Check for type == nil rather than type ~= unavailable
|
daurnimator |
Mon, 19 May 2014 13:47:28 -0400 |
|
plugins/muc/muc: Better check for live sessions
|
daurnimator |
Mon, 19 May 2014 13:40:54 -0400 |
|
plugins/muc/muc: Always send occupant list to joining sessions
|
daurnimator |
Mon, 19 May 2014 13:40:24 -0400 |
|
plugins/muc/mod_muc: Get rid of room global; use module:shared to get it
|
daurnimator |
Mon, 19 May 2014 13:39:45 -0400 |
|
plugins/muc/mod_muc: Place adhoc section into own scope
|
daurnimator |
Wed, 30 Apr 2014 12:43:47 -0400 |
|
plugins/muc/mod_muc: Don't use rooms object directory in adhoc section
|
daurnimator |
Wed, 30 Apr 2014 12:43:04 -0400 |
|
plugins/muc/mod_muc.lua: Add "each_room" function to iterate over rooms (instead of accessing directly)
|
daurnimator |
Wed, 30 Apr 2014 13:12:32 -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 19:35:25 -0400 |
|
plugins/muc/mod_muc: Move `restrict_room_creation` into own area. now uses pre-create hook
|
daurnimator |
Tue, 29 Apr 2014 19:00:45 -0400 |
|
plugins/muc/lock.lib: lock inside of pre-create instead of 'created'
|
daurnimator |
Tue, 29 Apr 2014 18:50:30 -0400 |
|
plugins/muc/mod_muc: Use module:shared instead of save/restore
|
daurnimator |
Tue, 29 Apr 2014 17:18:14 -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 15:13:06 -0400 |
|
plugins/muc/mod_muc: Remove support for `host_session.muc`
|
daurnimator |
Tue, 29 Apr 2014 14:50:13 -0400 |
|
plugins/muc/mod_muc: Move room persistence to own block
|
daurnimator |
Tue, 29 Apr 2014 14:24:50 -0400 |
|
plugins/muc: Add room:has_occupant() method
|
daurnimator |
Tue, 29 Apr 2014 12:54:04 -0400 |
|
plugins/muc/mod_muc: No need to treat the host room specially
|
daurnimator |
Mon, 28 Apr 2014 16:31:21 -0400 |
|
plugins/muc/mod_muc: Use get_option_string instead of get_option and checking
|
daurnimator |
Mon, 28 Apr 2014 16:33:54 -0400 |
|
plugins/muc/mod_muc: Move affiliation monkey patch into own scope
|
daurnimator |
Mon, 28 Apr 2014 16:30:53 -0400 |
|
Merge with daurnimator
|
Matthew Wild |
Sat, 17 May 2014 18:17:34 +0100 |
|
Merge with Prosody trunk
|
Matthew Wild |
Thu, 08 May 2014 18:09:59 +0100 |
|
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 17:51:32 -0400 |
|
plugins/muc/members_only.lib: Compare affiliations via rank; wrap some long lines
|
daurnimator |
Mon, 21 Apr 2014 17:49:57 -0400 |
|
plugins/muc/muc.lib: Remove reversed conditionals when firing pre- events
|
daurnimator |
Mon, 21 Apr 2014 17:39:18 -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 12:20:07 -0400 |
|
plugins/muc/muc.lib: When user leaves; set their role to nil
|
daurnimator |
Fri, 18 Apr 2014 12:19:33 -0400 |
|
plugins/muc: Move 'moderated' code to seperate file; changes default "muc-get-default-role" behaviour
|
daurnimator |
Fri, 18 Apr 2014 12:19:04 -0400 |
|
plugins/muc: Move 'hidden' ('public') code to own file
|
daurnimator |
Wed, 16 Apr 2014 14:16:14 -0400 |
|
plugins/muc: Move subject code to seperate module
|
daurnimator |
Wed, 16 Apr 2014 13:54:51 -0400 |
|
plugins/muc/muc.lib: Refactor subject logic; fix bug of mixed up subject/author
|
daurnimator |
Tue, 15 Apr 2014 18:20:56 -0400 |
|
plugins/muc: Move persistent room configuration to own module
|
daurnimator |
Tue, 15 Apr 2014 17:06:04 -0400 |
|
plugins/muc/muc.lib: Move members_only into seperate file
|
daurnimator |
Fri, 04 Apr 2014 11:20:20 -0400 |
|
plugins/muc/muc.lib: Turn get_default_role into an event
|
daurnimator |
Thu, 03 Apr 2014 18:36:28 -0400 |
|
plugins/muc/muc.lib: Fix getting a list of occupants by role (it was sending presences instead of items inside an iq)
|
daurnimator |
Thu, 03 Apr 2014 18:10:16 -0400 |
|
plugins/muc: Move valid_roles, valid_affiliations and is_kickable_error to new muc/util module
|
daurnimator |
Thu, 03 Apr 2014 17:09:04 -0400 |
|
plugins/muc/muc.lib: Use util.iterators to count occupants
|
daurnimator |
Thu, 03 Apr 2014 16:10:43 -0400 |
|
plugins/muc/muc.lib: Move occupancy check to later in `deconstruct_stanza_id`: As vcards are from the bare jid, you need to use the `from_jid` out of the encoded `id`
|
daurnimator |
Thu, 03 Apr 2014 16:04:04 -0400 |
|
plugins/muc: Move history to an external module
|
daurnimator |
Thu, 03 Apr 2014 15:14:52 -0400 |
|
plugins/muc: Move `whois` code to seperate file
|
daurnimator |
Thu, 03 Apr 2014 14:24:27 -0400 |
|
plugins/muc/muc.lib: Remember to coerce nil role to "none"
|
daurnimator |
Thu, 03 Apr 2014 14:23:06 -0400 |
|
plugins/muc/muc.lib: Refactor of change-nick presence handling
|
daurnimator |
Thu, 03 Apr 2014 12:44:27 -0400 |
|
plugins/muc/muc.lib: Clean up whois handling
|
daurnimator |
Thu, 03 Apr 2014 12:25:03 -0400 |
|
plugins/muc/occupant.lib: Don't allow an unavailable session to be the primary jid
|
daurnimator |
Wed, 02 Apr 2014 18:37:52 -0400 |
|
plugins/muc: Move name functions to seperate module
|
daurnimator |
Wed, 02 Apr 2014 17:02:07 -0400 |
|
plugins/muc: Move password functions to seperate module
|
daurnimator |
Wed, 02 Apr 2014 16:57:59 -0400 |
|
plugins/muc/lock.lib: Need to let creator into the locked room :)
|
daurnimator |
Wed, 02 Apr 2014 15:56:37 -0400 |
|
plugins/muc: Move locking to seperate module
|
daurnimator |
Wed, 02 Apr 2014 15:48:25 -0400 |
|
plugins/muc/mod_muc: Move room locking into hook
|
daurnimator |
Wed, 02 Apr 2014 15:36:08 -0400 |
|
plugins/muc/muc.lib: Move description functions out to own file
|
daurnimator |
Wed, 02 Apr 2014 15:14:52 -0400 |
|
plugins/muc/muc.lib: Modify muc-config-submitted to keep a list of status codes instead of fields changed
|
daurnimator |
Wed, 02 Apr 2014 11:35:00 -0400 |
|
plugins/muc/muc.lib: Refactor out process_form into hooks
|
daurnimator |
Tue, 01 Apr 2014 17:45:03 -0400 |
|
plugins/muc/muc.lib: Move default config layout into hooks
|
daurnimator |
Tue, 01 Apr 2014 17:10:01 -0400 |
|
plugins/muc/muc.lib: Split up get_disco_info into events
|
daurnimator |
Tue, 01 Apr 2014 15:41:44 -0400 |
|
plugins/muc/muc.lib: Add muc-room-locked event
|
daurnimator |
Mon, 31 Mar 2014 14:46:59 -0400 |
|
plugins/muc/muc.lib: restrict invitations in members only rooms to admins
|
daurnimator |
Mon, 31 Mar 2014 14:45:42 -0400 |
|
plugins/muc/muc.lib: Don't try and get occupant jids for annotating invite affiliation changes
|
daurnimator |
Mon, 31 Mar 2014 14:44:52 -0400 |
|
plugins/muc/muc.lib: Update declines to be more like invites
|
daurnimator |
Mon, 31 Mar 2014 14:06:35 -0400 |
|
plugins/muc/muc.lib: Add pre-invite event. Move role check to it
|
daurnimator |
Mon, 31 Mar 2014 13:54:27 -0400 |
|
plugins/muc/muc.lib: Tidy up muc-invite event.
|
daurnimator |
Mon, 31 Mar 2014 12:31:15 -0400 |
|
plugins/muc/muc.lib: Remove top level pre-join event. Assign event priorities for other handlers
|
daurnimator |
Mon, 31 Mar 2014 12:21:43 -0400 |
|
plugins/muc/muc.lib: Use occupant methods where possible
|
daurnimator |
Fri, 28 Mar 2014 20:28:20 -0400 |
|
plugins/muc/muc.lib: Subjects get sent even if empty.
|
daurnimator |
Fri, 28 Mar 2014 20:25:10 -0400 |
|
plugins/muc/muc.lib: Fix typo (moderators vs moderator)
|
daurnimator |
Fri, 28 Mar 2014 18:47:35 -0400 |
|
plugins/muc/muc.lib: nick change unavailables should be from original occupant jid
|
daurnimator |
Fri, 28 Mar 2014 18:33:57 -0400 |
|
plugins/muc/muc.lib: Status codes should be inside of x element
|
daurnimator |
Fri, 28 Mar 2014 18:33:38 -0400 |
|
plugins/muc/muc.lib: Improve set affiliation logic;
|
daurnimator |
Fri, 28 Mar 2014 17:58:25 -0400 |
|
plugins/muc/muc.lib: Smarter validation in set_affiliation
|
daurnimator |
Fri, 28 Mar 2014 14:15:18 -0400 |
|
plugins/muc/muc.lib: Fix anonymous check in `send_occupant_list`
|
daurnimator |
Fri, 28 Mar 2014 13:34:46 -0400 |
|
plugins/muc/muc.lib: Allow `:send_occupant_list` to have no filter
|
daurnimator |
Fri, 28 Mar 2014 13:14:33 -0400 |
|
plugins/muc/muc.lib: Fix sending occupant jid instead of real jid in <item/> actor
|
daurnimator |
Fri, 28 Mar 2014 13:11:11 -0400 |
|
plugins/muc/muc.lib: Clean up :set_role. Removes :can_set_role
|
daurnimator |
Fri, 28 Mar 2014 13:05:36 -0400 |
|
plugins/muc/muc.lib: Remove callback parameter from set_role and set_affiliation
|
daurnimator |
Fri, 28 Mar 2014 11:05:52 -0400 |
|
plugins/muc/muc.lib: non-function changes (reordering, semicolons and comments)
|
daurnimator |
Thu, 27 Mar 2014 19:18:57 -0400 |
|
plugins/muc: Massive refactor
|
daurnimator |
Thu, 27 Mar 2014 19:16:13 -0400 |
|
mod_muc/muc.lib: Fix parameters to send_history() (thanks Peter Villeneuve)
|
Matthew Wild |
Sat, 10 May 2014 21:30:00 +0100 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Mon, 12 May 2014 01:18:27 +0200 |
|
mod_admin_telnet: Remove dead code
|
Kim Alvefur |
Mon, 12 May 2014 01:16:17 +0200 |
|
mod_admin_telnet: Show which hosts are components and what type of component in host:list()
|
Kim Alvefur |
Mon, 12 May 2014 01:07:40 +0200 |
|
mod_admin_telnet: Add c2s:show_tls(), behaves like s2s:show_tls()
|
Kim Alvefur |
Sun, 11 May 2014 19:13:36 +0200 |
|
mod_admin_telnet: Move generation of log tag for s2s:show() (adds it to c2s:show() too)
|
Kim Alvefur |
Sun, 11 May 2014 19:12:03 +0200 |
|
mod_admin_telnet: Add s2s:show_tls() for showing ciphers used on s2s connections
|
Kim Alvefur |
Sun, 11 May 2014 18:51:08 +0200 |
|
mod_admin_telnet: Move extraction of c2s presence info into session_flags()
|
Kim Alvefur |
Sun, 11 May 2014 19:03:23 +0200 |
|
mod_admin_telnet: Split (secure) into (authenticated) + (secure)
|
Kim Alvefur |
Sun, 11 May 2014 18:28:00 +0200 |
|
mod_admin_telnet: Send NUL byte as keepalive on read timeouts
|
Kim Alvefur |
Sun, 11 May 2014 18:22:17 +0200 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Fri, 09 May 2014 23:35:54 +0200 |
|
Merge 0.9->0.10
|
Kim Alvefur |
Fri, 09 May 2014 23:28:09 +0200 |
|
configmanager: Delay importing LuaFileSystem until needed by an Include line
|
Kim Alvefur |
Fri, 09 May 2014 19:59:49 +0200 |
|
core.certmanager, core.moduleapi, mod_storage_sql, mod_storage_sql2: Import from util.paths
|
Kim Alvefur |
Fri, 09 May 2014 19:35:29 +0200 |
|
core.configmanager: Move path utility functions into util.paths
|
Kim Alvefur |
Fri, 09 May 2014 19:34:35 +0200 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Tue, 06 May 2014 00:37:08 +0200 |
|
prosodyctl: Check that there is at least one enabled VirtualHost (or Component) defined
|
Kim Alvefur |
Fri, 02 May 2014 08:56:03 +0200 |
|
prosodyctl: Use correct variable in check certs
|
Kim Alvefur |
Fri, 02 May 2014 08:27:29 +0200 |
|
prosodyctl: Check for deprecated config options
|
Kim Alvefur |
Fri, 02 May 2014 08:21:56 +0200 |
|
prosodyctl: Add check that points out any disabled hosts
|
Kim Alvefur |
Fri, 02 May 2014 08:16:26 +0200 |
|
prosodyctl: Only perform checks on enabled hosts
|
Kim Alvefur |
Fri, 02 May 2014 08:11:11 +0200 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Sun, 27 Apr 2014 01:02:54 +0200 |
|
Merge 0.9->0.10
|
Kim Alvefur |
Sun, 27 Apr 2014 01:02:20 +0200 |
|
util.pposix: Fix error reporting from really old Linux fallocate() that did not use errno for some reason (thanks pro)
|
Kim Alvefur |
Fri, 25 Apr 2014 02:41:55 +0200 |
|
util.pposix: Fix error reporting from posix_fallocate, it doesn't use errno (thanks pro)
|
Kim Alvefur |
Fri, 25 Apr 2014 00:36:01 +0200 |
|
util.x509: Remove unused imports
|
Kim Alvefur |
Fri, 25 Apr 2014 02:47:09 +0200 |
|
util.x509: And functions for converting between DER and PEM
|
Kim Alvefur |
Thu, 24 Apr 2014 23:38:47 +0200 |
|
util.indexedbheap: Fix a possible traceback when removing the last item.
|
Waqas Hussain |
Wed, 23 Apr 2014 11:38:34 -0400 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Wed, 23 Apr 2014 00:23:46 +0200 |
|
Merge 0.9->0.10
|
Kim Alvefur |
Wed, 23 Apr 2014 00:22:36 +0200 |
|
util.dataforms: Add support for XEP-0221: Data Forms Media Element
|
Kim Alvefur |
Tue, 22 Apr 2014 23:36:26 +0200 |
|
tools/jabberd14sql2prosody: Fix package.path (thanks daurnimator)
|
Kim Alvefur |
Tue, 22 Apr 2014 23:14:53 +0200 |
|
mod_s2s: Follow XMPP Core on when a stream is to be considered ready
|
Kim Alvefur |
Tue, 22 Apr 2014 21:56:06 +0200 |
|
Merge daurnimator->trunk
|
Matthew Wild |
Mon, 21 Apr 2014 17:42:44 +0100 |
|
Merge with daurnimator
|
Matthew Wild |
Thu, 17 Apr 2014 09:01:32 +0100 |
|
plugins/muc/muc.lib: If decline is to person in room; route to all sessions
|
daurnimator |
Thu, 27 Mar 2014 19:16:46 -0400 |
|
plugins/muc/muc.lib: Have timestamp as seconds since epoch inside of history
|
daurnimator |
Thu, 27 Mar 2014 18:10:34 -0400 |
|
plugins/muc: Rename admin query hook
|
daurnimator |
Thu, 27 Mar 2014 18:09:42 -0400 |
|
plugins/muc/muc.lib: Add :broadcast method; use it from :broadcast_except_nick and :broadcast_message
|
daurnimator |
Mon, 24 Mar 2014 16:32:18 -0400 |
|
plugins/muc/muc.lib: Extra utility functions around subjects
|
daurnimator |
Mon, 24 Mar 2014 13:36:43 -0400 |
|
plugins/muc/muc.lib: Add muc-get-history event; it uses an iterator in the event object so that messages don't need to be all in memory at once
|
daurnimator |
Mon, 24 Mar 2014 13:34:06 -0400 |
|
plugins/muc/muc.lib: Add muc-broadcast-message event. Use it for saving to history
|
daurnimator |
Mon, 24 Mar 2014 13:10:54 -0400 |
|
plugins/muc/muc.lib: Better password check
|
daurnimator |
Mon, 24 Mar 2014 12:44:31 -0400 |
|
plugins/muc/muc.lib: Add muc-occupant-prejoin events; Use it for banned, members-only, password, nick-conflict and lock checks
|
daurnimator |
Mon, 24 Mar 2014 10:25:43 -0400 |
|
plugins/muc/muc.lib: Move password check and nick conflict check into `handle_join`
|
daurnimator |
Fri, 21 Mar 2014 14:01:02 -0400 |
|
plugins/muc/muc.lib: Additional `route_to_occupant` usage
|
daurnimator |
Thu, 20 Mar 2014 16:19:13 -0400 |
|
plugins/muc/muc.lib: Remove duplicate variable; it can never be nil.
|
daurnimator |
Thu, 20 Mar 2014 16:14:22 -0400 |
|
plugins/muc/muc.lib: Add decline event for parity with invite
|
daurnimator |
Thu, 20 Mar 2014 15:50:29 -0400 |
|
plugins/muc/muc.lib: Add route_to_occupant function to send a stanza to all occupant sessions
|
daurnimator |
Thu, 20 Mar 2014 15:22:02 -0400 |
|
plugins/muc: Have utility methods for locking the room
|
daurnimator |
Thu, 20 Mar 2014 11:06:10 -0400 |
|
plugins/muc/muc.lib: Use occupant jids when whois == "moderators"
|
daurnimator |
Wed, 19 Mar 2014 17:50:49 -0400 |
|
plugins/muc/muc.lib: Allow users with affiliations to invite while not in room themselves
|
daurnimator |
Wed, 19 Mar 2014 17:50:00 -0400 |
|
plugins/muc/muc.lib: Use `get_role` in `handle_admin_item_get_command`. Removed a TODO that's already done
|
daurnimator |
Wed, 19 Mar 2014 17:46:25 -0400 |
|
plugins/muc/muc.lib: Send invite out from event: removes '-prepared' from event name
|
daurnimator |
Wed, 19 Mar 2014 17:33:32 -0400 |
|
plugins/muc/muc.lib: Check role instead of current_nick
|
daurnimator |
Wed, 19 Mar 2014 17:30:21 -0400 |
|
plugins/muc/muc.lib: Remove `payload` argument from `handle_mediated_*`; extract it from inside.
|
daurnimator |
Wed, 19 Mar 2014 16:28:11 -0400 |
|
plugins/muc/muc.lib: Fix wrong variable in `construct_stanza_id` block
|
daurnimator |
Wed, 19 Mar 2014 16:24:17 -0400 |
|
plugins/muc/muc.lib: Add muc-invite-prepared event; Use it for granting affiliations in members only rooms
|
daurnimator |
Wed, 19 Mar 2014 16:19:31 -0400 |
|
plugins/muc/muc.lib: Don't get same variable twice.....
|
daurnimator |
Wed, 19 Mar 2014 15:01:18 -0400 |
|
plugins/muc/muc.lib: Use `get_occupant_jid` method instead of indexing _jid_nick
|
daurnimator |
Wed, 19 Mar 2014 15:00:53 -0400 |
|
plugins/muc/muc.lib: Fetch config via accessors instead of using `_data`
|
daurnimator |
Wed, 19 Mar 2014 14:39:31 -0400 |
|
plugins/muc/muc.lib: In `_route_stanza` access occupant data less often
|
daurnimator |
Wed, 19 Mar 2014 14:35:17 -0400 |
|
plugins/muc/muc.lib: Tidy up `get_filtered_presence`
|
daurnimator |
Wed, 19 Mar 2014 14:06:04 -0400 |
|
plugins/muc/muc.lib: Tidy up is_kickable_error: it didn't need to return the condition.
|
daurnimator |
Wed, 19 Mar 2014 13:59:59 -0400 |
|
plugins/muc/muc.lib: Use module.host where `muc_domain` was previously
|
daurnimator |
Wed, 19 Mar 2014 13:57:02 -0400 |
|
plugins/muc/muc.lib: Remove unused methods (breaks api)
|
daurnimator |
Wed, 19 Mar 2014 13:56:14 -0400 |
|
plugins/muc/muc.lib: Use more modern stanza methods
|
daurnimator |
Wed, 19 Mar 2014 12:19:44 -0400 |
|
plugins/muc: Provide a reasonable default `route_stanza`
|
daurnimator |
Wed, 19 Mar 2014 12:03:15 -0400 |
|
plugins/muc/mod_muc: host sessions have a .send these days
|
daurnimator |
Tue, 18 Mar 2014 18:56:26 -0400 |
|
plugins/muc/mod_muc: Refactor to use new methods available
|
daurnimator |
Tue, 18 Mar 2014 18:55:52 -0400 |
|
plugins/muc/muc: Add 'muc-occupant-left' event
|
daurnimator |
Tue, 18 Mar 2014 18:52:28 -0400 |
|
plugins/muc/muc: Only call get_password once in invite creation
|
daurnimator |
Tue, 18 Mar 2014 16:01:53 -0400 |
|
plugins/muc/muc: When there's no history; return an empty iterator
|
daurnimator |
Tue, 18 Mar 2014 15:42:48 -0400 |
|
plugins/muc/muc: Support mediated declines
|
daurnimator |
Tue, 18 Mar 2014 15:15:28 -0400 |
|
plugins/muc/muc: Rename `handle_invite_to_room` to `handle_mediated_invite`; clean up logic
|
daurnimator |
Tue, 18 Mar 2014 15:15:14 -0400 |
|
plugins/muc/muc: Check for mediated invites in a smarter way
|
daurnimator |
Tue, 18 Mar 2014 14:56:20 -0400 |
|
plugins/muc/muc: Add copyright for daurnimator
|
daurnimator |
Tue, 18 Mar 2014 14:54:41 -0400 |
|
plugins/muc/muc.lib: Add disco iq handlers with compatible argument signature
|
daurnimator |
Fri, 21 Feb 2014 19:06:33 -0500 |
|
plugins/muc/muc.lib: Move all kick code into one place
|
daurnimator |
Fri, 21 Feb 2014 18:04:38 -0500 |
|
plugins/muc/muc.lib: Make use of return values to send service-unavailable errors
|
daurnimator |
Fri, 21 Feb 2014 17:52:40 -0500 |
|
plugins/muc/muc.lib: Add some missing return values
|
daurnimator |
Fri, 21 Feb 2014 17:40:16 -0500 |
|
plugins/muc/muc.lib: Move (de)construct_stanza_id into `handle_iq_to_occupant`
|
daurnimator |
Fri, 21 Feb 2014 17:17:01 -0500 |
|
plugins/muc/muc.lib: Refactor _to_occupant handlers
|
daurnimator |
Fri, 21 Feb 2014 16:30:43 -0500 |
|
plugins/muc/muc.lib: Split out the room iq handler into functions
|
daurnimator |
Fri, 21 Feb 2014 15:48:26 -0500 |
|
plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions
|
daurnimator |
Thu, 20 Feb 2014 16:50:18 -0500 |
|
plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko)
|
daurnimator |
Thu, 20 Feb 2014 14:36:49 -0500 |
|
plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history`
|
daurnimator |
Wed, 19 Feb 2014 17:39:57 -0500 |
|
plugins/muc/mod_muc: Move Xep-0307 MUC unique to seperate file
|
daurnimator |
Tue, 18 Feb 2014 17:21:47 -0500 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Mon, 21 Apr 2014 02:43:38 +0200 |
|
certmanager: Move ssl.protocol handling to after ssl.options is a table (thanks Ralph)
|
Kim Alvefur |
Mon, 21 Apr 2014 02:43:09 +0200 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Sun, 20 Apr 2014 23:39:45 +0200 |
|
certmanager: Fix traceback if no global 'ssl' section set (thanks albert)
|
Kim Alvefur |
Sun, 20 Apr 2014 21:25:26 +0200 |
|
mod_http: Update to disable peer verification with the new certmanager
|
Kim Alvefur |
Sat, 19 Apr 2014 21:59:53 +0200 |
|
mod_s2s: Replace open_stream() with function that only adds s2s/dialback attributes to stream header
|
Kim Alvefur |
Fri, 18 Apr 2014 07:51:41 +0200 |
|
util.xmppstream: Check for callback that may add stream header attributes
|
Kim Alvefur |
Fri, 18 Apr 2014 07:50:44 +0200 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Tue, 15 Apr 2014 21:54:44 +0200 |
|
net.http.server: Fix some typos introduced in 420c0d3b8583.
|
Daurnimator |
Tue, 15 Apr 2014 14:51:49 -0400 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Tue, 15 Apr 2014 20:36:39 +0200 |
|
certmanager: Update ssl_compression when config is reloaded
|
Kim Alvefur |
Tue, 15 Apr 2014 01:02:56 +0200 |
|
certmanager: Reformat core ssl defaults
|
Kim Alvefur |
Tue, 15 Apr 2014 00:49:17 +0200 |
|
certmanager: Support ssl.protocol syntax like "tlsv1+" that disables older protocols
|
Kim Alvefur |
Tue, 15 Apr 2014 00:45:07 +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 |
Tue, 15 Apr 2014 00:32:11 +0200 |
|
certmanager: Wrap long line and add comment
|
Kim Alvefur |
Mon, 14 Apr 2014 23:41:26 +0200 |
|
certmanager: Concatenate cipher list if given as a table
|
Kim Alvefur |
Mon, 14 Apr 2014 23:34:35 +0200 |
|
certmanager: Allow non-server contexts to be without certificate and key
|
Kim Alvefur |
Mon, 14 Apr 2014 23:09:28 +0200 |
|
certmanager: Check for non-nil values instead of true-ish values, allows removing defaults
|
Kim Alvefur |
Mon, 14 Apr 2014 23:00:44 +0200 |
|
Merge 0.10->trunk
|
Matthew Wild |
Tue, 15 Apr 2014 18:08:16 +0100 |
|
net.http.server: Add prepare_header() and finish_response() to allow sending chunked responses via the API
|
Daurnimator |
Tue, 15 Apr 2014 18:07:45 +0100 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Thu, 10 Apr 2014 16:52:03 +0200 |
|
mod_s2s: Revert e626ee2fe106 change, it broke Dialback
|
Kim Alvefur |
Thu, 10 Apr 2014 16:49:59 +0200 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Thu, 10 Apr 2014 13:16:54 +0200 |
|
Merge 0.9->0.10
|
Kim Alvefur |
Thu, 10 Apr 2014 13:15:11 +0200 |
|
prosody: Check dependencies later in the startup sequence
|
Kim Alvefur |
Wed, 09 Apr 2014 20:46:39 +0200 |
|
util.dependencies: Check for Lua 5.1. We don't currently support any other versions. LuaJIT identifies as 5.1.
|
Waqas Hussain |
Wed, 09 Apr 2014 14:01:02 -0400 |
|
mod_admin_telnet: muc:*: Fix nil index error when a room JID is passed with a non-existent host
|
Matthew Wild |
Sat, 05 Apr 2014 15:05:40 +0100 |
|
mod_c2s, mod_s2s, mod_component, util.xmppstream: Move all session:open_stream() functions to util.xmppstream
|
Kim Alvefur |
Thu, 10 Apr 2014 13:13:07 +0200 |
|
prosodyctl, util.prosodyctl: Update to reflect that mod_posix gets loaded by default on posix platforms
|
Kim Alvefur |
Thu, 10 Apr 2014 00:24:29 +0200 |
|
mod_posix: Remove compat code for 0.5
|
Kim Alvefur |
Thu, 10 Apr 2014 00:23:35 +0200 |
|
mod_storage_sql2: Build counter query without ORDER BY clause
|
Kim Alvefur |
Tue, 08 Apr 2014 19:23:11 +0200 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Thu, 03 Apr 2014 23:54:58 +0200 |
|
mod_compression: Only iterate over correctly named and namespaced child tags of compression feature
|
Kim Alvefur |
Thu, 03 Apr 2014 23:48:12 +0200 |
|
mod_compression: Use get_child() and get_child_text()
|
Kim Alvefur |
Thu, 03 Apr 2014 23:40:20 +0200 |
|
mod_compression: Remove checks for impossible conditions
|
Kim Alvefur |
Thu, 03 Apr 2014 23:33:38 +0200 |
|
Merge 0.10->trunk
|
Matthew Wild |
Wed, 02 Apr 2014 17:42:22 +0100 |
|
Merge 0.9->0.10
|
Matthew Wild |
Wed, 02 Apr 2014 17:41:38 +0100 |
|
util.xmppstream: Also disable CharacterData merging after stream restarts
|
Matthew Wild |
Wed, 02 Apr 2014 14:31:19 +0100 |
|
util.xmppstream: Disable LuaExpat's buffering (if possible)
|
Matthew Wild |
Wed, 02 Apr 2014 11:05:41 +0100 |
|
Tagging 0.9.4
|
Matthew Wild |
Tue, 01 Apr 2014 16:50:15 +0100 |
|
Merge
0.9.4
|
Matthew Wild |
Tue, 01 Apr 2014 16:03:21 +0100 |
|
MUC: Fixed traceback when a JID not in a room requested a role change for an occupant.
|
Waqas Hussain |
Tue, 01 Apr 2014 10:02:58 -0400 |
|
Merge
|
Matthew Wild |
Tue, 01 Apr 2014 15:02:36 +0100 |
|
net.server_{select,event}: Add compat code for supporting the same client port API on connections
|
Kim Alvefur |
Tue, 01 Apr 2014 15:26:40 +0200 |
|
Backed out changeset a5b5bce71a11
|
Kim Alvefur |
Mon, 31 Mar 2014 19:38:06 +0200 |
|
net.server_event: Rename conn:port() -> conn:clientport() to match server_select
|
Kim Alvefur |
Thu, 27 Mar 2014 23:02:52 +0100 |
|
Makefile: Change sed regex to be compatible with FreeBSD's odd sed, and change / to | to allow paths to be used in RUNWITH (thanks Ben)
|
Matthew Wild |
Sun, 30 Mar 2014 09:16:27 +0100 |
|
util.dependencies: Log error when LuaExpat is not capable of enforcing stanza size limits
|
Matthew Wild |
Sun, 30 Mar 2014 09:15:28 +0100 |
|
util.xmppstream: Implement stanza size limiting, default limit 10MB
|
Matthew Wild |
Sun, 30 Mar 2014 09:14:39 +0100 |
|
portmanager: Make maximum read size configurable, and default to 4KB
|
Matthew Wild |
Sun, 30 Mar 2014 08:44:55 +0100 |
|
mod_compression: Only allow compression on authenticated streams
|
Kim Alvefur |
Tue, 18 Feb 2014 20:03:12 +0100 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Tue, 25 Mar 2014 19:18:32 +0100 |
|
Merge 0.9->0.10
|
Kim Alvefur |
Tue, 25 Mar 2014 19:16:38 +0100 |
|
prosody.cfg.lua.dist: mod_posix is enabled by default on posix platforms now
|
Kim Alvefur |
Sat, 22 Mar 2014 14:53:17 +0100 |
|
util.sasl: Fix logic for when mechanisms with channel binding support are offered
|
Kim Alvefur |
Sat, 22 Mar 2014 14:45:04 +0100 |
|
prosodyctl: Show real error if certificate config file can't be opened
|
Kim Alvefur |
Sat, 22 Mar 2014 12:02:11 +0100 |
|
modulemanager: Load mod_saslauth on components by default
|
Kim Alvefur |
Sat, 22 Mar 2014 12:42:01 +0100 |
|
mod_saslauth: Only do c2s SASL on normal VirtualHosts
|
Kim Alvefur |
Sat, 22 Mar 2014 12:41:38 +0100 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Sun, 09 Mar 2014 23:48:32 +0100 |
|
Merge 0.9->0.10
|
Kim Alvefur |
Sun, 09 Mar 2014 23:47:53 +0100 |
|
mod_http_files: Strip path separator from end of paths, was broken on Windows (thanks Junne)
|
Kim Alvefur |
Sun, 09 Mar 2014 22:16:44 +0100 |
|
util.pluginloader: Always use path separator from package.config (thanks Junne)
|
Kim Alvefur |
Sun, 09 Mar 2014 22:15:40 +0100 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Wed, 26 Feb 2014 22:22:43 +0100 |
|
Merge 0.9->0.10
|
Kim Alvefur |
Wed, 26 Feb 2014 22:21:55 +0100 |
|
mod_http: Fix http_external_url setting without an explicit port
|
Kim Alvefur |
Wed, 26 Feb 2014 22:19:58 +0100 |
|
mod_http: Use hostname from the correct context (thanks gryffus)
|
Kim Alvefur |
Thu, 20 Feb 2014 19:08:55 +0100 |
|
tools/ejabberd2prosody: Don't throw an error if XML CDATA is null ([] in Erlang, instead of a string or being missing).
|
Waqas Hussain |
Tue, 18 Feb 2014 16:03:13 -0500 |
|
mod_auth_anonymous: Fixed a traceback in listing all users (issue#396).
|
Waqas Hussain |
Mon, 17 Feb 2014 16:00:41 -0500 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Wed, 19 Feb 2014 23:45:24 +0100 |
|
mod_proxy65: Use mod_disco
|
Florian Zeitz |
Wed, 19 Feb 2014 20:13:35 +0100 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Wed, 19 Feb 2014 20:10:23 +0100 |
|
mod_auth_interal_hashed: Update salt and iteration count when setting a new password
|
Florian Zeitz |
Wed, 12 Feb 2014 13:45:16 +0100 |
|
Merge 0.10 -> trunk
|
Kim Alvefur |
Wed, 12 Feb 2014 19:26:54 +0100 |
|
Merge 0.9 -> 0.10
|
Kim Alvefur |
Wed, 12 Feb 2014 19:26:22 +0100 |
|
mod_admin_telnet: Prep jids for user:create() etc.
|
Kim Alvefur |
Sun, 09 Feb 2014 15:17:01 +0100 |
|
mod_s2s: Log a warning if no local addresses are found, as this breaks s2sout
|
Kim Alvefur |
Sun, 09 Feb 2014 15:13:46 +0100 |
|
mod_saslauth: Make sure sasl handler has add_cb_handler (fixes #392)
|
Kim Alvefur |
Wed, 12 Feb 2014 19:25:15 +0100 |
|
mod_storage_sql2: archive:delete() with username = true deletes for all users
|
Kim Alvefur |
Sun, 09 Feb 2014 15:12:13 +0100 |
|
mod_ping: Use type-specific event
|
Kim Alvefur |
Sun, 09 Feb 2014 15:09:12 +0100 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Thu, 06 Feb 2014 10:55:09 +0100 |
|
Merge 0.9->0.10
|
Kim Alvefur |
Thu, 06 Feb 2014 10:48:41 +0100 |
|
mod_motd: Strip indentation only, leave multiple newlines
|
Kim Alvefur |
Thu, 06 Feb 2014 10:44:21 +0100 |
|
Merge 0.10->trunk
|
Kim Alvefur |
Mon, 03 Feb 2014 07:25:05 +0100 |
|
Merge 0.9->0.10
|
Kim Alvefur |
Mon, 03 Feb 2014 07:23:33 +0100 |
|
tools/ejabberd2prosody: Handle new room member format.
|
Kim Alvefur |
Mon, 27 Jan 2014 16:47:54 +0100 |
|
mod_c2s: Break out stream opening into a separate function
|
Florian Zeitz |
Fri, 31 Jan 2014 12:01:12 +0100 |
|
MUC: Tag PMs with <x>, like presence stanzas
|
Kim Alvefur |
Tue, 28 Jan 2014 19:21:21 +0100 |
|
modulemanager: Always load a platform-specific module, add stub modules for Windows and unknown platforms
|
Kim Alvefur |
Sun, 26 Jan 2014 21:16:24 +0100 |
|
mod_posix: Daemonize by default only when installed
|
Kim Alvefur |
Sun, 26 Jan 2014 18:35:03 +0100 |
|
Merge 0.10->trunk
|
Matthew Wild |
Tue, 21 Jan 2014 03:26:04 +0000 |
|
Merge 0.9->0.10
|
Matthew Wild |
Tue, 21 Jan 2014 03:24:40 +0000 |
|
tools/ejabberd2prosody: Disable generating a config, as the format it generates is completely out of date.
|
Waqas Hussain |
Sat, 18 Jan 2014 17:26:02 -0500 |
|
tools/ejabberd2prosody: “xmlelement” can be “xmlel” in newer ejabberd (thanks cr).
|
Waqas Hussain |
Sat, 18 Jan 2014 17:24:10 -0500 |
|
MUC: Fire muc-room-destroyed event when the last participant leaves a non-persistent room
|
Kim Alvefur |
Sat, 18 Jan 2014 20:14:05 +0100 |
|
mod_storage_sql2: Only attempt to delete conflicting items if an ID/key is given
|
Kim Alvefur |
Tue, 21 Jan 2014 01:51:13 +0100 |
|
mod_storage_sql2: Fix another SQL syntax error that slipped trough
|
Kim Alvefur |
Tue, 21 Jan 2014 00:51:31 +0100 |
|
Merge 0.10->trunk
|
Matthew Wild |
Sat, 18 Jan 2014 18:46:31 +0000 |
|
Merge 0.9->0.10
|
Matthew Wild |
Sat, 18 Jan 2014 18:46:12 +0000 |
|
tools/ejabberd2prosody: Add support for importing MUC rooms.
|
Waqas Hussain |
Sat, 18 Jan 2014 10:37:12 -0500 |
|
tools/ejabberdsql2prosody: Skip invalid XML in data, and print out errors.
|
Waqas Hussain |
Thu, 16 Jan 2014 14:03:27 -0500 |
|
additional fix for erlparse loading in ejabberd2prosody.lua
|
Vadim Misbakh-Soloviov |
Fri, 14 Jun 2013 15:43:35 +0700 |
|
package{,c}path fixes for migration tools
|
Vadim Misbakh-Soloviov |
Fri, 14 Jun 2013 15:15:05 +0700 |
|
mod_tls: Let s2s_secure_auth override s2s_require_encryption and warn if they differ
|
Kim Alvefur |
Wed, 15 Jan 2014 22:47:50 +0100 |
|
mod_tls: Rename variables to be less confusing
|
Kim Alvefur |
Wed, 15 Jan 2014 21:57:15 +0100 |
|
Merge 0.10->trunk
|
Matthew Wild |
Sat, 18 Jan 2014 18:44:58 +0000 |
|
mod_storage_sql2: Fix SQL syntax
|
Kim Alvefur |
Sat, 18 Jan 2014 19:33:33 +0100 |
|
MUC: Expose room metatable on module
|
Kim Alvefur |
Sat, 18 Jan 2014 18:28:50 +0100 |
|
MUC: Split out sending of the topic into method separate from sending history
|
Kim Alvefur |
Sat, 18 Jan 2014 18:11:13 +0100 |
|
MUC: Split saving to history into a separate method
|
Kim Alvefur |
Sat, 18 Jan 2014 18:05:42 +0100 |
|
Merge 0.10->trunk
|
Matthew Wild |
Sun, 12 Jan 2014 06:27:55 -0500 |
|
Merge
|
Matthew Wild |
Sun, 12 Jan 2014 06:19:55 -0500 |
|
mod_storage_sql2: Fix syntax error in subquery (Thanks Lance)
|
Kim Alvefur |
Sun, 05 Jan 2014 23:38:34 +0100 |
|
Merge 0.9->0.10
|
Matthew Wild |
Sun, 12 Jan 2014 06:19:37 -0500 |
|
Tagging 0.9.3
|
Matthew Wild |
Sun, 12 Jan 2014 06:17:40 -0500 |
|
mod_tls: Log error when TLS initialization fails
0.9.3
|
Matthew Wild |
Sun, 12 Jan 2014 06:16:49 -0500 |
|
mod_s2s: Include IP in log messages, if host is unavailable
|
Florian Zeitz |
Sun, 05 Jan 2014 22:21:50 +0100 |
|
tools/migration/migrator/prosody_files: Fix undefined global access of ‘error’, print the actual error message and correct file path in the error message when we fail to load a file, skip broken files instead of failing migration.
|
Waqas Hussain |
Fri, 03 Jan 2014 15:52:52 -0500 |
|
Merge 0.10->trunk and Happy New Year!
|
Kim Alvefur |
Tue, 31 Dec 2013 19:09:34 +0100 |
|
util.pubsub: Separate data from node configuration
|
Kim Alvefur |
Mon, 30 Dec 2013 23:49:23 +0100 |
|
util.pubsub: Fire events on more actions
|
Kim Alvefur |
Thu, 26 Dec 2013 18:14:34 +0100 |
|
mod_pubsub: Don't sent error replies from service disco events, let mod_disco handle that
|
Kim Alvefur |
Mon, 30 Dec 2013 21:49:17 +0100 |
|
mod_storage_sql2: Expose the unique key argument, allowing arbitrary ids. Conflicting items are removed.
|
Kim Alvefur |
Wed, 25 Dec 2013 22:37:52 +0100 |
|
mod_storage_sql2: Include user, host and store in id lookup
|
Kim Alvefur |
Wed, 25 Dec 2013 15:28:55 +0100 |
|
net.server_{select,event}: addclient: Handle missing getaddrinfo
|
Kim Alvefur |
Mon, 23 Dec 2013 23:23:59 +0100 |
|
net.server_{select,event}: addclient: Use getaddrinfo to detect IP address type if no socket type argument given. (Argument must be given for non-TCP)
|
Kim Alvefur |
Mon, 23 Dec 2013 17:57:53 +0100 |
|
net.server_{select,event}: addclient: Add argument for overriding socket type
|
Kim Alvefur |
Mon, 23 Dec 2013 17:55:41 +0100 |
|
net/http: Use server.addclient
|
daurnimator |
Wed, 18 Dec 2013 19:00:24 -0500 |
|
net/server: addclient: wrapclient already calls startconnection for us
|
daurnimator |
Wed, 18 Dec 2013 18:11:47 -0500 |
|
net/server_event: pcall require ssl rather than relying on globals
|
daurnimator |
Wed, 18 Dec 2013 18:11:17 -0500 |
|
net/server_select: Fix typo
|
daurnimator |
Wed, 18 Dec 2013 18:06:33 -0500 |
