aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.9->0.10Matthew Wild2013-12-162-6/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.9->0.10Matthew Wild2013-12-161-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_muc: Remove extra parenthesis (thanks janhouse)Kim Alvefur2013-12-141-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.9->0.10Matthew Wild2013-12-132-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.9->0.10Matthew Wild2013-12-112-1/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.9->0.10Matthew Wild2013-11-290-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.9->0.10Kim Alvefur2013-11-281-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.9->0.10Kim Alvefur2013-11-244-37/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.9->0.10Matthew Wild2013-11-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | util.sql: Fix previous commitKim Alvefur2013-11-121-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | util.sql: Get character set info from the correct database.Kim Alvefur2013-11-121-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.9->0.10Matthew Wild2013-11-120-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_storage_sql2: Auto increment columns won't be NULL, so drop nullable=falseKim Alvefur2013-11-111-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | util.sql: Rewrite auto increment columns to SERIAL for PostgreSQLKim Alvefur2013-11-111-3/+4
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | util.sql: Fix to call execute on 'self' rather than 'engine' (thanks eisensheng)Matthew Wild2013-11-101-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.9->0.10Matthew Wild2013-11-102-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.9->0.10Matthew Wild2013-11-091-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_storage_sql2: Fix backwards comparison of timestampKim Alvefur2013-11-071-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.9 -> 0.10Kim Alvefur2013-10-311-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_storage_sql2: Use MEDIUMTEXT fields for value columns (ie TEXT on non-MySQL)Kim Alvefur2013-10-301-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | util.sql: Rewrite MEDIUMTEXT to TEXT for drivers other than MySQLKim Alvefur2013-10-301-1/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | util.sql: Check what encoding SQLite3 usesKim Alvefur2013-10-291-1/+7
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | util.sql: Find out if MySQL supports utf8mb4 and use thatKim Alvefur2013-10-291-6/+11
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | util.sql: Support incrementing columnsKim Alvefur2013-10-281-0/+9
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | util.sql: Allow columns to be marked the primary keyKim Alvefur2013-10-281-0/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | util.sql: Allow creating unique indicesKim Alvefur2013-10-281-0/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_storage_sql2: Move checking of the sql_manage_tables option so it also in...Kim Alvefur2013-10-281-7/+6
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_storage_sql2, util.sql: Move code for setting encoding to util.sqlKim Alvefur2013-10-282-12/+13
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | certmanager: Fix. Again.Kim Alvefur2013-10-151-2/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | certmanager: Add back single_dh_use and single_ecdh_use to default options (Z...Kim Alvefur2013-10-151-2/+6
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | util.sasl.scram: Rename variable for clarityKim Alvefur2013-10-131-7/+7
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | util.sasl.scram: Cache profile name instead of concatenating when usedKim Alvefur2013-10-131-2/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | util.sasl.scram: Rewrite patterns and capture client-first-message-bare, clie...Kim Alvefur2013-10-131-5/+6
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | util.sasl.scram: Create the state table as late as possible, keep state in lo...Kim Alvefur2013-10-131-41/+40
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | util.sasl.scram: Compare gs2-header to cbind-input (Thanks Tobias)Kim Alvefur2013-10-121-8/+8
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.9->0.10Matthew Wild2013-10-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | util.sasl: Remove unused print() import.Waqas Hussain2013-10-071-1/+0
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | util.sasl: Make registerMechanism a public function (again)Waqas Hussain2013-10-071-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | mod_saslauth: Collect data for channel binding only if we know for sure that ...Kim Alvefur2013-10-071-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | mod_c2s, mod_s2s: Set session.encrypted as session.secure does not allways me...Kim Alvefur2013-10-073-0/+4
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | util.array: Improve array:reverse() and make it work as both method and non-m...Kim Alvefur2013-10-061-9/+20
| * | | | | | | | | | | | | | | | | | | | | | | | | | util.sasl.scram: Remove unused function and importKim Alvefur2013-10-061-9/+0
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.9->0.10Matthew Wild2013-10-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.9->0.10Matthew Wild2013-09-301-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | mod_storage_sql2: Add method for deleting items from archives with same synta...Kim Alvefur2013-09-281-0/+15