Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.10->trunk | Kim Alvefur | 2014-06-30 | 2 | -1/+9 |
|\ | |||||
| * | Merge 0.9->0.10 | Kim Alvefur | 2014-06-30 | 2 | -1/+9 |
| |\ | |||||
| | * | net.dns: Fix duplicated cache insertions by limiting outstanding queries per ↵ | Kim Alvefur | 2014-06-30 | 1 | -1/+8 |
| | | | | | | | | | | | | name to one | ||||
| | * | net.adns: Add missing local declaration | Kim Alvefur | 2014-06-25 | 1 | -0/+1 |
| | | | |||||
* | | | net/server_*: Fix addclient: LuaSocket 3.0-rc1 sometimes returns EALREADY ↵ | daurnimator | 2014-06-25 | 2 | -2/+2 |
| | | | | | | | | | | | | instead of EINPROGRESS when the dns lookup has multiple results | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2014-06-21 | 6 | -20/+30 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2014-06-21 | 1 | -14/+13 |
| |\| | |||||
| | * | tools/ejabberd2prosody.lua: Fix JID building, node-less jids became ↵ | Kim Alvefur | 2014-06-17 | 1 | -14/+13 |
| | | | | | | | | | | | | @hostname in some cases | ||||
| | * | mod_c2s: Fix traceback if c2s stream sent to component | Kim Alvefur | 2014-05-10 | 1 | -1/+1 |
| | | | |||||
| * | | mod_storage_{none,internal,sql}: Return error for unsupported (everything ↵ | Kim Alvefur | 2014-06-20 | 3 | -5/+11 |
| | | | | | | | | | | | | but keyval) store types | ||||
| * | | mod_storage_sql2: Don't ignore failure in keyval_store:get() (thanks ↵ | Kim Alvefur | 2014-06-20 | 1 | -1/+3 |
| | | | | | | | | | | | | daurnimator) | ||||
| * | | mod_presence: Fire a presence/initial event on initial presence | Kim Alvefur | 2014-06-20 | 1 | -0/+3 |
| | | | |||||
* | | | plugins/muc/muc: Fire broadcast presences event before creating full/anon ↵ | daurnimator | 2014-06-17 | 1 | -11/+13 |
| | | | | | | | | | | | | presences | ||||
* | | | plugins/muc: Fix use of incorrect event on occupant join | daurnimator | 2014-06-17 | 3 | -4/+7 |
| | | | |||||
* | | | plugins/muc/mod_muc: fix wrong event for persistence | daurnimator | 2014-06-11 | 1 | -1/+1 |
| | | | |||||
* | | | plugins/muc/muc.lib: Deliver declines to in-room jids correctly | daurnimator | 2014-06-11 | 1 | -1/+5 |
| | | | |||||
* | | | plugins/muc/muc.lib: Don't add invite/decline bodies if they already have one | daurnimator | 2014-06-06 | 1 | -10/+14 |
| | | | |||||
* | | | plugins/muc/muc.lib: Use original decline as template for medated decline | daurnimator | 2014-06-06 | 1 | -2/+4 |
| | | | |||||
* | | | plugins/muc/muc: When forwarding mediated invites; use filtered version of ↵ | daurnimator | 2014-06-05 | 1 | -2/+4 |
| | | | | | | | | | | | | original invite instead of new object | ||||
* | | | plugins/muc: Move 'x' filtering from occupant to util | daurnimator | 2014-06-05 | 2 | -14/+17 |
| | | | |||||
* | | | mod_admin_telnet: Update muc:room(jid) and muc:list(host) to use the new MUC API | Waqas Hussain | 2014-06-05 | 1 | -3/+3 |
| | | | |||||
* | | | plugins/muc/muc.lib: Fix incorrect whois logic (thanks mva) | daurnimator | 2014-06-01 | 1 | -3/+3 |
| | | | |||||
* | | | plugins/muc/muc.lib: Fix whois check when broadcasting occupant presence | Waqas Hussain | 2014-06-01 | 1 | -1/+1 |
| | | | |||||
* | | | Merge with daurnimator | Waqas Hussain | 2014-05-30 | 1 | -0/+3 |
|\ \ \ | |||||
| * | | | plugins/muc/muc.lib: Fire event for presence broadcast | daurnimator | 2014-05-29 | 1 | -0/+3 |
| | | | | |||||
* | | | | util.vcard: Add missing local declaration | Kim Alvefur | 2014-05-28 | 1 | -0/+1 |
| | | | | |||||
* | | | | mod_pep_plus: Expose get_pep_service() | Kim Alvefur | 2014-05-28 | 1 | -1/+1 |
| | | | | |||||
* | | | | util.vcard: Add support for converting to vcard4 | Kim Alvefur | 2014-05-28 | 1 | -0/+121 |
| | | | | |||||
* | | | | util.vcard: Library for parsing vCards | Kim Alvefur | 2014-05-28 | 1 | -0/+454 |
| | | | | |||||
* | | | | Merge 0.10->trunk | Matthew Wild | 2014-05-28 | 2 | -0/+15 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | mod_admin_telnet: Add command to list MUC rooms | Matthew Wild | 2014-05-28 | 1 | -0/+13 |
| | | | | |||||
| * | | | mod_s2s: Fire a 's2s-created' event when new s2s connections are initialized | Kim Alvefur | 2014-05-24 | 1 | -0/+2 |
| | | | | |||||
* | | | | Merge 0.10->trunk | Kim Alvefur | 2014-05-24 | 2 | -35/+20 |
|\| | | | |||||
| * | | | mod_s2s: Remove redundant setting of session.direction | Kim Alvefur | 2014-05-22 | 1 | -1/+0 |
| | | | | |||||
| * | | | mod_s2s: Move filter initialization to common place | Kim Alvefur | 2014-05-22 | 2 | -32/+17 |
| | | | | |||||
| * | | | mod_s2s: Decide on log function once | Kim Alvefur | 2014-05-22 | 1 | -2/+3 |
| | | | | |||||
* | | | | Merge with daurnimator | Matthew Wild | 2014-05-23 | 5 | -188/+175 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | plugins/muc/muc.lib: Even unavailable session need to be routed to sometimes ↵ | daurnimator | 2014-05-21 | 1 | -4/+2 |
| | | | | | | | | | | | | | | | | (e.g. their own leave) | ||||
| * | | | plugins/muc/muc: Only set role to nil if it's the last session to leave | daurnimator | 2014-05-21 | 1 | -1/+3 |
| | | | | |||||
| * | | | plugins/muc/occupant: Check for type == nil rather than type ~= unavailable | daurnimator | 2014-05-19 | 1 | -1/+1 |
| | | | | |||||
| * | | | plugins/muc/muc: Better check for live sessions | daurnimator | 2014-05-19 | 1 | -3/+13 |
| | | | | |||||
| * | | | plugins/muc/muc: Always send occupant list to joining sessions | daurnimator | 2014-05-19 | 1 | -1/+1 |
| | | | | |||||
| * | | | plugins/muc/mod_muc: Get rid of room global; use module:shared to get it | daurnimator | 2014-05-19 | 1 | -1/+0 |
| | | | | |||||
| * | | | plugins/muc/mod_muc: Place adhoc section into own scope | daurnimator | 2014-04-30 | 1 | -33/+33 |
| | | | | |||||
| * | | | plugins/muc/mod_muc: Don't use rooms object directory in adhoc section | daurnimator | 2014-04-30 | 1 | -2/+1 |
| | | | | |||||
| * | | | plugins/muc/mod_muc.lua: Add "each_room" function to iterate over rooms ↵ | daurnimator | 2014-04-30 | 1 | -5/+9 |
| | | | | | | | | | | | | | | | | (instead of accessing directly) | ||||
| * | | | plugins/muc/mod_muc: Remove attempt_room_creation and create_room function. ↵ | daurnimator | 2014-04-29 | 1 | -24/+19 |
| | | | | | | | | | | | | | | | | 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 | ||||
| * | | | plugins/muc/mod_muc: Move `restrict_room_creation` into own area. now uses ↵ | daurnimator | 2014-04-29 | 1 | -19/+21 |
| | | | | | | | | | | | | | | | | pre-create hook | ||||
| * | | | plugins/muc/lock.lib: lock inside of pre-create instead of 'created' | daurnimator | 2014-04-29 | 1 | -9/+5 |
| | | | | |||||
| * | | | plugins/muc/mod_muc: Use module:shared instead of save/restore | daurnimator | 2014-04-29 | 1 | -25/+6 |
| | | | |