Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.11->trunk | Kim Alvefur | 2019-03-04 | 3 | -2/+55 |
|\ | |||||
| * | mod_muc_mam: Add comment about the tricks done with the 'with' field | Kim Alvefur | 2019-03-04 | 1 | -0/+1 |
| | | |||||
| * | mod_muc_mam: Move a comment to the line it describes | Kim Alvefur | 2019-03-04 | 1 | -1/+1 |
| | | |||||
| * | mod_muc_mam: Strip the stanza 'to' attribute (fixes #1259) | Kim Alvefur | 2019-03-04 | 1 | -0/+2 |
| | | |||||
| * | util.pubsub: Validate node configuration on node creation (fixes #1328) | Kim Alvefur | 2019-03-03 | 2 | -1/+51 |
| | | |||||
* | | mod_muc_mam: Validate that the FORM_TYPE of a query is as expected | Kim Alvefur | 2019-03-04 | 1 | -1/+6 |
| | | |||||
* | | Merge 0.11->trunk | Kim Alvefur | 2019-03-02 | 1 | -1/+2 |
|\| | |||||
| * | mod_storage_memory: Generate ID using standard util (fixes #1326) | Kim Alvefur | 2019-03-02 | 1 | -1/+2 |
| | | | | | | | | | | The previous method relied on tostring(table) returning the pointer address, which might not be portable. | ||||
* | | core.portmanager: Reduce scope of variable | Kim Alvefur | 2018-10-10 | 1 | -2/+2 |
| | | | | | | | | | | Not sure why it was all the way out there, seems like there would have been unexpected behaviour from that | ||||
* | | core.portmanager: Use server.listen API | Kim Alvefur | 2018-09-13 | 1 | -1/+5 |
| | | |||||
* | | net.server: New API for creating server listeners | Kim Alvefur | 2018-09-13 | 3 | -18/+52 |
| | | | | | | | | server.listen(interface, port, listeners, options); | ||||
* | | Merge 0.11->trunk | Kim Alvefur | 2019-02-27 | 2 | -31/+253 |
|\| | |||||
| * | spec: Add test case for #1322 | Kim Alvefur | 2019-02-27 | 1 | -0/+202 |
| | | |||||
| * | mod_storage_memory: Replace query function with one based on ↵ | Kim Alvefur | 2019-02-27 | 1 | -31/+51 |
| | | | | | | | | | | | | | | storage_internal (fixes #1322) The :find method in storage_internal works and is easier to read and understand. Future changes should be simpler to apply to both modules. | ||||
* | | MUC: Fire an event to allow affecting decision of whether to allow a role change | Kim Alvefur | 2019-02-24 | 1 | -0/+12 |
| | | |||||
* | | MUC: Factor out role change permission check into its own method | Kim Alvefur | 2019-02-24 | 1 | -18/+27 |
| | | | | | | | | | | | | I would like to invert this logic so that it checks if the role change is allowed instead of checking if it is not allowed as it does now, in order to make it easier to understand. | ||||
* | | Merge 0.11->trunk | Kim Alvefur | 2019-02-22 | 2 | -2/+6 |
|\| | |||||
| * | mod_pubsub: Simplify configuration for node data (see #1302) | Kim Alvefur | 2019-02-22 | 1 | -1/+3 |
| | | |||||
| * | mod_pep: Simplify configuration for node data (fixes #1320) | Kim Alvefur | 2019-02-22 | 1 | -1/+3 |
| | | |||||
* | | prosodyctl: about: Report the current operating system according to uname | Kim Alvefur | 2018-12-08 | 1 | -0/+7 |
| | | |||||
* | | net.server_epoll: Increase send_timeout to 3 minutes (to match server_event) | Kim Alvefur | 2019-02-09 | 1 | -1/+1 |
| | | | | | | | | The separate connect_timeout means we can afford a longer send_timeout | ||||
* | | net.server_epoll: Separate timeout for initial connection attempts | Kim Alvefur | 2019-02-09 | 1 | -1/+4 |
| | | | | | | | | server_event has this separation already | ||||
* | | Merge 0.11->trunk | Kim Alvefur | 2019-02-09 | 1 | -5/+5 |
|\| | |||||
| * | net.server_epoll: Rename handshake_timeout to ssl_handshake_timeout (fixes ↵ | Kim Alvefur | 2019-02-09 | 1 | -3/+3 |
| | | | | | | | | | | | | #1319) This is to match server_event, see 430797a8fc81 | ||||
| * | net.server_epoll: Use send_timeout for write timout like other ↵ | Kim Alvefur | 2019-02-07 | 1 | -2/+2 |
| | | | | | | | | implementations (fixes #1316) | ||||
* | | Merge 0.11->trunk | Matthew Wild | 2019-02-04 | 1 | -3/+3 |
|\| | |||||
| * | MUC: Add error message to error bounces when not joined to room | Matthew Wild | 2019-02-04 | 1 | -3/+3 |
| | | |||||
* | | Merge 0.11->trunk | Kim Alvefur | 2019-01-28 | 3 | -11/+53 |
|\| | |||||
| * | mod_pubsub: Support requests for multiple items (fixes #1305) | Kim Alvefur | 2019-01-28 | 1 | -3/+9 |
| | | |||||
| * | util.pubsub: Add support for requesting multiple specific items (needed for ↵ | Kim Alvefur | 2019-01-28 | 2 | -8/+44 |
| | | | | | | | | #1305) | ||||
* | | Merge 0.11->trunk | Kim Alvefur | 2019-01-26 | 1 | -23/+79 |
|\| | |||||
| * | mod_vcard_legacy: Handle partial migration | Kim Alvefur | 2019-01-26 | 1 | -22/+34 |
| | | | | | | | | | | Eg in case the user already published an avatar, migrate only the vcard, and vice versa. | ||||
| * | mod_vcard_legacy: Allow disabling vcard conversion | Kim Alvefur | 2019-01-25 | 1 | -0/+2 |
| | | | | | | | | Once everyone has been migrated it might be nice to skip these checks | ||||
| * | mod_vcard_legacy: Don't overwrite existing PEP data | Kim Alvefur | 2019-01-25 | 1 | -1/+8 |
| | | |||||
| * | mod_vcard_legacy: Add some missing semicolons | Kim Alvefur | 2019-01-25 | 1 | -2/+2 |
| | | |||||
| * | mod_vcard_legacy: Upgrade vcard-temp on login (fixes #1289) | Kim Alvefur | 2019-01-10 | 1 | -4/+18 |
| | | |||||
| * | mod_vcard_legacy: Adapt node defaults to number of avatars | Kim Alvefur | 2019-01-11 | 1 | -2/+10 |
| | | |||||
| * | mod_vcard_legacy: Factor out conversion from vcard-temp to 4 | Kim Alvefur | 2019-01-11 | 1 | -18/+31 |
| | | |||||
* | | GNUmakefile: Stop Prosody in case of failure in integration-test | Kim Alvefur | 2019-01-24 | 1 | -2/+3 |
| | | | | | | | | | | | | Normally make skips the remaning steps in the rule if one fails. This collects the status code and re-returns it after stopping the running Prosody instance. | ||||
* | | Merge 0.11->trunk | Kim Alvefur | 2019-01-22 | 0 | -0/+0 |
|\| | |||||
| * | mod_websocket: Log an error if cross_domain_websocket = true is set in a ↵ | Kim Alvefur | 2019-01-22 | 1 | -0/+5 |
| | | | | | | | | VirtualHost section | ||||
* | | core.statsmanager: Do a final collection on shutdown | Kim Alvefur | 2019-01-22 | 1 | -0/+1 |
| | | |||||
* | | TODO: Remove statistics since this was done in 0.10 | Kim Alvefur | 2019-01-21 | 1 | -1/+0 |
| | | |||||
* | | mod_mam: Fix operator precedence (thanks mimi89999) | Kim Alvefur | 2019-01-20 | 1 | -1/+1 |
| | | |||||
* | | Merge 0.11->trunk | Kim Alvefur | 2019-01-19 | 0 | -0/+0 |
|\| | |||||
| * | mod_websocket: Include the value of cross_domain_websocket in debug message | Kim Alvefur | 2019-01-18 | 1 | -1/+1 |
| | | |||||
* | | mod_bosh, mod_websocket: Remove accidentally included dependency on ↵ | Kim Alvefur | 2019-01-19 | 2 | -2/+0 |
| | | | | | | | | non-existant module | ||||
* | | prosodyctl: Fix module.command invocation (thanks woffs) | Kim Alvefur | 2019-01-18 | 1 | -2/+0 |
| | | | | | | | | The first argument is already removed once since c7727c13260f | ||||
* | | mod_http: Determine CORS methods to whitelist from actual methods used | Kim Alvefur | 2019-01-17 | 1 | -2/+9 |
| | | |||||
* | | mod_http: Set up to handle OPTIONS | Kim Alvefur | 2019-01-18 | 1 | -0/+7 |
| | | | | | | | | | | Lower priority to allow http modules to handle it themselves, should they wish to |