aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.10->trunkMatthew Wild2013-12-162-2/+5
|\
| * Merge 0.9->0.10Matthew Wild2013-12-161-1/+4
| |\
| | * util.jid: Strip trailing '.' when normalizing hostnamesMatthew Wild2013-12-161-1/+4
| | * mod_muc: Remove extra parenthesis (thanks janhouse)Kim Alvefur2013-12-141-1/+1
| * | mod_muc: Remove extra parenthesis (thanks janhouse)Kim Alvefur2013-12-141-1/+1
* | | Merge 0.10->trunkMatthew Wild2013-12-132-2/+3
|\| |
| * | Merge 0.9->0.10Matthew Wild2013-12-132-2/+3
| |\|
| | * mod_muc: Allow admins to always bypass restrict_room_creation (thanks Chris B)Matthew Wild2013-12-131-1/+1
| | * prosody: Store the config file name so the same file can be used when reloadingKim Alvefur2013-12-131-1/+2
* | | Merge 0.10->trunkMatthew Wild2013-12-112-1/+9
|\| |
| * | Merge 0.9->0.10Matthew Wild2013-12-112-1/+9
| |\|
| | * Tagging 0.9.2 (again)Matthew Wild2013-12-040-0/+0
| | * Makefile, configure: Add option for disabling generation of example certificates0.9.2Kim Alvefur2013-11-302-1/+9
* | | Merge 0.10->trunkMatthew Wild2013-11-290-0/+0
|\| |
| * | Merge 0.9->0.10Matthew Wild2013-11-290-0/+0
| |\|
| | * Tagging 0.9.2Matthew Wild2013-11-290-0/+0
* | | Merge 0.10->trunkKim Alvefur2013-11-281-0/+2
|\| |
| * | Merge 0.9->0.10Kim Alvefur2013-11-281-0/+2
| |\|
| | * util.pposix: Verify that file handle is openKim Alvefur2013-11-281-0/+2
* | | Merge 0.10->trunkKim Alvefur2013-11-244-37/+25
|\| |
| * | Merge 0.9->0.10Kim Alvefur2013-11-244-37/+25
| |\|
| | * Makefile, certs: Generate example certificates on build, remove the old stati...Kim Alvefur2013-11-224-37/+25
* | | Merge 0.10->trunkMatthew Wild2013-11-211-1/+1
|\| |
| * | Merge 0.9->0.10Matthew Wild2013-11-211-1/+1
| |\|
| | * certmanager: Further cipher string tweaking. Re-enable ciphers required for D...Matthew Wild2013-11-211-1/+1
* | | Merge 0.10->trunkKim Alvefur2013-11-131-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.10->trunkMatthew Wild2013-11-120-0/+0
|\| |
| * | Merge 0.9->0.10Matthew Wild2013-11-120-0/+0
| |\|
| | * Back out 1b0ac7950129, as SSLv3 appears to still be in moderate use on the ne...Matthew Wild2013-11-121-1/+1
* | | Merge 0.10->trunkKim Alvefur2013-11-112-4/+5
|\| |
| * | 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
* | | Merge 0.10->trunkMatthew Wild2013-11-101-1/+1
|\| |
| * | util.sql: Fix to call execute on 'self' rather than 'engine' (thanks eisensheng)Matthew Wild2013-11-101-1/+1
* | | Merge 0.10->trunkMatthew Wild2013-11-102-2/+2
|\| |
| * | Merge 0.9->0.10Matthew Wild2013-11-102-2/+2
| |\|
| | * certmanager: Update default cipher string to prefer forward-secrecy over ciph...Matthew Wild2013-11-101-1/+1
| | * util.set: Remove unused variableMatthew Wild2013-11-101-1/+1
* | | Merge 0.10->trunkMatthew Wild2013-11-092-2/+2
|\| |
| * | Merge 0.9->0.10Matthew Wild2013-11-091-1/+1
| |\|
| | * certmanager: Fix order of options, so that the dynamic option is at the end o...Matthew Wild2013-11-091-1/+1
| | * certmanager: Default to using the server's cipher preference order by default...Matthew Wild2013-11-091-1/+1
| * | mod_storage_sql2: Fix backwards comparison of timestampKim Alvefur2013-11-071-1/+1
* | | core.moduleapi: Fix some global accesses.Waqas Hussain2013-11-061-2/+3
* | | core/moduleapi: Return timer object from module:add_timerdaurnimator2013-11-061-5/+24
* | | util/timer: Re-set params when timer is rescheduleddaurnimator2013-11-061-0/+1
* | | Merge 0.10 -> trunkKim Alvefur2013-10-313-65/+73
|\| |
| * | Merge 0.9 -> 0.10Kim Alvefur2013-10-311-1/+1
| |\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-18 23:16:10 +0000