aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* util.vcard: Turn PHOTO fields into data-urisKim Alvefur2014-09-101-1/+5
* Merge 0.10->trunkMatthew Wild2014-09-053-49/+354
|\
| * Merge with FlorobMatthew Wild2014-09-050-0/+0
| |\
| * | mod_websocket: Initial commit (based on the prosody-modules version)Florian Zeitz2014-09-051-0/+301
| * | Check Sec-WebSocket-Protocol headerFlorian Zeitz2014-09-051-5/+10
| * | net/websocket: Add new websocket client codedaurnimator2014-09-032-0/+459
* | | plugins/muc: Add affiliation_notify config option to send out status code 101daurnimator2014-09-052-0/+68
* | | plugins/muc/muc.lib: Add muc-set-affiliation eventdaurnimator2014-09-051-0/+11
* | | plugins/muc/muc.lib: Use get_affilation() inside of set_affiliation(), so tha...daurnimator2014-09-051-3/+2
* | | plugins/muc/muc.lib: Add instant room supportdaurnimator2014-09-051-4/+9
* | | Merge 0.10->trunkMatthew Wild2014-09-052-0/+460
|\ \ \ | | |/ | |/|
| * | net/websocket: Add new websocket client codedaurnimator2014-09-032-0/+460
| |/
* | Merge 0.10->trunkMatthew Wild2014-09-031-1/+5
|\|
| * Merge 0.9->0.10Matthew Wild2014-09-031-1/+5
| |\
| | * net.http.parser: Support status code 101 and allow handling of the received d...Matthew Wild2014-09-031-1/+5
* | | Merge 0.10->trunkKim Alvefur2014-09-031-2/+2
|\| |
| * | util.hex: Use locals!Kim Alvefur2014-09-031-2/+2
* | | Merge 0.10->trunkKim Alvefur2014-09-0214-78/+159
|\| |
| * | Merge 0.9->0.10Kim Alvefur2014-09-029-9/+43
| |\|
| | * net.server_select: 'listener'->'listeners' (fixes undefined global access)Matthew Wild2014-09-021-1/+1
| | * net.http, net.http.server, mod_c2s, mod_s2s, mod_component, mod_admin_telnet,...Matthew Wild2014-08-297-1/+26
| | * net.server_{select,event}: Add 'ondetach' callback for listener objects, to n...Matthew Wild2014-08-292-2/+13
| | * mod_s2s: Close offending s2s streams missing an 'id' attribute with a stream ...Kim Alvefur2014-09-021-2/+5
| * | util.uuid: Use util.hex and util.randomMatthew Wild2014-09-021-31/+13
| * | util.random: Generic util lib for generating strings of random bytesMatthew Wild2014-09-021-0/+43
| * | util.hex: Small util lib for converting to/from hex stringsMatthew Wild2014-09-021-0/+19
| * | mod_dialback: Move d-w-d after to/from validationKim Alvefur2014-09-011-9/+9
| * | mod_s2s_auth_certs: Warn about lack of certificate (Mostly jabberd14 not send...Kim Alvefur2014-08-291-29/+32
* | | mod_muc: Fix 'destroy rooms' adhoc command (Thanks Florob)Kim Alvefur2014-08-311-1/+1
* | | Merge 0.10->trunkMatthew Wild2014-08-280-0/+0
|\| |
| * | Merge 0.9->0.10Matthew Wild2014-08-280-0/+0
| |\|
| | * Tagging 0.9.5Matthew Wild2014-08-280-0/+0
* | | Merge 0.10->trunkMatthew Wild2014-08-2810-21/+37
|\| |
| * | Merge 0.9->0.10Matthew Wild2014-08-2810-20/+36
| |\|
| | * util.filters: Ignore filters being added twice (fixes issues on removal)0.9.5Matthew Wild2014-08-281-0/+2
| | * mod_privacy: Fix to correctly sort privacy list rules by order (thanks Flow)Matthew Wild2014-08-281-1/+1
| | * mod_c2s, mod_s2s: Log received invalid stream headersMatthew Wild2014-08-232-1/+2
| | * util.xmppstream: When error is 'no-stream', pass the received tagname to the ...Matthew Wild2014-08-231-1/+1
| | * mod_s2s: Reset stream ID when resetting stream [compliance]Kim Alvefur2014-08-271-0/+1
| | * modulemanager: Reduce warning to debug level message about modules already be...Kim Alvefur2014-08-271-1/+1
| | * net.http.server: Comment out a log messageKim Alvefur2014-08-271-1/+1
| | * mod_s2s: Mark stream as opened earlier for outgoing connections, fixes double...Kim Alvefur2014-08-261-1/+2
| | * mod_compression: Handle compression setup errors by logging a warning about i...Kim Alvefur2014-08-261-0/+6
| | * mod_posix: Make sure that 'pidfile' is a stringKim Alvefur2014-08-261-1/+1
| | * prosodyctl: Verify that 'pidfile' is a string, show friendly error otherwiseKim Alvefur2014-08-262-0/+5
| * | util.xmppstream: Don't include empty stream ID in stream header (got here fro...Kim Alvefur2014-08-271-1/+1
* | | Merge 0.10->trunkKim Alvefur2014-08-131-6/+6
|\| |
| * | mod_private: Fix traceback due to missing table indexKim Alvefur2014-08-131-1/+1
| * | mod_blocklist: Use full word as variable name, we can afford thatKim Alvefur2014-08-121-4/+4
| * | mod_blocklist: Correct commentKim Alvefur2014-08-121-1/+1