Merge 0.10->trunk
[prosody.git] / prosody
2014-04-10 Kim AlvefurMerge 0.10->trunk
2014-04-10 Kim AlvefurMerge 0.9->0.10
2014-04-09 Kim Alvefurprosody: Check dependencies later in the startup sequence
2014-04-02 Matthew WildMerge 0.9->0.10
2014-03-25 Kim AlvefurMerge 0.9->0.10
2014-03-09 Kim AlvefurMerge 0.9->0.10
2014-02-26 Kim AlvefurMerge 0.9->0.10
2014-02-12 Kim AlvefurMerge 0.9 -> 0.10
2014-02-06 Kim AlvefurMerge 0.9->0.10
2014-02-03 Kim AlvefurMerge 0.9->0.10
2014-01-21 Matthew WildMerge 0.9->0.10
2014-01-18 Matthew WildMerge 0.9->0.10
2014-01-12 Matthew WildMerge 0.9->0.10
2013-12-18 Kim AlvefurMerge 0.9->0.10
2013-12-16 Matthew WildMerge 0.9->0.10
2013-12-16 Matthew WildMerge 0.9->0.10
2013-12-13 Matthew WildMerge 0.10->trunk
2013-12-13 Matthew WildMerge 0.9->0.10
2013-12-13 Kim Alvefurprosody: Store the config file name so the same file...
2013-12-11 Matthew WildMerge 0.9->0.10
2013-11-29 Matthew WildMerge 0.9->0.10
2013-11-28 Kim AlvefurMerge 0.9->0.10
2013-11-24 Kim AlvefurMerge 0.9->0.10
2013-11-21 Matthew WildMerge 0.9->0.10
2013-11-12 Matthew WildMerge 0.9->0.10
2013-11-10 Matthew WildMerge 0.9->0.10
2013-11-09 Matthew WildMerge 0.9->0.10
2013-10-31 Kim AlvefurMerge 0.9 -> 0.10
2013-10-10 Matthew WildMerge 0.9->0.10
2013-10-05 Matthew WildMerge 0.9->0.10
2013-09-30 Matthew WildMerge 0.9->0.10
2013-09-21 Kim AlvefurMerge Tobias SCRAM-PLUS work
2013-09-21 Kim AlvefurBackout ae48bf828f21
2013-09-16 Matthew WildMerge 0.9->trunk
2013-09-03 Kim AlvefurMerge 0.9->trunk
2013-09-03 Matthew WildMerge 0.9->trunk
2013-09-02 Matthew WildMerge 0.9->trunk
2013-08-24 Matthew WildMerge 0.9->trunk
2013-08-09 Kim AlvefurMerge 0.9->trunk
2013-08-06 Kim AlvefurMerge 0.9->trunk
2013-07-24 Kim AlvefurMerge 0.9->trunk
2013-07-22 Kim AlvefurMerge 0.9->trunk
2013-07-15 Matthew WildMerge 0.9->trunk
2013-07-15 Matthew WildMerge 0.9->trunk
2013-07-13 Matthew WildMerge 0.9->trunk
2013-07-11 Matthew WildMerge 0.9->trunk
2013-07-10 Kim AlvefurMerge 0.9->trunk
2013-07-08 Matthew WildMerge 0.9->trunk
2013-07-08 Matthew WildMerge 0.9->trunk
2013-06-29 Kim AlvefurMerge 0.9->trunk
2013-06-29 Matthew WildMerge
2013-06-29 Matthew WildMerge 0.9->trunk
2013-06-26 Matthew WildMerge 0.9->trunk
2013-06-24 Matthew WildMerge 0.9->trunk
2013-06-18 Matthew WildMerge 0.9->trunk
2013-06-13 Matthew WildMerge the merge
2013-06-13 Kim Alvefurprosody: Remove global ssl context, no longer used
2013-05-01 Matthew WildMerge tls branch
2013-05-01 Matthew WildMerge s2s branch
2013-05-01 Matthew WildMerge sasl branch
2013-05-01 Matthew WildMerge with Florob
2013-04-05 Matthew WildMerge 0.9->trunk
2013-04-05 Matthew WildMerge with Maranda
2013-04-05 Marco Cirilloprosody: load rostermanager after usermanager during...
2013-03-28 Matthew WildMerge 0.9->trunk
2013-03-23 Kim Alvefurprosody, prosodyctl: Remove last trace of "core" \o/
2013-03-22 Matthew WildMerge 0.9->trunk
2013-03-22 Matthew Wildprosody: Add COMPAT note about globals
2013-03-22 Matthew Wildconfigmanager, hostmanager, prosody: Almost complete...
2013-01-22 Waqas HussainMerge 0.9->trunk
2013-01-09 Kim Alvefurprosodyctl, prosody: Pass the selected config file...
2012-12-28 Kim AlvefurMerge 0.9->trunk
2012-12-28 Kim Alvefurprosody, mod_c2s, mod_s2s: Move closing of c2s and...
2012-09-19 Matthew Wildprosody, prosodyctl: chdir() to data directory on startup
2012-07-28 Matthew WildMerge with Florob
2012-06-09 Florian Zeitzmod_admin_telnet, prosody, prosodyctl, ejabberd2prosody...
2012-06-08 Florian Zeitzprosody: Define a getfenv() replacement for Lua 5.2
2012-05-14 Kim Alvefurprosody, stanza_router: Load stanza_router earlier...
2012-05-11 Matthew WildMerge with backout
2012-04-24 Matthew WildMerge timber->trunk - thanks everyone!
2012-04-24 Matthew Wildprosody: Load portmanager at startup, to ensure it...
2012-04-21 Matthew Wildprosody: Don't require net.httpserver now
2012-01-23 Matthew Wildprosody: sandboxed require(): Point __index of _G at...
2012-01-23 Matthew Wildprosody: Remove connlisteners, and net_activate_ports
2011-11-01 Waqas Hussainprosody: Ensure prosody.paths.config is never nil ...
2011-09-20 Waqas Hussainprosody: Invalid escape sequence in componentmanager...
2011-01-17 Tobias MarkmannRun with own LuaSec.
2010-12-28 Waqas Hussainprosody: Don't add a datamanager callback when anonymou...
2010-12-21 Matthew Wildprosody: Catch a recursive Include error and print...
2010-12-20 Matthew Wildprosody, prosodyctl, util.dependencies: Split checking...
2010-12-17 Matthew WildMerge Tobias->trunk
2010-12-12 Waqas Hussainprosody: Added a comment, to match prosodyctl.
2010-12-12 Waqas Hussainprosody: Added a comment, to match prosodyctl.
2010-12-07 Waqas Hussainprosody: Don't attempt to load core.xmlhandlers in...
2010-12-07 Waqas Hussainprosody: Don't attempt to load core.xmlhandlers in...
2010-12-07 Waqas Hussainprosody: Added a stub implementation of core.componentm...
2010-12-07 Waqas Hussainprosody: Added a stub implementation of core.componentm...
2011-06-15 Florian Zeitzconnlistener, server_select, prosody: Add support for...
2011-06-02 Matthew WildMerge 0.7->0.8
2011-06-02 Matthew WildMerge 0.6->0.7
next