aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | Merge 0.10->trunkKim Alvefur2014-10-054-9/+98
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.10->trunkdaurnimator2014-09-292-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | plugins/muc/muc.lib: Fire muc-occupant-left from other places an occupant may...daurnimator2014-09-261-1/+9
| * | | | | | | | | | | | | | | | | | | | plugins/muc/muc.lib: Validate affiliations and roles to admin query getdaurnimator2014-09-261-3/+7
| * | | | | | | | | | | | | | | | | | | | plugins/muc/muc.lib: Add missing :up()daurnimator2014-09-261-1/+1
| * | | | | | | | | | | | | | | | | | | | plugins/muc/muc.lib: Use occupants iterator instead of assuming pairsdaurnimator2014-09-261-1/+1
| * | | | | | | | | | | | | | | | | | | | Merge 0.10->trunkKim Alvefur2014-09-282-26/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | mod_pep_plus: Remove config form, it moved into pubsub.libKim Alvefur2014-09-281-13/+0
| * | | | | | | | | | | | | | | | | | | | | mod_pep_plus: Default to max one item per node (Recomended for PEP)Kim Alvefur2014-09-281-0/+4
| * | | | | | | | | | | | | | | | | | | | | mod_pep_plus: Add node config formKim Alvefur2014-09-281-0/+14
| * | | | | | | | | | | | | | | | | | | | | Merge 0.10->trunkKim Alvefur2014-09-284-6/+113
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | mod_pep_plus: Add pubsub service objects to an item listKim Alvefur2014-09-271-4/+7
| * | | | | | | | | | | | | | | | | | | | | | muc: Add 'occupant' to muc-occupant-{joined,left,session-new} events (thanks ...Matthew Wild2014-09-261-4/+8
| * | | | | | | | | | | | | | | | | | | | | | hostmanager: Don't prevent host_session.send() from routing errors or iq resu...Matthew Wild2014-09-261-7/+0
| * | | | | | | | | | | | | | | | | | | | | | plugins/muc: Add muc-occupant-groupchat eventdaurnimator2014-09-252-25/+36
| * | | | | | | | | | | | | | | | | | | | | | Merge 0.10->trunkKim Alvefur2014-09-233-70/+43
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.10->trunkKim Alvefur2014-09-233-6/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | plugins/muc/muc.lib: Fix iq results coming from the real jid, not the in-room...daurnimator2014-09-161-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | Merge 0.10->trunkKim Alvefur2014-09-1810-29/+57
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | plugins/muc/muc.lib: Allow plugins to reject broadcasts in the muc-broadcast-...daurnimator2014-09-161-1/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | plugins/mod_muc_unique: Fix undefined global access (thanks Lance)Waqas Hussain2014-09-161-1/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.10->trunkKim Alvefur2014-09-1131-1223/+3545
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | util.vcard: Turn PHOTO fields into data-urisKim Alvefur2014-09-101-1/+5
| | * | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.10->trunkMatthew Wild2014-09-053-49/+354
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | plugins/muc: Add affiliation_notify config option to send out status code 101daurnimator2014-09-052-0/+68
| | * | | | | | | | | | | | | | | | | | | | | | | | | | plugins/muc/muc.lib: Add muc-set-affiliation eventdaurnimator2014-09-051-0/+11
| | * | | | | | | | | | | | | | | | | | | | | | | | | | 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