aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge Zash with Florob and MarandaMatthew Wild2012-02-246-25/+37
|\|
| * mod_s2s: prevent attempting to reconnect when the stream is gracefully closed...Marco Cirillo2012-02-241-2/+2
| * mod_admin_telnet: make service private.Marco Cirillo2012-02-241-0/+1
| * mod_s2s, s2sout.lib: import cert verify and add another fallback method in ca...Marco Cirillo2012-02-242-1/+2
| * s2sout.lib: import utils/functionality once in s2smanager.Florian Zeitz2012-02-241-2/+14
| * mod_s2s: port functionality once in s2smanager.Florian Zeitz2012-02-241-2/+5
| * mod_dialback: import util.hashes and functionality once in s2smanager.Florian Zeitz2012-02-241-7/+23
| * s2smanager: remove send_to_host.Florian Zeitz2012-02-241-4/+1
| * modulemanager: include mod_c2s and mod_s2s into autoloaded modules.Florian Zeitz2012-02-241-1/+1
* | s2sout.lib: Fix wrong variable nameKim Alvefur2012-02-231-1/+1
* | s2sout.lib: Add locals for source interfacesKim Alvefur2012-02-231-0/+3
* | s2sout.lib: Import various util.*Kim Alvefur2012-02-231-0/+6
* | mod_s2s: Attach send function to sessionKim Alvefur2012-02-231-0/+3
* | mod_s2s: Initiate connectionsKim Alvefur2012-02-231-0/+1
* | mod_s2s: Fix typoKim Alvefur2012-02-221-1/+1
* | mod_s2s: Add some missing importsKim Alvefur2012-02-221-0/+3
|/
* net.http, httpclient_listener: Merge listener into net.httpMatthew Wild2012-01-232-71/+47
* xmppserver_listener: RemoveMatthew Wild2012-01-231-209/+0
* s2smanager, mod_s2s, mod_s2s/s2sout: Split connection handling out of s2smana...Matthew Wild2012-01-233-570/+772
* stanza_router: Replace s2s send logic with firing of a 'route/remote' eventMatthew Wild2012-01-231-16/+7
* stanza_router: Remove obsolete commented codeMatthew Wild2012-01-231-5/+0
* sessionmanager: Require uuid_generate()Matthew Wild2012-01-231-0/+1
* mod_c2s: Code reductionMatthew Wild2012-01-231-3/+2
* mod_admin_telnet: Port to portmanagerMatthew Wild2012-01-231-5/+5
* prosody: sandboxed require(): Point __index of _G at current env for modules ...Matthew Wild2012-01-231-1/+5
* sessionmanager, mod_c2s: Move timeout logic to mod_c2sMatthew Wild2012-01-232-10/+11
* prosody: Remove connlisteners, and net_activate_portsMatthew Wild2012-01-231-72/+0
* portmanager: Pass port to friendly_error_message()Matthew Wild2012-01-231-2/+2
* util.iterators: Make a standard library (no longer injects into global namesp...Matthew Wild2012-01-231-11/+14
* util.set: Accept nil to add_list()Matthew Wild2012-01-221-2/+4
* mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream...Matthew Wild2012-01-222-90/+86
* portmanager: One manager to, in the darkness, bind themMatthew Wild2012-01-221-0/+132
* Merge with trunkMatthew Wild2012-01-2230-388/+559
|\
| * mod_admin_telnet: Use module:shared() to expose commands table and default co...Matthew Wild2012-01-221-4/+2
| * moduleapi: Add module:shared(), a way to easily share data between multiple l...Matthew Wild2012-01-221-0/+23
| * moduleapi: Add module:depends(), a way to safely depend upon another module a...Matthew Wild2012-01-221-0/+29
| * modulemanager: load(): Return and use the correct module objectMatthew Wild2012-01-221-2/+2
| * util.helpers: After nearly 'fixing' this code, I conclude it instead only des...Matthew Wild2012-01-221-1/+1
| * modulemanager: Cleanup some unused variables, imports, whitespace and add a c...Matthew Wild2012-01-221-3/+1
| * modulemanager, moduleapi: Replace hooks multitable with an event_handlers map...Matthew Wild2012-01-222-21/+12
| * modulemanager: Drop unnecessary prosody_events localMatthew Wild2012-01-221-3/+1
| * modulemanager: Some reorganisation. Only external change is (should be) that ...Matthew Wild2012-01-221-62/+94
| * modulemanager: Move in-module API functions to core.moduleapi (half the file ...Matthew Wild2012-01-222-212/+240
| * mod_compression: Change default compression level to 7Kim Alvefur2012-01-191-1/+1
| * mod_compression: Use get_option_numberKim Alvefur2012-01-191-5/+1
| * Merge with trunkMatthew Wild2012-01-181-6/+25
| |\
| | * util.json: Added function encode_ordered(object).Waqas Hussain2012-01-181-6/+25
| * | Merge with 0.9Matthew Wild2012-01-181-1/+1
| |\ \
| | * | mod_watchregistrations: Fixed an undefined global access (thanks Medics).Waqas Hussain2011-12-121-1/+1
| | * | prosodyctl: Adjust description of 'reload' command (thanks crocket)Matthew Wild2012-01-171-1/+1