aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | plugins/muc/muc: Rename `handle_invite_to_room` to `handle_mediated_invite`; ↵daurnimator2014-03-181-5/+7
| | | | | | | | | | | | | | | | | | | | clean up logic
| | * | | plugins/muc/muc: Check for mediated invites in a smarter waydaurnimator2014-03-181-7/+11
| | | | |
| | * | | plugins/muc/muc: Add copyright for daurnimatordaurnimator2014-03-181-0/+1
| | | | |
| | * | | plugins/muc/muc.lib: Add disco iq handlers with compatible argument signaturedaurnimator2014-02-211-4/+12
| | | | |
| | * | | plugins/muc/muc.lib: Move all kick code into one placedaurnimator2014-02-211-27/+10
| | | | |
| | * | | plugins/muc/muc.lib: Make use of return values to send service-unavailable ↵daurnimator2014-02-211-11/+15
| | | | | | | | | | | | | | | | | | | | errors
| | * | | plugins/muc/muc.lib: Add some missing return valuesdaurnimator2014-02-211-0/+10
| | | | |
| | * | | plugins/muc/muc.lib: Move (de)construct_stanza_id into `handle_iq_to_occupant`daurnimator2014-02-211-35/+22
| | | | | | | | | | | | | | | | | | | | | | | | | It is the only place they were used; and I left the old function names in as comments. One reason for doing this was to reduce accesses to _occupants; which may be in a database in future revisions
| | * | | plugins/muc/muc.lib: Refactor _to_occupant handlersdaurnimator2014-02-211-53/+46
| | | | |
| | * | | plugins/muc/muc.lib: Split out the room iq handler into functionsdaurnimator2014-02-211-87/+129
| | | | |
| | * | | plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functionsdaurnimator2014-02-201-186/+269
| | | | |
| | * | | plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks ↵daurnimator2014-02-201-156/+186
| | | | | | | | | | | | | | | | | | | | sysko)
| | * | | plugins/muc/muc.lib: Split out `send_history` into `parse_history` and ↵daurnimator2014-02-191-33/+62
| | | | | | | | | | | | | | | | | | | | `get_history`
| | * | | plugins/muc/mod_muc: Move Xep-0307 MUC unique to seperate filedaurnimator2014-02-182-21/+21
| | | | |
* | | | | Merge 0.10->trunkKim Alvefur2014-04-211-8/+9
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | certmanager: Move ssl.protocol handling to after ssl.options is a table ↵Kim Alvefur2014-04-211-8/+9
| | | | | | | | | | | | | | | | | | | | (thanks Ralph)
* | | | | Merge 0.10->trunkKim Alvefur2014-04-204-16/+15
|\| | | |
| * | | | certmanager: Fix traceback if no global 'ssl' section set (thanks albert)Kim Alvefur2014-04-201-1/+3
| | | | |
| * | | | mod_http: Update to disable peer verification with the new certmanagerKim Alvefur2014-04-191-1/+7
| | | | |
| * | | | mod_s2s: Replace open_stream() with function that only adds s2s/dialback ↵Kim Alvefur2014-04-181-14/+2
| | | | | | | | | | | | | | | | | | | | attributes to stream header
| * | | | util.xmppstream: Check for callback that may add stream header attributesKim Alvefur2014-04-181-0/+3
| | | | |
* | | | | Merge 0.10->trunkKim Alvefur2014-04-151-4/+3
|\| | | |
| * | | | net.http.server: Fix some typos introduced in 420c0d3b8583.Daurnimator2014-04-151-4/+3
| | | | |
* | | | | Merge 0.10->trunkKim Alvefur2014-04-151-12/+68
|\| | | |
| * | | | certmanager: Update ssl_compression when config is reloadedKim Alvefur2014-04-151-0/+3
| | | | |
| * | | | certmanager: Reformat core ssl defaultsKim Alvefur2014-04-151-9/+9
| | | | |
| * | | | certmanager: Support ssl.protocol syntax like "tlsv1+" that disables older ↵Kim Alvefur2014-04-151-2/+13
| | | | | | | | | | | | | | | | | | | | protocols
| * | | | certmanager: Merge ssl.options, verify etc from core defaults and global ssl ↵Kim Alvefur2014-04-151-0/+29
| | | | | | | | | | | | | | | | | | | | settings with inheritance while allowing options to be disabled per virtualhost
| * | | | certmanager: Wrap long line and add commentKim Alvefur2014-04-141-1/+5
| | | | |
| * | | | certmanager: Concatenate cipher list if given as a tableKim Alvefur2014-04-141-0/+6
| | | | |
| * | | | certmanager: Allow non-server contexts to be without certificate and keyKim Alvefur2014-04-141-2/+4
| | | | |
| * | | | certmanager: Check for non-nil values instead of true-ish values, allows ↵Kim Alvefur2014-04-141-2/+3
| | | | | | | | | | | | | | | | | | | | removing defaults
* | | | | Merge 0.10->trunkMatthew Wild2014-04-151-9/+17
|\| | | |
| * | | | net.http.server: Add prepare_header() and finish_response() to allow sending ↵Daurnimator2014-04-151-9/+17
| | | | | | | | | | | | | | | | | | | | chunked responses via the API
* | | | | Merge 0.10->trunkKim Alvefur2014-04-101-0/+20
|\| | | |
| * | | | mod_s2s: Revert e626ee2fe106 change, it broke DialbackKim Alvefur2014-04-101-0/+20
| | | | |
* | | | | Merge 0.10->trunkKim Alvefur2014-04-1011-52/+46
|\| | | |
| * | | | Merge 0.9->0.10Kim Alvefur2014-04-103-3/+21
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | prosody: Check dependencies later in the startup sequenceKim Alvefur2014-04-091-3/+7
| | | | |
| | * | | util.dependencies: Check for Lua 5.1. We don't currently support any other ↵Waqas Hussain2014-04-091-0/+8
| | | | | | | | | | | | | | | | | | | | versions. LuaJIT identifies as 5.1.
| | * | | mod_admin_telnet: muc:*: Fix nil index error when a room JID is passed with ↵Matthew Wild2014-04-051-0/+6
| | | | | | | | | | | | | | | | | | | | a non-existent host
| * | | | mod_c2s, mod_s2s, mod_component, util.xmppstream: Move all ↵Kim Alvefur2014-04-104-37/+17
| | | | | | | | | | | | | | | | | | | | session:open_stream() functions to util.xmppstream
| * | | | prosodyctl, util.prosodyctl: Update to reflect that mod_posix gets loaded by ↵Kim Alvefur2014-04-102-3/+7
| | | | | | | | | | | | | | | | | | | | default on posix platforms
| * | | | mod_posix: Remove compat code for 0.5Kim Alvefur2014-04-101-8/+0
| | | | |
| * | | | mod_storage_sql2: Build counter query without ORDER BY clauseKim Alvefur2014-04-081-1/+1
| | | | |
* | | | | Merge 0.10->trunkKim Alvefur2014-04-031-8/+7
|\| | | | | |_|/ / |/| | |
| * | | mod_compression: Only iterate over correctly named and namespaced child tags ↵Kim Alvefur2014-04-031-2/+2
| | | | | | | | | | | | | | | | of compression feature
| * | | mod_compression: Use get_child() and get_child_text()Kim Alvefur2014-04-031-3/+2
| | | |
| * | | mod_compression: Remove checks for impossible conditionsKim Alvefur2014-04-031-3/+3
| | | |
* | | | Merge 0.10->trunkMatthew Wild2014-04-028-15/+101
|\| | |