aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* MergeMatthew Wild2016-02-081-4/+3
|\
| * Merge 0.10->trunkKim Alvefur2016-02-051-4/+3
| |\
| | * certmanager: Try filename.key if certificate is set to a full filename ↵Kim Alvefur2016-02-051-3/+2
| | | | | | | | | | | | ending with .crt
| | * certmanager: Apply global ssl config later so certificate/key is not ↵Kim Alvefur2016-02-051-1/+1
| | | | | | | | | | | | overwritten by magic
* | | prosodyctl: fix CnP bug in deluser outputThomas Gstädtner2016-02-081-2/+2
|/ /
* | hostmanager: Remove unused imports of 'jid_split' and 'select'Matthew Wild2016-02-051-3/+1
| |
* | moduleapi: Silence luacheck warning about unused 'id' parameterMatthew Wild2016-02-051-1/+1
| |
* | Merge 0.10->trunkMatthew Wild2016-02-055-102/+100
|\|
| * certmanager: Support new certificate configuration for non-XMPP services too ↵Matthew Wild2016-02-051-6/+23
| | | | | | | | (fixes #614)
| * loggingmanager: Stringify all arguments to format so we can finally see the ↵Kim Alvefur2016-02-041-5/+12
| | | | | | | | *real* error messages
| * loggingmanager: Remove Windows hack, buffer_mode should fix thisKim Alvefur2016-02-041-7/+0
| |
| * loggingmanager: Write out timestamps in same write() call as everything elseKim Alvefur2016-02-041-6/+5
| |
| * loggingmanager: Make initial value for width of log name configurableKim Alvefur2016-02-041-1/+3
| |
| * loggingmanager: Move logic for adaptive column width into file sink, append ↵Kim Alvefur2016-02-041-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 Alvefur2016-02-041-74/+45
| | | | | | | | which in turn uses the file sink (tailcalls!)
| * loggingmanager: Write out color code, log level and reset code in one callKim Alvefur2016-02-041-4/+2
| |
| * loggingmanager: Don't reset default timestamp that is not changed by any ↵Kim Alvefur2016-02-041-1/+0
| | | | | | | | other code
| * util.logger: Silence luacheck warningKim Alvefur2016-02-041-0/+1
| |
| * util.logger: Remove unused localsKim Alvefur2016-02-041-4/+1
| |
| * mod_groups: Move variable to smaller scopeKim Alvefur2016-02-041-3/+1
| |
| * mod_groups: Use module:get_option_path, look for file relative to config dirKim Alvefur2016-02-041-1/+1
| |
| * moduleapi: Add API method for getting a file pathKim Alvefur2016-02-041-0/+14
| |
* | Merge 0.10->trunkMatthew Wild2016-02-041-3/+15
|\|
| * loggingmanager: Call setvbuf on output files, defaulting to line-buffered, ↵Matthew Wild2016-02-041-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 eventKim Alvefur2016-02-042-2/+2
| |
* | Merge 0.10->trunkKim Alvefur2016-02-031-0/+28
|\|
| * core.certmanager: Look for certificate and key in a few different placesKim Alvefur2016-02-031-0/+28
| |
* | MUC: Fix copypaste mistakeKim Alvefur2016-02-031-1/+1
| |
* | Merge 0.10->trunkKim Alvefur2016-02-032-2/+234
|\|
| * MUC: Fire a muc-disco#info event like in trunk so modules can extend the replyKim Alvefur2016-02-031-6/+13
| |
| * Add util.ringbuffer, a ringbuffer with a file handle like interfaceKim Alvefur2016-02-022-2/+234
| |
* | MUC: Separate form data from form in disco#info eventKim Alvefur2016-02-033-6/+7
| |
* | Merge 0.10->trunkMatthew Wild2016-02-013-5/+23
|\|
| * modulemanager, util.pluginloader: Move logic for locating some module ↵Matthew Wild2016-02-012-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.uuidKim Alvefur2016-01-311-1/+7
| |
* | Merge 0.10->trunkKim Alvefur2016-01-301-0/+1
|\|
| * CHANGES: Add websockets too (thanks av6)Kim Alvefur2016-01-291-0/+1
| |
* | CHANGES: Add some things trunk has over 0.10 (probably lots missing)Kim Alvefur2016-01-281-0/+11
| |
* | Merge 0.10->trunkKim Alvefur2016-01-282-6/+29
|\|
| * Add a CHANGES file with new features in 0.10Kim Alvefur2016-01-281-0/+24
| |
| * tests: Use util.envload to load chunks (fixes #608)Kim Alvefur2016-01-281-6/+5
| |
* | Merge 0.10->trunkMatthew Wild2016-01-270-0/+0
|\|
| * Merge 0.9->0.10Matthew Wild2016-01-270-0/+0
| |\
| | * Added tag 0.9.10 for changeset 352270bc0439Matthew Wild2016-01-270-0/+0
| | |
| | * Merge0.9.10Kim Alvefur2016-01-271-1/+2
| | |\
| | | * mod_dialback: Follow XEP-0185 and use HMACKim Alvefur2016-01-191-1/+2
| | | |
* | | | Merge 0.10->trunkKim Alvefur2016-01-262-2/+2
|\| | |
| * | | Merge 0.9->0.10Kim Alvefur2016-01-262-2/+2
| |\| |
| | * | mod_c2s, mod_s2s: Lower priority of session shutdown to negative, so that ↵Kim Alvefur2016-01-262-2/+2
| | | | | | | | | | | | | | | | plugins hooking at the default priority run first (fixes #601)
* | | | Merge 0.10->trunkKim Alvefur2016-01-224-54/+72
|\| | |