Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge | Matthew Wild | 2016-02-08 | 1 | -4/+3 |
|\ | |||||
| * | Merge 0.10->trunk | Kim Alvefur | 2016-02-05 | 1 | -4/+3 |
| |\ | |||||
| | * | certmanager: Try filename.key if certificate is set to a full filename ↵ | Kim Alvefur | 2016-02-05 | 1 | -3/+2 |
| | | | | | | | | | | | | ending with .crt | ||||
| | * | certmanager: Apply global ssl config later so certificate/key is not ↵ | Kim Alvefur | 2016-02-05 | 1 | -1/+1 |
| | | | | | | | | | | | | overwritten by magic | ||||
* | | | prosodyctl: fix CnP bug in deluser output | Thomas Gstädtner | 2016-02-08 | 1 | -2/+2 |
|/ / | |||||
* | | hostmanager: Remove unused imports of 'jid_split' and 'select' | Matthew Wild | 2016-02-05 | 1 | -3/+1 |
| | | |||||
* | | moduleapi: Silence luacheck warning about unused 'id' parameter | Matthew Wild | 2016-02-05 | 1 | -1/+1 |
| | | |||||
* | | Merge 0.10->trunk | Matthew Wild | 2016-02-05 | 5 | -102/+100 |
|\| | |||||
| * | certmanager: Support new certificate configuration for non-XMPP services too ↵ | Matthew Wild | 2016-02-05 | 1 | -6/+23 |
| | | | | | | | | (fixes #614) | ||||
| * | loggingmanager: Stringify all arguments to format so we can finally see the ↵ | Kim Alvefur | 2016-02-04 | 1 | -5/+12 |
| | | | | | | | | *real* error messages | ||||
| * | loggingmanager: Remove Windows hack, buffer_mode should fix this | Kim Alvefur | 2016-02-04 | 1 | -7/+0 |
| | | |||||
| * | loggingmanager: Write out timestamps in same write() call as everything else | Kim Alvefur | 2016-02-04 | 1 | -6/+5 |
| | | |||||
| * | loggingmanager: Make initial value for width of log name configurable | Kim Alvefur | 2016-02-04 | 1 | -1/+3 |
| | | |||||
| * | loggingmanager: Move logic for adaptive column width into file sink, append ↵ | Kim Alvefur | 2016-02-04 | 1 | -9/+11 |
| | | | | | | | | tab if disabled (fixes separation between name and level in plain file sinks) | ||||
| * | loggingmanager: Refactor the console log sink to re-use the stdout sink ↵ | Kim Alvefur | 2016-02-04 | 1 | -74/+45 |
| | | | | | | | | which in turn uses the file sink (tailcalls!) | ||||
| * | loggingmanager: Write out color code, log level and reset code in one call | Kim Alvefur | 2016-02-04 | 1 | -4/+2 |
| | | |||||
| * | loggingmanager: Don't reset default timestamp that is not changed by any ↵ | Kim Alvefur | 2016-02-04 | 1 | -1/+0 |
| | | | | | | | | other code | ||||
| * | util.logger: Silence luacheck warning | Kim Alvefur | 2016-02-04 | 1 | -0/+1 |
| | | |||||
| * | util.logger: Remove unused locals | Kim Alvefur | 2016-02-04 | 1 | -4/+1 |
| | | |||||
| * | mod_groups: Move variable to smaller scope | Kim Alvefur | 2016-02-04 | 1 | -3/+1 |
| | | |||||
| * | mod_groups: Use module:get_option_path, look for file relative to config dir | Kim Alvefur | 2016-02-04 | 1 | -1/+1 |
| | | |||||
| * | moduleapi: Add API method for getting a file path | Kim Alvefur | 2016-02-04 | 1 | -0/+14 |
| | | |||||
* | | Merge 0.10->trunk | Matthew Wild | 2016-02-04 | 1 | -3/+15 |
|\| | |||||
| * | loggingmanager: Call setvbuf on output files, defaulting to line-buffered, ↵ | Matthew Wild | 2016-02-04 | 1 | -3/+15 |
| | | | | | | | | instead of manually calling flush(). Adds 'buffer_mode' option to sink configuration for stdout, console and file sinks. | ||||
* | | MUC: Roll back parts of 50b9a7e86de9 that were not in the disco#info event | Kim Alvefur | 2016-02-04 | 2 | -2/+2 |
| | | |||||
* | | Merge 0.10->trunk | Kim Alvefur | 2016-02-03 | 1 | -0/+28 |
|\| | |||||
| * | core.certmanager: Look for certificate and key in a few different places | Kim Alvefur | 2016-02-03 | 1 | -0/+28 |
| | | |||||
* | | MUC: Fix copypaste mistake | Kim Alvefur | 2016-02-03 | 1 | -1/+1 |
| | | |||||
* | | Merge 0.10->trunk | Kim Alvefur | 2016-02-03 | 2 | -2/+234 |
|\| | |||||
| * | MUC: Fire a muc-disco#info event like in trunk so modules can extend the reply | Kim Alvefur | 2016-02-03 | 1 | -6/+13 |
| | | |||||
| * | Add util.ringbuffer, a ringbuffer with a file handle like interface | Kim Alvefur | 2016-02-02 | 2 | -2/+234 |
| | | |||||
* | | MUC: Separate form data from form in disco#info event | Kim Alvefur | 2016-02-03 | 3 | -6/+7 |
| | | |||||
* | | Merge 0.10->trunk | Matthew Wild | 2016-02-01 | 3 | -5/+23 |
|\| | |||||
| * | modulemanager, util.pluginloader: Move logic for locating some module ↵ | Matthew Wild | 2016-02-01 | 2 | -4/+16 |
| | | | | | | | | libraries to pluginloader, to fix problems with non-filesystem errors being masked by the second load_code call | ||||
| * | util.random: Restore friendlier error from 0.9/util.uuid | Kim Alvefur | 2016-01-31 | 1 | -1/+7 |
| | | |||||
* | | Merge 0.10->trunk | Kim Alvefur | 2016-01-30 | 1 | -0/+1 |
|\| | |||||
| * | CHANGES: Add websockets too (thanks av6) | Kim Alvefur | 2016-01-29 | 1 | -0/+1 |
| | | |||||
* | | CHANGES: Add some things trunk has over 0.10 (probably lots missing) | Kim Alvefur | 2016-01-28 | 1 | -0/+11 |
| | | |||||
* | | Merge 0.10->trunk | Kim Alvefur | 2016-01-28 | 2 | -6/+29 |
|\| | |||||
| * | Add a CHANGES file with new features in 0.10 | Kim Alvefur | 2016-01-28 | 1 | -0/+24 |
| | | |||||
| * | tests: Use util.envload to load chunks (fixes #608) | Kim Alvefur | 2016-01-28 | 1 | -6/+5 |
| | | |||||
* | | Merge 0.10->trunk | Matthew Wild | 2016-01-27 | 0 | -0/+0 |
|\| | |||||
| * | Merge 0.9->0.10 | Matthew Wild | 2016-01-27 | 0 | -0/+0 |
| |\ | |||||
| | * | Added tag 0.9.10 for changeset 352270bc0439 | Matthew Wild | 2016-01-27 | 0 | -0/+0 |
| | | | |||||
| | * | Merge0.9.10 | Kim Alvefur | 2016-01-27 | 1 | -1/+2 |
| | |\ | |||||
| | | * | mod_dialback: Follow XEP-0185 and use HMAC | Kim Alvefur | 2016-01-19 | 1 | -1/+2 |
| | | | | |||||
* | | | | Merge 0.10->trunk | Kim Alvefur | 2016-01-26 | 2 | -2/+2 |
|\| | | | |||||
| * | | | Merge 0.9->0.10 | Kim Alvefur | 2016-01-26 | 2 | -2/+2 |
| |\| | | |||||
| | * | | mod_c2s, mod_s2s: Lower priority of session shutdown to negative, so that ↵ | Kim Alvefur | 2016-01-26 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | plugins hooking at the default priority run first (fixes #601) | ||||
* | | | | Merge 0.10->trunk | Kim Alvefur | 2016-01-22 | 4 | -54/+72 |
|\| | | |