aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.10->trunk and Happy New Year!Kim Alvefur2013-12-312-12/+15
|\
| * mod_pubsub: Don't sent error replies from service disco events, let ↵Kim Alvefur2013-12-301-6/+3
| | | | | | | | mod_disco handle that
| * mod_storage_sql2: Expose the unique key argument, allowing arbitrary ids. ↵Kim Alvefur2013-12-251-2/+6
| | | | | | | | Conflicting items are removed.
| * mod_storage_sql2: Include user, host and store in id lookupKim Alvefur2013-12-251-4/+6
| |
* | Merge 0.10->trunkKim Alvefur2013-12-181-1/+7
|\|
| * Merge 0.9->0.10Kim Alvefur2013-12-181-1/+7
| |\
| | * mod_component: Enable TCP keepalives on component streamsKim Alvefur2013-12-181-0/+6
| | |
| | * mod_component: Decrease priority of component auth hookKim Alvefur2013-12-181-1/+1
| | |
| | * mod_muc: Remove extra parenthesis (thanks janhouse)Kim Alvefur2013-12-141-1/+1
| | |
* | | Merge 0.10->trunkMatthew Wild2013-12-161-1/+1
|\| |
| * | mod_muc: Remove extra parenthesis (thanks janhouse)Kim Alvefur2013-12-141-1/+1
| | |
* | | Merge 0.10->trunkMatthew Wild2013-12-131-1/+1
|\| |
| * | Merge 0.9->0.10Matthew Wild2013-12-131-1/+1
| |\|
| | * mod_muc: Allow admins to always bypass restrict_room_creation (thanks Chris B)Matthew Wild2013-12-131-1/+1
| | |
* | | Merge 0.10->trunkKim Alvefur2013-11-111-1/+1
|\| |
| * | mod_storage_sql2: Auto increment columns won't be NULL, so drop nullable=falseKim Alvefur2013-11-111-1/+1
| | |
* | | Merge 0.10->trunkMatthew Wild2013-11-091-1/+1
|\| |
| * | mod_storage_sql2: Fix backwards comparison of timestampKim Alvefur2013-11-071-1/+1
| | |
* | | Merge 0.10 -> trunkKim Alvefur2013-10-311-63/+32
|\| |
| * | mod_storage_sql2: Switch to the util.sql table definition for the main tableKim Alvefur2013-10-311-21/+1
| | |
| * | mod_storage_sql2: The prosodyarchive_index should be uniqueKim Alvefur2013-10-301-1/+1
| | |
| * | mod_storage_sql2: Use primary_key and auto_increment flags instead of baking ↵Kim Alvefur2013-10-301-1/+1
| | | | | | | | | | | | that into the type
| * | mod_storage_sql2: Use MEDIUMTEXT fields for value columns (ie TEXT on non-MySQL)Kim Alvefur2013-10-301-2/+2
| | |
| * | mod_storage_sql2: Move checking of the sql_manage_tables option so it also ↵Kim Alvefur2013-10-281-7/+6
| | | | | | | | | | | | includes table upgrades (again)
| * | mod_storage_sql2, util.sql: Move code for setting encoding to util.sqlKim Alvefur2013-10-281-12/+2
| | |
| * | mod_storage_sql2: Move all schema upgrade code to the same placeKim Alvefur2013-10-281-22/+20
| | |
| * | mod_storage_sql2: Split up setting of encoding and table upgrade codeKim Alvefur2013-10-281-1/+3
| | |
* | | Merge 0.10->trunkKim Alvefur2013-10-074-1/+5
|\| |
| * | mod_saslauth: Collect data for channel binding only if we know for sure that ↵Kim Alvefur2013-10-071-1/+1
| | | | | | | | | | | | the stream is encrypted
| * | mod_c2s, mod_s2s: Set session.encrypted as session.secure does not allways ↵Kim Alvefur2013-10-073-0/+4
| | | | | | | | | | | | mean encrypted (eg consider_bosh_secure)
* | | Merge 0.10->trunkMatthew Wild2013-10-053-3/+371
|\ \ \ | |/ / |/| |
| * | mod_pep_plus: An util.pubsub based PEP moduleFlorian Zeitz2013-10-041-0/+368
| | |
| * | mod_pubsub, util.pubsub: Keep track of the order of itemsKim Alvefur2013-10-042-3/+3
| | |
* | | Merge 0.9->0.10Matthew Wild2013-10-051-1/+1
|\ \ \ | |/ / |/| / | |/
| * muc.lib.lua: Fix Spark jabber client not displaying conference room lists, ↵Paul2013-10-051-1/+1
| | | | | | | | seemingly due to a missing value tag for the room description if the description has not been set
* | mod_storage_sql2: Add method for deleting items from archives with same ↵Kim Alvefur2013-09-281-0/+15
| | | | | | | | syntax as :find()
* | mod_storage_sql2: Split out code for building WHERE clauses into separate ↵Kim Alvefur2013-09-281-34/+44
| | | | | | | | functions
* | Merge Tobias SCRAM-PLUS workKim Alvefur2013-09-221-0/+10
|\ \
| * | mod_saslauth: Check whether LuaSec supports getpeerfinished() binding.Tobias Markmann2011-01-171-4/+8
| | |
| * | mod_saslauth: Add channel binding handler for tls-unique channel binding.Tobias Markmann2011-01-171-1/+3
| | |
| * | mod_saslauth: Set secure socket as SASL object user data for secure sessions.Tobias Markmann2011-01-171-0/+4
| | |
* | | mod_admin_adhoc: As the only user of set:items(), update... it's now an ↵Matthew Wild2013-09-031-2/+2
| | | | | | | | | | | | iterator, and the extra keys() iterator is now unnecessary
* | | mod_muc: Support for locking newly-created rooms until they are configured ↵Matthew Wild2013-08-302-0/+26
| | | | | | | | | | | | (enabled with muc_room_locking = true)
* | | mod_muc: Import util.arrayMatthew Wild2013-08-301-0/+1
| | |
* | | Merge 0.9->trunkMatthew Wild2013-08-241-1/+1
|\ \ \ | | |/ | |/|
| * | mod_pep: Update COMPAT comment, it seems Asterisk 1.8 also suffers from this ↵Matthew Wild2013-08-241-1/+1
| | | | | | | | | | | | issue (thanks Lonnie Abelbeck)
* | | mod_c2s: Move another log message to debug levelKim Alvefur2013-08-141-1/+1
| | |
* | | mod_c2s, mod_s2s: Log cipher and encryption info in a more compact and ↵Kim Alvefur2013-08-142-4/+2
| | | | | | | | | | | | (hopefully) less confusing way
* | | mod_s2s: Captitalize log messages that begin with a stream directionKim Alvefur2013-08-141-2/+2
| | |
* | | mod_s2s: Lower "Beginning new connection attempt" message from info to debug ↵Kim Alvefur2013-08-141-1/+1
| | | | | | | | | | | | level