aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* net/server_*: Fix addclient: LuaSocket 3.0-rc1 sometimes returns EALREADY ins...daurnimator2014-06-252-2/+2
* Merge 0.10->trunkKim Alvefur2014-06-216-20/+30
|\
| * Merge 0.9->0.10Kim Alvefur2014-06-211-14/+13
| |\
| | * tools/ejabberd2prosody.lua: Fix JID building, node-less jids became @hostname...Kim Alvefur2014-06-171-14/+13
| | * mod_c2s: Fix traceback if c2s stream sent to componentKim Alvefur2014-05-101-1/+1
| * | mod_storage_{none,internal,sql}: Return error for unsupported (everything but...Kim Alvefur2014-06-203-5/+11
| * | mod_storage_sql2: Don't ignore failure in keyval_store:get() (thanks daurnima...Kim Alvefur2014-06-201-1/+3
| * | mod_presence: Fire a presence/initial event on initial presenceKim Alvefur2014-06-201-0/+3
* | | plugins/muc/muc: Fire broadcast presences event before creating full/anon pre...daurnimator2014-06-171-11/+13
* | | plugins/muc: Fix use of incorrect event on occupant joindaurnimator2014-06-173-4/+7
* | | plugins/muc/mod_muc: fix wrong event for persistencedaurnimator2014-06-111-1/+1
* | | plugins/muc/muc.lib: Deliver declines to in-room jids correctlydaurnimator2014-06-111-1/+5
* | | plugins/muc/muc.lib: Don't add invite/decline bodies if they already have onedaurnimator2014-06-061-10/+14
* | | plugins/muc/muc.lib: Use original decline as template for medated declinedaurnimator2014-06-061-2/+4
* | | plugins/muc/muc: When forwarding mediated invites; use filtered version of or...daurnimator2014-06-051-2/+4
* | | plugins/muc: Move 'x' filtering from occupant to utildaurnimator2014-06-052-14/+17
* | | mod_admin_telnet: Update muc:room(jid) and muc:list(host) to use the new MUC APIWaqas Hussain2014-06-051-3/+3
* | | plugins/muc/muc.lib: Fix incorrect whois logic (thanks mva)daurnimator2014-06-011-3/+3
* | | plugins/muc/muc.lib: Fix whois check when broadcasting occupant presenceWaqas Hussain2014-06-011-1/+1
* | | Merge with daurnimatorWaqas Hussain2014-05-301-0/+3
|\ \ \
| * | | plugins/muc/muc.lib: Fire event for presence broadcastdaurnimator2014-05-291-0/+3
* | | | util.vcard: Add missing local declarationKim Alvefur2014-05-281-0/+1
* | | | mod_pep_plus: Expose get_pep_service()Kim Alvefur2014-05-281-1/+1
* | | | util.vcard: Add support for converting to vcard4Kim Alvefur2014-05-281-0/+121
* | | | util.vcard: Library for parsing vCardsKim Alvefur2014-05-281-0/+454
* | | | Merge 0.10->trunkMatthew Wild2014-05-282-0/+15
|\ \ \ \ | | |/ / | |/| |
| * | | mod_admin_telnet: Add command to list MUC roomsMatthew Wild2014-05-281-0/+13
| * | | mod_s2s: Fire a 's2s-created' event when new s2s connections are initializedKim Alvefur2014-05-241-0/+2
* | | | Merge 0.10->trunkKim Alvefur2014-05-242-35/+20
|\| | |
| * | | mod_s2s: Remove redundant setting of session.directionKim Alvefur2014-05-221-1/+0
| * | | mod_s2s: Move filter initialization to common placeKim Alvefur2014-05-222-32/+17
| * | | mod_s2s: Decide on log function onceKim Alvefur2014-05-221-2/+3
* | | | Merge with daurnimatorMatthew Wild2014-05-235-188/+175
|\ \ \ \ | | |/ / | |/| |
| * | | plugins/muc/muc.lib: Even unavailable session need to be routed to sometimes ...daurnimator2014-05-211-4/+2
| * | | plugins/muc/muc: Only set role to nil if it's the last session to leavedaurnimator2014-05-211-1/+3
| * | | plugins/muc/occupant: Check for type == nil rather than type ~= unavailabledaurnimator2014-05-191-1/+1
| * | | plugins/muc/muc: Better check for live sessionsdaurnimator2014-05-191-3/+13
| * | | plugins/muc/muc: Always send occupant list to joining sessionsdaurnimator2014-05-191-1/+1
| * | | plugins/muc/mod_muc: Get rid of room global; use module:shared to get itdaurnimator2014-05-191-1/+0
| * | | plugins/muc/mod_muc: Place adhoc section into own scopedaurnimator2014-04-301-33/+33
| * | | plugins/muc/mod_muc: Don't use rooms object directory in adhoc sectiondaurnimator2014-04-301-2/+1
| * | | plugins/muc/mod_muc.lua: Add "each_room" function to iterate over rooms (inst...daurnimator2014-04-301-5/+9
| * | | plugins/muc/mod_muc: Remove attempt_room_creation and create_room function. I...daurnimator2014-04-291-24/+19
| * | | plugins/muc/mod_muc: Move `restrict_room_creation` into own area. now uses pr...daurnimator2014-04-291-19/+21
| * | | plugins/muc/lock.lib: lock inside of pre-create instead of 'created'daurnimator2014-04-291-9/+5
| * | | plugins/muc/mod_muc: Use module:shared instead of save/restoredaurnimator2014-04-291-25/+6
| * | | plugins/muc: Move 'module:get_option_number("max_history_messages")' from mod...daurnimator2014-04-293-5/+2
| * | | plugins/muc/mod_muc: Remove support for `host_session.muc`daurnimator2014-04-291-3/+0
| * | | plugins/muc/mod_muc: Move room persistence to own blockdaurnimator2014-04-291-48/+56
| * | | plugins/muc: Add room:has_occupant() methoddaurnimator2014-04-292-1/+5