aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | | | | | | | | | | | | plugins/muc/muc.lib: Use get_affilation() inside of set_affiliation(), so tha...daurnimator2014-09-051-3/+2
| | * | | | | | | | | | | | | | | | | | | | | | | | | | plugins/muc/muc.lib: Add instant room supportdaurnimator2014-09-051-4/+9
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.10->trunkMatthew Wild2014-09-052-0/+460
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.10->trunkMatthew Wild2014-09-031-1/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.10->trunkKim Alvefur2014-09-031-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.10->trunkKim Alvefur2014-09-0214-78/+159
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_muc: Fix 'destroy rooms' adhoc command (Thanks Florob)Kim Alvefur2014-08-311-1/+1
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.10->trunkMatthew Wild2014-08-280-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.10->trunkMatthew Wild2014-08-2810-21/+37
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.10->trunkKim Alvefur2014-08-131-6/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_storage_sql2: DELETE then INSERT in map storesKim Alvefur2014-08-121-13/+8
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_muc: Fix tracebacks (thanks nick1)Kim Alvefur2014-08-111-5/+5
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.10->trunkKim Alvefur2014-08-103-439/+277
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_private: Use map storeKim Alvefur2014-08-091-12/+9
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.10->trunkKim Alvefur2014-08-092-55/+39
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | storagemanager: Fix map store shim if store is emptyKim Alvefur2014-08-081-1/+1
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | plugins/mod_storage_sql2: Return correct arguments from map_store operationsdaurnimator2014-08-071-2/+6
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | plugins/muc/mod_muc: persistent rooms keyval store needs username as nildaurnimator2014-08-071-4/+4
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | plugins/muc/mod_muc: Use map store for room persistencedaurnimator2014-08-071-59/+72
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | plugins/muc/mod_muc: Remove unused importdaurnimator2014-08-071-1/+0
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | plugins/mod_storage_sql2: Add map store supportdaurnimator2014-08-071-0/+35
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | core/storagemanager: When map store isn't available, fallback to keyval storedaurnimator2014-08-071-0/+33
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_muc: Import util.stanza into the config handler modules that need it. Fix...Matthew Wild2014-08-053-0/+6
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_muc: Fix use of undefined global. Fixes #431.Matthew Wild2014-08-051-1/+2
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.10->trunkMatthew Wild2014-07-312-4/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.10->trunkKim Alvefur2014-07-253-36/+47
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_s2s: Remove unused localsKim Alvefur2014-07-251-2/+0
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_muc/muc.lib: Remove is_anonymous from event (fix for ec57067c1e0d)Matthew Wild2014-07-251-2/+2
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_muc/muc.lib: Pass all info to muc-broadcast-presence handlers that would ...Matthew Wild2014-07-251-1/+5
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.10->trunkMatthew Wild2014-07-252-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.10->trunkMatthew Wild2014-07-252-11/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | util.vcard: Add support for uri types in vcard4Kim Alvefur2014-07-091-0/+2
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.10->trunkKim Alvefur2014-07-091-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_pep_plus: Only broadcast newly added subscriptionsKim Alvefur2014-07-081-9/+26
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.10->trunkKim Alvefur2014-07-0412-133/+170
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.10->trunkKim Alvefur2014-06-302-1/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \