aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.11->trunkKim Alvefur2019-01-190-0/+0
|\
| * mod_websocket: Include the value of cross_domain_websocket in debug messageKim Alvefur2019-01-181-1/+1
* | mod_bosh, mod_websocket: Remove accidentally included dependency on non-exist...Kim Alvefur2019-01-192-2/+0
* | prosodyctl: Fix module.command invocation (thanks woffs)Kim Alvefur2019-01-181-2/+0
* | mod_http: Determine CORS methods to whitelist from actual methods usedKim Alvefur2019-01-171-2/+9
* | mod_http: Set up to handle OPTIONSKim Alvefur2019-01-181-0/+7
* | mod_websocket: Drop CORS code in favor of that in mod_httpKim Alvefur2018-10-042-35/+5
* | mod_bosh: Drop CORS code in favor of than in mod_httpKim Alvefur2018-10-042-26/+6
* | mod_http: Solve CORS problems once and for allKim Alvefur2018-10-041-0/+19
* | Merge 0.11->trunkKim Alvefur2019-01-171-1/+1
|\|
| * mod_motd: Remove unused variable [luacheck]Kim Alvefur2019-01-171-1/+1
* | Merge 0.11->trunkKim Alvefur2019-01-172-8/+7
|\|
| * mod_motd: Remove redundant conditionsKim Alvefur2019-01-171-8/+6
| * mod_presence: Revert empty 'to' attribute of presence before presence/initial...Kim Alvefur2019-01-171-0/+1
* | core.s2smanager: Add stub reset_stream method to destroyed sessionsKim Alvefur2019-01-161-0/+3
* | mod_admin_telnet: sttas:show: Use format option that allows float numbersKim Alvefur2019-01-161-1/+1
* | util.http: Fix decoding of uppercase URL encoded charsKim Alvefur2019-01-162-0/+6
* | mod_c2s, mod_s2s, mod_component: Log invalid XML escaped (fixes #734)Kim Alvefur2019-01-153-4/+3
* | mod_storage_memory: Implement :user iteration APIKim Alvefur2019-01-141-0/+8
* | prosodyctl: Use the same runtime for starting prosodyKim Alvefur2019-01-101-1/+1
* | util.prosodyctl: Allow passing path to Lua runtime to the start() functionKim Alvefur2019-01-101-3/+4
* | prosodyctl: Pass the original argv table to subcommands (with first argument ...Kim Alvefur2019-01-101-2/+2
* | GNUmakefile: Add target for running scansionKim Alvefur2019-01-101-0/+6
* | Merge 0.11->trunkKim Alvefur2019-01-101-1/+1
|\|
| * mod_bosh: Handle missing wait attribute (fixes #1288)Kim Alvefur2019-01-101-1/+1
| * Added tag 0.11.2 for changeset 4f8b6c09e5f3Matthew Wild2019-01-080-0/+0
* | Merge 0.11->trunkMatthew Wild2019-01-070-0/+0
|\|
| * Merge 0.10->0.110.11.2Matthew Wild2019-01-070-0/+0
| |\
| | * Added tag 0.10.3 for changeset bb8486491b48Matthew Wild2018-11-280-0/+0
* | | Merge 0.11->trunkKim Alvefur2019-01-071-2/+17
|\| |
| * | mod_csi_simple: Consider messages encrypted payload as important (fixes part ...Kim Alvefur2019-01-061-0/+3
| * | mod_csi_simple: Consider messages with subject (eg MUC joins) (fixes part of ...Kim Alvefur2019-01-061-0/+3
| * | mod_csi_simple: Unpack Carbons-forwarded messages (fixes part of #1250)Kim Alvefur2019-01-061-0/+4
| * | mod_csi_simple: Consider messages forwarded from another of the users clients...Kim Alvefur2019-01-061-0/+3
| * | mod_csi_simple: Tweak check for <body>Kim Alvefur2019-01-061-2/+4
* | | MUC: Rename import to avoid name clash [luacheck]Kim Alvefur2019-01-061-2/+2
* | | Merge with jonasKim Alvefur2019-01-061-0/+4
|\ \ \
| * | | MUC: add ID to message if no ID is presentJonas Wielicki2019-01-061-0/+4
* | | | Merge 0.11->trunkKim Alvefur2019-01-062-1/+4
|\ \ \ \ | | |/ / | |/| |
| * | | mod_posix: Don't reload logging twiceKim Alvefur2019-01-061-1/+1
| * | | util.startup: Always reload logging after config (fixes #1284)Kim Alvefur2019-01-061-0/+3
* | | | mod_http_errors: Normalize CSSKim Alvefur2019-01-061-11/+14
* | | | util.http: Pre-generate urlencoding mappings (optimization)Kim Alvefur2019-01-061-10/+11
* | | | mod_mam: Handle expiry of messages that expire in the middle of the cut-off dayKim Alvefur2019-01-061-2/+6
* | | | mod_mam: Measure how long it takes to run the message expiry job jobKim Alvefur2019-01-061-0/+3
| |/ / |/| |
* | | mod_admin_telnet: Sort stats by nameKim Alvefur2019-01-041-1/+1
* | | mod_admin_telnet: Serialize config values (table: 0x123abc isn't useful)Kim Alvefur2019-01-041-1/+2
* | | mod_admin_telnet: config:get: Assume the global section if only one argument ...Kim Alvefur2019-01-041-0/+3
* | | mod_admin_telnet: Remove the long gone 'section' argument in the undocumented...Kim Alvefur2019-01-041-2/+2
* | | mod_mam: Fix word order in log messageKim Alvefur2019-01-041-1/+1