aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* MUC: Split saving to history into a separate methodKim Alvefur2014-01-181-10/+13
* MergeMatthew Wild2014-01-123-19/+45
|\
| * mod_storage_sql2: Fix syntax error in subquery (Thanks Lance)Kim Alvefur2014-01-051-2/+2
| * util.pubsub: Separate data from node configurationKim Alvefur2013-12-301-7/+26
| * util.pubsub: Fire events on more actionsKim Alvefur2013-12-261-0/+4
| * mod_pubsub: Don't sent error replies from service disco events, let mod_disco...Kim Alvefur2013-12-301-6/+3
| * mod_storage_sql2: Expose the unique key argument, allowing arbitrary ids. Con...Kim Alvefur2013-12-251-2/+6
| * mod_storage_sql2: Include user, host and store in id lookupKim Alvefur2013-12-251-4/+6
* | Merge 0.9->0.10Matthew Wild2014-01-122-8/+12
|\ \ | |/ |/|
| * Tagging 0.9.3Matthew Wild2014-01-120-0/+0
| * mod_tls: Log error when TLS initialization failsMatthew Wild2014-01-121-2/+9
| * mod_s2s: Include IP in log messages, if host is unavailableFlorian Zeitz2014-01-051-4/+4
| * tools/migration/migrator/prosody_files: Fix undefined global access of ?error...Waqas Hussain2014-01-031-4/+8
* | 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
* | Merge 0.9->0.10Matthew Wild2013-12-162-6/+3
|\|
| * net.server_select: Don't remove the socket from sendlist when we might have d...Matthew Wild2013-12-161-5/+1
| * net.http: assert() for socket creation success so it doesn't silently fail (t...Matthew Wild2013-12-161-1/+2
* | 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.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.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 certificatesKim Alvefur2013-11-302-1/+9
* | Merge 0.9->0.10Matthew Wild2013-11-290-0/+0
|\|
| * Tagging 0.9.2Matthew Wild2013-11-290-0/+0
* | 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.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.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
* | 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
|\|
| * Back out 1b0ac7950129, as SSLv3 appears to still be in moderate use on the ne...Matthew Wild2013-11-121-1/+1
* | 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
|\|
| * 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.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