aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | | | | | | | | MUC: Factor out role change permission check into its own methodKim Alvefur2019-02-241-18/+27
| | * | | | | | | | | | | | | | | | | | | | | | Merge 0.11->trunkKim Alvefur2019-02-222-2/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | prosodyctl: about: Report the current operating system according to unameKim Alvefur2018-12-081-0/+7
| | * | | | | | | | | | | | | | | | | | | | | | | net.server_epoll: Increase send_timeout to 3 minutes (to match server_event)Kim Alvefur2019-02-091-1/+1
| | * | | | | | | | | | | | | | | | | | | | | | | net.server_epoll: Separate timeout for initial connection attemptsKim Alvefur2019-02-091-1/+4
| | * | | | | | | | | | | | | | | | | | | | | | | Merge 0.11->trunkKim Alvefur2019-02-091-5/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.11->trunkMatthew Wild2019-02-041-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.11->trunkKim Alvefur2019-01-283-11/+53
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.11->trunkKim Alvefur2019-01-261-23/+79
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | GNUmakefile: Stop Prosody in case of failure in integration-testKim Alvefur2019-01-241-2/+3
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.11->trunkKim Alvefur2019-01-220-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | core.statsmanager: Do a final collection on shutdownKim Alvefur2019-01-221-0/+1
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | TODO: Remove statistics since this was done in 0.10Kim Alvefur2019-01-211-1/+0
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_mam: Fix operator precedence (thanks mimi89999)Kim Alvefur2019-01-201-1/+1
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.11->trunkKim Alvefur2019-01-190-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.11->trunkKim Alvefur2019-01-172-8/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.11->trunkMatthew Wild2019-01-070-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.11->trunkKim Alvefur2019-01-071-2/+17
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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_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
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_mam: Perform message expiry based on building an index by dateKim Alvefur2019-01-031-31/+39