aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.11->trunkKim Alvefur2019-02-222-2/+6
|\
| * mod_pubsub: Simplify configuration for node data (see #1302)Kim Alvefur2019-02-221-1/+3
| * mod_pep: Simplify configuration for node data (fixes #1320)Kim Alvefur2019-02-221-1/+3
* | 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
|\|
| * net.server_epoll: Rename handshake_timeout to ssl_handshake_timeout (fixes #1...Kim Alvefur2019-02-091-3/+3
| * net.server_epoll: Use send_timeout for write timout like other implementation...Kim Alvefur2019-02-071-2/+2
* | Merge 0.11->trunkMatthew Wild2019-02-041-3/+3
|\|
| * MUC: Add error message to error bounces when not joined to roomMatthew Wild2019-02-041-3/+3
* | Merge 0.11->trunkKim Alvefur2019-01-283-11/+53
|\|
| * mod_pubsub: Support requests for multiple items (fixes #1305)Kim Alvefur2019-01-281-3/+9
| * util.pubsub: Add support for requesting multiple specific items (needed for #...Kim Alvefur2019-01-282-8/+44
* | Merge 0.11->trunkKim Alvefur2019-01-261-23/+79
|\|
| * mod_vcard_legacy: Handle partial migrationKim Alvefur2019-01-261-22/+34
| * mod_vcard_legacy: Allow disabling vcard conversionKim Alvefur2019-01-251-0/+2
| * mod_vcard_legacy: Don't overwrite existing PEP dataKim Alvefur2019-01-251-1/+8
| * mod_vcard_legacy: Add some missing semicolonsKim Alvefur2019-01-251-2/+2
| * mod_vcard_legacy: Upgrade vcard-temp on login (fixes #1289)Kim Alvefur2019-01-101-4/+18
| * mod_vcard_legacy: Adapt node defaults to number of avatarsKim Alvefur2019-01-111-2/+10
| * mod_vcard_legacy: Factor out conversion from vcard-temp to 4Kim Alvefur2019-01-111-18/+31
* | GNUmakefile: Stop Prosody in case of failure in integration-testKim Alvefur2019-01-241-2/+3
* | Merge 0.11->trunkKim Alvefur2019-01-220-0/+0
|\|
| * mod_websocket: Log an error if cross_domain_websocket = true is set in a Virt...Kim Alvefur2019-01-221-0/+5
* | 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_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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 02:48:19 +0000