aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.10->trunkMatthew Wild2014-01-181-4/+10
|\
| * Merge 0.9->0.10Matthew Wild2014-01-181-4/+10
| |\
| | * mod_tls: Let s2s_secure_auth override s2s_require_encryption and warn if ↵Kim Alvefur2014-01-151-0/+6
| | | | | | | | | | | | they differ
| | * mod_tls: Rename variables to be less confusingKim Alvefur2014-01-151-4/+4
| | |
* | | Merge 0.10->trunkMatthew Wild2014-01-183-14/+21
|\| |
| * | mod_storage_sql2: Fix SQL syntaxKim Alvefur2014-01-181-2/+2
| | |
| * | MUC: Expose room metatable on moduleKim Alvefur2014-01-181-2/+3
| | |
| * | MUC: Split out sending of the topic into method separate from sending historyKim Alvefur2014-01-181-0/+3
| | |
| * | MUC: Split saving to history into a separate methodKim Alvefur2014-01-181-10/+13
| | |
* | | Merge 0.10->trunkMatthew Wild2014-01-122-6/+6
|\| |
| * | MergeMatthew Wild2014-01-122-12/+15
| |\ \
| | * | mod_storage_sql2: Fix syntax error in subquery (Thanks Lance)Kim Alvefur2014-01-051-2/+2
| | | |
| * | | Merge 0.9->0.10Matthew Wild2014-01-121-4/+4
| |\ \ \ | | | |/ | | |/|
| | * | mod_tls: Log error when TLS initialization fails0.9.3Matthew Wild2014-01-121-2/+9
| | | |
| | * | mod_s2s: Include IP in log messages, if host is unavailableFlorian Zeitz2014-01-051-4/+4
| | | |
* | | | 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