| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge 0.10->trunk | Matthew Wild | 2013-12-13 | 2 | -2/+3 |
|\ |
|
| * | Merge 0.9->0.10 | Matthew Wild | 2013-12-13 | 2 | -2/+3 |
| |\ |
|
| | * | mod_muc: Allow admins to always bypass restrict_room_creation (thanks Chris B) | Matthew Wild | 2013-12-13 | 1 | -1/+1 |
| | * | prosody: Store the config file name so the same file can be used when reloading | Kim Alvefur | 2013-12-13 | 1 | -1/+2 |
* | | | Merge 0.10->trunk | Matthew Wild | 2013-12-11 | 2 | -1/+9 |
|\| | |
|
| * | | Merge 0.9->0.10 | Matthew Wild | 2013-12-11 | 2 | -1/+9 |
| |\| |
|
| | * | Tagging 0.9.2 (again) | Matthew Wild | 2013-12-04 | 0 | -0/+0 |
| | * | Makefile, configure: Add option for disabling generation of example certificates0.9.2 | Kim Alvefur | 2013-11-30 | 2 | -1/+9 |
* | | | Merge 0.10->trunk | Matthew Wild | 2013-11-29 | 0 | -0/+0 |
|\| | |
|
| * | | Merge 0.9->0.10 | Matthew Wild | 2013-11-29 | 0 | -0/+0 |
| |\| |
|
| | * | Tagging 0.9.2 | Matthew Wild | 2013-11-29 | 0 | -0/+0 |
* | | | Merge 0.10->trunk | Kim Alvefur | 2013-11-28 | 1 | -0/+2 |
|\| | |
|
| * | | Merge 0.9->0.10 | Kim Alvefur | 2013-11-28 | 1 | -0/+2 |
| |\| |
|
| | * | util.pposix: Verify that file handle is open | Kim Alvefur | 2013-11-28 | 1 | -0/+2 |
* | | | Merge 0.10->trunk | Kim Alvefur | 2013-11-24 | 4 | -37/+25 |
|\| | |
|
| * | | Merge 0.9->0.10 | Kim Alvefur | 2013-11-24 | 4 | -37/+25 |
| |\| |
|
| | * | Makefile, certs: Generate example certificates on build, remove the old stati... | Kim Alvefur | 2013-11-22 | 4 | -37/+25 |
* | | | Merge 0.10->trunk | Matthew Wild | 2013-11-21 | 1 | -1/+1 |
|\| | |
|
| * | | Merge 0.9->0.10 | Matthew Wild | 2013-11-21 | 1 | -1/+1 |
| |\| |
|
| | * | certmanager: Further cipher string tweaking. Re-enable ciphers required for D... | Matthew Wild | 2013-11-21 | 1 | -1/+1 |
* | | | Merge 0.10->trunk | Kim Alvefur | 2013-11-13 | 1 | -1/+1 |
|\| | |
|
| * | | util.sql: Fix previous commit | Kim Alvefur | 2013-11-12 | 1 | -1/+1 |
| * | | util.sql: Get character set info from the correct database. | Kim Alvefur | 2013-11-12 | 1 | -1/+1 |
* | | | Merge 0.10->trunk | Matthew Wild | 2013-11-12 | 0 | -0/+0 |
|\| | |
|
| * | | Merge 0.9->0.10 | Matthew Wild | 2013-11-12 | 0 | -0/+0 |
| |\| |
|
| | * | Back out 1b0ac7950129, as SSLv3 appears to still be in moderate use on the ne... | Matthew Wild | 2013-11-12 | 1 | -1/+1 |
* | | | Merge 0.10->trunk | Kim Alvefur | 2013-11-11 | 2 | -4/+5 |
|\| | |
|
| * | | mod_storage_sql2: Auto increment columns won't be NULL, so drop nullable=false | Kim Alvefur | 2013-11-11 | 1 | -1/+1 |
| * | | util.sql: Rewrite auto increment columns to SERIAL for PostgreSQL | Kim Alvefur | 2013-11-11 | 1 | -3/+4 |
* | | | Merge 0.10->trunk | Matthew Wild | 2013-11-10 | 1 | -1/+1 |
|\| | |
|
| * | | util.sql: Fix to call execute on 'self' rather than 'engine' (thanks eisensheng) | Matthew Wild | 2013-11-10 | 1 | -1/+1 |
* | | | Merge 0.10->trunk | Matthew Wild | 2013-11-10 | 2 | -2/+2 |
|\| | |
|
| * | | Merge 0.9->0.10 | Matthew Wild | 2013-11-10 | 2 | -2/+2 |
| |\| |
|
| | * | certmanager: Update default cipher string to prefer forward-secrecy over ciph... | Matthew Wild | 2013-11-10 | 1 | -1/+1 |
| | * | util.set: Remove unused variable | Matthew Wild | 2013-11-10 | 1 | -1/+1 |
* | | | Merge 0.10->trunk | Matthew Wild | 2013-11-09 | 2 | -2/+2 |
|\| | |
|
| * | | Merge 0.9->0.10 | Matthew Wild | 2013-11-09 | 1 | -1/+1 |
| |\| |
|
| | * | certmanager: Fix order of options, so that the dynamic option is at the end o... | Matthew Wild | 2013-11-09 | 1 | -1/+1 |
| | * | certmanager: Default to using the server's cipher preference order by default... | Matthew Wild | 2013-11-09 | 1 | -1/+1 |
| * | | mod_storage_sql2: Fix backwards comparison of timestamp | Kim Alvefur | 2013-11-07 | 1 | -1/+1 |
* | | | core.moduleapi: Fix some global accesses. | Waqas Hussain | 2013-11-06 | 1 | -2/+3 |
* | | | core/moduleapi: Return timer object from module:add_timer | daurnimator | 2013-11-06 | 1 | -5/+24 |
* | | | util/timer: Re-set params when timer is rescheduled | daurnimator | 2013-11-06 | 1 | -0/+1 |
* | | | Merge 0.10 -> trunk | Kim Alvefur | 2013-10-31 | 3 | -65/+73 |
|\| | |
|
| * | | Merge 0.9 -> 0.10 | Kim Alvefur | 2013-10-31 | 1 | -1/+1 |
| |\| |
|
| | * | certmanager: Disable SSLv3 by default | Kim Alvefur | 2013-10-31 | 1 | -1/+1 |
| * | | 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 |
| * | | mod_storage_sql2: Use MEDIUMTEXT fields for value columns (ie TEXT on non-MySQL) | Kim Alvefur | 2013-10-30 | 1 | -2/+2 |