aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | plugins/muc/mod_muc: No need to treat the host room speciallydaurnimator2014-04-281-6/+0
| * | plugins/muc/mod_muc: Use get_option_string instead of get_option and checkingdaurnimator2014-04-281-3/+1
| * | plugins/muc/mod_muc: Move affiliation monkey patch into own scopedaurnimator2014-04-281-10/+13
* | | Merge with daurnimatorMatthew Wild2014-05-1715-949/+1619
|\ \ \
| * | | Merge with Prosody trunkMatthew Wild2014-05-0815-949/+1619
| |\| |
| | * | plugins/muc/muc.lib: Move sending of occupant list to joining user out of hoo...daurnimator2014-04-212-10/+9
| | * | plugins/muc/members_only.lib: Compare affiliations via rank; wrap some long l...daurnimator2014-04-211-17/+31
| | * | plugins/muc/muc.lib: Remove reversed conditionals when firing pre- eventsdaurnimator2014-04-211-2/+2
| | * | plugins/muc/subject.lib: If subject is not set by an occupant, it should come...daurnimator2014-04-181-2/+3
| | * | plugins/muc/muc.lib: When user leaves; set their role to nildaurnimator2014-04-181-0/+1
| | * | plugins/muc: Move 'moderated' code to seperate file; changes default "muc-get...daurnimator2014-04-182-32/+58
| | * | plugins/muc: Move 'hidden' ('public') code to own filedaurnimator2014-04-162-30/+55
| | * | plugins/muc: Move subject code to seperate moduledaurnimator2014-04-162-61/+100
| | * | plugins/muc/muc.lib: Refactor subject logic; fix bug of mixed up subject/authordaurnimator2014-04-151-18/+23
| | * | plugins/muc: Move persistent room configuration to own moduledaurnimator2014-04-153-28/+58
| | * | plugins/muc/muc.lib: Move members_only into seperate filedaurnimator2014-04-042-62/+93
| | * | plugins/muc/muc.lib: Turn get_default_role into an eventdaurnimator2014-04-031-7/+21
| | * | plugins/muc/muc.lib: Fix getting a list of occupants by role (it was sending ...daurnimator2014-04-031-3/+10