Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.10->trunk | Matthew Wild | 2014-01-18 | 1 | -4/+10 |
|\ | |||||
| * | Merge 0.9->0.10 | Matthew Wild | 2014-01-18 | 1 | -4/+10 |
| |\ | |||||
| | * | mod_tls: Let s2s_secure_auth override s2s_require_encryption and warn if ↵ | Kim Alvefur | 2014-01-15 | 1 | -0/+6 |
| | | | | | | | | | | | | they differ | ||||
| | * | mod_tls: Rename variables to be less confusing | Kim Alvefur | 2014-01-15 | 1 | -4/+4 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2014-01-18 | 3 | -14/+21 |
|\| | | |||||
| * | | mod_storage_sql2: Fix SQL syntax | Kim Alvefur | 2014-01-18 | 1 | -2/+2 |
| | | | |||||
| * | | MUC: Expose room metatable on module | Kim Alvefur | 2014-01-18 | 1 | -2/+3 |
| | | | |||||
| * | | MUC: Split out sending of the topic into method separate from sending history | Kim Alvefur | 2014-01-18 | 1 | -0/+3 |
| | | | |||||
| * | | MUC: Split saving to history into a separate method | Kim Alvefur | 2014-01-18 | 1 | -10/+13 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2014-01-12 | 2 | -6/+6 |
|\| | | |||||
| * | | Merge | Matthew Wild | 2014-01-12 | 2 | -12/+15 |
| |\ \ | |||||
| | * | | mod_storage_sql2: Fix syntax error in subquery (Thanks Lance) | Kim Alvefur | 2014-01-05 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge 0.9->0.10 | Matthew Wild | 2014-01-12 | 1 | -4/+4 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | mod_tls: Log error when TLS initialization fails0.9.3 | Matthew Wild | 2014-01-12 | 1 | -2/+9 |
| | | | | |||||
| | * | | mod_s2s: Include IP in log messages, if host is unavailable | Florian Zeitz | 2014-01-05 | 1 | -4/+4 |
| | | | | |||||
* | | | | Merge 0.10->trunk and Happy New Year! | Kim Alvefur | 2013-12-31 | 2 | -12/+15 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | mod_pubsub: Don't sent error replies from service disco events, let ↵ | Kim Alvefur | 2013-12-30 | 1 | -6/+3 |
| | | | | | | | | | | | | | | | | mod_disco handle that | ||||
| * | | | mod_storage_sql2: Expose the unique key argument, allowing arbitrary ids. ↵ | Kim Alvefur | 2013-12-25 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | Conflicting items are removed. | ||||
| * | | | mod_storage_sql2: Include user, host and store in id lookup | Kim Alvefur | 2013-12-25 | 1 | -4/+6 |
| |/ / | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2013-12-18 | 1 | -1/+7 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2013-12-18 | 1 | -1/+7 |
| |\| | |||||
| | * | mod_component: Enable TCP keepalives on component streams | Kim Alvefur | 2013-12-18 | 1 | -0/+6 |
| | | | |||||
| | * | mod_component: Decrease priority of component auth hook | Kim Alvefur | 2013-12-18 | 1 | -1/+1 |
| | | | |||||
| | * | mod_muc: Remove extra parenthesis (thanks janhouse) | Kim Alvefur | 2013-12-14 | 1 | -1/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2013-12-16 | 1 | -1/+1 |
|\| | | |||||
| * | | mod_muc: Remove extra parenthesis (thanks janhouse) | Kim Alvefur | 2013-12-14 | 1 | -1/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2013-12-13 | 1 | -1/+1 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Matthew Wild | 2013-12-13 | 1 | -1/+1 |
| |\| | |||||
| | * | mod_muc: Allow admins to always bypass restrict_room_creation (thanks Chris B) | Matthew Wild | 2013-12-13 | 1 | -1/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2013-11-11 | 1 | -1/+1 |
|\| | | |||||
| * | | mod_storage_sql2: Auto increment columns won't be NULL, so drop nullable=false | Kim Alvefur | 2013-11-11 | 1 | -1/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2013-11-09 | 1 | -1/+1 |
|\| | | |||||
| * | | mod_storage_sql2: Fix backwards comparison of timestamp | Kim Alvefur | 2013-11-07 | 1 | -1/+1 |
| | | | |||||
* | | | Merge 0.10 -> trunk | Kim Alvefur | 2013-10-31 | 1 | -63/+32 |
|\| | | |||||
| * | | mod_storage_sql2: Switch to the util.sql table definition for the main table | Kim Alvefur | 2013-10-31 | 1 | -21/+1 |
| | | | |||||
| * | | mod_storage_sql2: The prosodyarchive_index should be unique | Kim Alvefur | 2013-10-30 | 1 | -1/+1 |
| | | | |||||
| * | | mod_storage_sql2: Use primary_key and auto_increment flags instead of baking ↵ | Kim Alvefur | 2013-10-30 | 1 | -1/+1 |
| | | | | | | | | | | | | that into the type | ||||
| * | | mod_storage_sql2: Use MEDIUMTEXT fields for value columns (ie TEXT on non-MySQL) | Kim Alvefur | 2013-10-30 | 1 | -2/+2 |
| | | | |||||
| * | | mod_storage_sql2: Move checking of the sql_manage_tables option so it also ↵ | Kim Alvefur | 2013-10-28 | 1 | -7/+6 |
| | | | | | | | | | | | | includes table upgrades (again) | ||||
| * | | mod_storage_sql2, util.sql: Move code for setting encoding to util.sql | Kim Alvefur | 2013-10-28 | 1 | -12/+2 |
| | | | |||||
| * | | mod_storage_sql2: Move all schema upgrade code to the same place | Kim Alvefur | 2013-10-28 | 1 | -22/+20 |
| | | | |||||
| * | | mod_storage_sql2: Split up setting of encoding and table upgrade code | Kim Alvefur | 2013-10-28 | 1 | -1/+3 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2013-10-07 | 4 | -1/+5 |
|\| | | |||||
| * | | mod_saslauth: Collect data for channel binding only if we know for sure that ↵ | Kim Alvefur | 2013-10-07 | 1 | -1/+1 |
| | | | | | | | | | | | | the stream is encrypted | ||||
| * | | mod_c2s, mod_s2s: Set session.encrypted as session.secure does not allways ↵ | Kim Alvefur | 2013-10-07 | 3 | -0/+4 |
| | | | | | | | | | | | | mean encrypted (eg consider_bosh_secure) | ||||
* | | | Merge 0.10->trunk | Matthew Wild | 2013-10-05 | 3 | -3/+371 |
|\ \ \ | |/ / |/| | | |||||
| * | | mod_pep_plus: An util.pubsub based PEP module | Florian Zeitz | 2013-10-04 | 1 | -0/+368 |
| | | | |||||
| * | | mod_pubsub, util.pubsub: Keep track of the order of items | Kim Alvefur | 2013-10-04 | 2 | -3/+3 |
| | | | |||||
* | | | Merge 0.9->0.10 | Matthew Wild | 2013-10-05 | 1 | -1/+1 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | muc.lib.lua: Fix Spark jabber client not displaying conference room lists, ↵ | Paul | 2013-10-05 | 1 | -1/+1 |
| | | | | | | | | seemingly due to a missing value tag for the room description if the description has not been set |