aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.10->trunkKim Alvefur2017-04-211-3/+83
|\
| * prosodyctl: cert import: Command to copy certificates into prosodys ↵Kim Alvefur2017-04-211-0/+66
| | | | | | | | certificate directory (fixes #892)
| * prosodyctl: Split long line [luacheck]Kim Alvefur2017-04-211-1/+4
| |
| * prosodyctl: Normalize inconsistent whitespace [luacheck]Kim Alvefur2017-04-211-5/+5
| |
| * prosodyctl: Verify that directory certs are written to existsKim Alvefur2017-04-211-0/+4
| |
| * prosodyctl: Verify permissions on directory that certificates are written toKim Alvefur2017-04-211-0/+8
| |
| * prosodyctl: Return non-zero status to indicate errorKim Alvefur2017-04-211-1/+1
| |
| * prosodyctl: Remove example showing deprecated config optionKim Alvefur2017-04-211-1/+0
| |
| * prosodyctl: Fix indentationKim Alvefur2017-04-211-3/+3
| |
* | Merge 0.10->trunkKim Alvefur2017-04-201-1/+1
|\|
| * prosodyctl: Use the correct variableKim Alvefur2017-04-201-1/+1
| |
* | Merge 0.10->trunkKim Alvefur2017-04-205-12/+24
|\|
| * prosodyctl cert: If running as root, write certificate files to config ↵Kim Alvefur2017-04-191-4/+11
| | | | | | | | directory (fixes #530)
| * prosodyctl: Rename variable for soft-require success to improve readabilityKim Alvefur2017-04-191-2/+2
| |
| * prosodyctl: Remove --root from arg arrayKim Alvefur2017-04-191-1/+3
| |
| * Merge 0.9->0.10Kim Alvefur2017-04-191-1/+3
| |\
| | * mod_bosh: Update session.conn to point to the current connection (fixes #890)Kim Alvefur2017-04-171-1/+3
| | |
| * | prosodyctl: Allow continuing to run as root (fixes #893)Kim Alvefur2017-04-191-1/+1
| | |
| * | util.sasl.plain,scram: Record username in sasl state earlierKim Alvefur2017-04-192-2/+3
| | |
| * | prosodyctl: Don't switch user if we are root and run_as_root is enabledMatthew Wild2017-04-191-1/+1
| | |
| * | util.datamanager: Use already known index instead of measuring length each ↵Kim Alvefur2017-04-171-2/+2
| | | | | | | | | | | | iteration
* | | net.server_epoll: Reset onwritable before calling onconnect (fixes traceback ↵Kim Alvefur2017-04-161-2/+2
| | | | | | | | | | | | if connection closed in onconnect)
* | | Merge 0.10->trunkKim Alvefur2017-04-151-0/+5
|\| |
| * | mod_storage_internal: Support the 'key' archive query fieldKim Alvefur2017-04-151-0/+5
| | |
* | | Merge 0.10->trunkKim Alvefur2017-04-151-11/+14
|\| |
| * | configure: Skip some interpreter checks if --runwith is setKim Alvefur2017-04-151-10/+13
| | |
| * | configure: Fix explanation of where it looked for an interpreter (luarocks ↵Kim Alvefur2017-04-151-1/+1
| | | | | | | | | | | | 3dcfa00, thanks Izaron)
* | | Merge 0.10->trunkKim Alvefur2017-04-131-1/+8
|\| |
| * | util.sql: Produce more SQL-standard-like debug messagesKim Alvefur2017-04-131-1/+8
| | |
* | | Merge 0.10->trunkKim Alvefur2017-04-131-6/+10
|\| |
| * | mod_storage_sql: Limit encoding check to current databaseKim Alvefur2017-04-131-2/+4
| | |
| * | mod_storage_sql: Break long linesKim Alvefur2017-04-121-2/+5
| | |
| * | mod_storage_sql: Pass charset and collation names via variable bindingKim Alvefur2017-04-121-4/+3
| | |
| * | mod_storage_sql: Quote some field namesKim Alvefur2017-04-121-2/+2
| | |
* | | Merge 0.10->trunkKim Alvefur2017-04-122-3/+3
|\| |
| * | util.sql: Strip indentation from queries for debug loggingKim Alvefur2017-04-121-0/+1
| | |
| * | util.sql: Apply quote transform in engine:execute so it is applied to eg ↵Kim Alvefur2017-04-121-2/+1
| | | | | | | | | | | | encoding checks in mod_storage_sql (thanks Martin)
| * | mod_storage_sql: Raise error if encoding check query failsKim Alvefur2017-04-121-1/+1
| | |
* | | Merge 0.10->trunkKim Alvefur2017-04-105-85/+80
|\| |
| * | SQL: Use standard quotes for columns and other identifiers, rewrite to grave ↵Kim Alvefur2017-04-103-74/+72
| | | | | | | | | | | | accents for MySQL only (fixes #885)
| * | mod_presence: Use get_child_text on priority child element (fixes #552)Kim Alvefur2017-04-101-8/+5
| | |
| * | mod_presence: No need to overwrite index 1 since it's set on the line belowKim Alvefur2017-04-101-1/+1
| | |
| * | mod_register: Include additional data in user-registering eventKim Alvefur2017-04-101-1/+1
| | |
| * | mod_register: Remove check for empty table (previous line sets a field)Kim Alvefur2017-04-101-1/+1
| | |
* | | Merge 0.10->trunkKim Alvefur2017-04-092-1/+8
|\| |
| * | prosodyctl: Point out how default_storage is redundant if storage is a stringKim Alvefur2017-04-081-0/+7
| | |
| * | migration/prosody_sql: Commit transaction when all items have been processedKim Alvefur2017-04-081-1/+1
| | |
* | | Merge 0.10->trunkKim Alvefur2017-04-083-80/+67
|\| |
| * | migrator/prosody_sql: Abort and demand database be upgraded if it needs to ↵Kim Alvefur2017-04-071-1/+32
| | | | | | | | | | | | be (#635)
| * | migrator.prosody_sql: Switch to util.sql (#635)Kim Alvefur2017-04-071-73/+30
| | |