Merge with backout
[prosody.git] / prosody
2010-05-21 Matthew WildMerge with backout
2010-05-18 Matthew WildMerge 0.7->trunk
2010-05-18 Matthew WildMerge 0.6->0.7
2010-05-17 Matthew WildMerge 0.7->trunk
2010-05-17 Matthew WildMerge 0.6->0.7
2010-05-17 Matthew WildMerge 0.7->trunk
2010-05-17 Matthew WildMerge 0.7/MattJ with 0.7
2010-05-17 Matthew WildMerge with 0.6
2010-05-09 Matthew Wildprosody: Load util.xmppstream :(
2010-05-07 Waqas HussainMerge 0.7->trunk
2010-05-07 Waqas HussainMerge 0.6->0.7
2010-05-07 Waqas Hussainprosody: Modified function metatable for better string...
2010-05-07 Waqas Hussainprosody: Lowered log level for a log message.
2010-05-06 Waqas HussainMerge 0.7->trunk
2010-05-06 Waqas HussainMerge 0.6->0.7
2010-05-05 Matthew WildMerge Tobias's fancy SASL branch->trunk
2010-05-04 Matthew Wildeventmanager, prosody: Adapt eventmanager to use prosod...
2010-05-04 Matthew WildMerge 0.7->trunk (with MUC needing checking, waqas)
2010-05-01 Waqas HussainMerge 0.6 into 0.7.
2010-04-19 Waqas Hussainprosody: Set metatable on functions to allow easy acces...
2010-04-09 Matthew WildMerge 0.7->trunk
2010-04-09 Matthew WildMerge 0.6->0.7
2010-04-03 Matthew WildMerge 0.7->trunk
2010-04-03 Matthew WildMerge 0.6->0.7
2010-03-30 Matthew WildMerge 0.7/waqas->0.7/MattJ
2010-03-30 Matthew WildMerge 0.6->0.7
2010-03-24 Matthew WildMerge 0.7->trunk
2010-03-24 Matthew WildMerge 0.7->trunk
2010-03-24 Matthew WildMerge 0.7/waqas->0.7/MattJ
2010-03-24 Matthew WildMerge 0.6->0.7
2010-03-22 Matthew WildMerge 0.7->trunk
2010-03-22 Matthew WildMerge 0.6->0.7
2010-03-22 Matthew WildUpdate copyright headers for 2010
2010-03-18 Matthew WildMerge 0.7->trunk
2010-03-18 Matthew WildMerge 0.7->trunk
2010-03-18 Matthew WildMerge 0.6->0.7
2010-03-17 Matthew WildMerge with 0.7
2010-03-17 Matthew WildMerge ... 0.6 (into 0.7, namely mod_compression fixes)
2010-03-15 Matthew WildMerge with 0.7 (and indirectly 0.6.2)
2010-03-12 Tobias MarkmannMerge with tip.
2010-03-03 Matthew WildMerge 0.6.2/waqas with 0.6.2/MattJ
2010-03-03 Matthew WildMerge 0.6.2/waqas with 0.6.2/MattJ
2010-03-01 Matthew WildMerge with 0.7
2010-03-01 Matthew WildMerge with 0.7
2010-03-01 Matthew WildMerge with 0.7
2010-03-01 Matthew WildMerge with 0.7/waqas
2010-03-01 Matthew WildMerge with 0.7
2010-02-27 Matthew Wildprosody: Bump log message describing current connection...
2010-02-25 Matthew WildMerge with 0.7
2010-02-25 Matthew WildMerge with 0.6
2010-02-15 Waqas Hussainprosody: Don't add fallbacks to package.path and packag...
2010-02-13 Matthew Wildprosody: More accurate friendly error message in the...
2010-02-13 Matthew Wildprosody: Use certmanager to create the global SSL context
2010-02-11 Matthew Wildprosody, prosodyctl: Re-jiggle load order again, fixes...
2010-02-05 Matthew WildMerge with backout
2010-02-05 Matthew Wildprosody: Add a catch-all friendly message for when...
2010-02-05 Matthew Wildprosody: Initialize logging before checking dependencie...
2010-01-31 Matthew Wildprosody: Show friendly error when no config present...
2010-01-31 Matthew Wildprosody: Log error message when failing to open ports
2010-01-31 Matthew Wildprosody: Only set the ssl_ctx for 'ssl' connections
2010-01-28 Matthew Wildprosody: Check dependencies (and load LuaRocks) earlier...
2010-01-28 Matthew Wildutil.dependencies, prosody, prosodyctl: Give util.depen...
2010-01-24 Waqas Hussainprosody: Listen for component connections on port 5347...
2010-01-28 Matthew Wildutil.dependencies: Load luarocks.loader/luarocks.require
2010-01-09 Matthew Wildprosody: net_activate_ports: Accept strings as well...
2010-01-09 Matthew Wildprosody: net_activate_ports: Accept strings as well...
2010-01-09 Matthew Wildprosody: Read list of possible config extensions from...
2009-12-15 Waqas Hussainprosody: Fixed a possible nil concatenation.
2009-12-15 Waqas Hussainprosody: Fixed a possible nil concatenation.
2009-12-15 Paul Aurichprosody: Fix to net_activate_ports to mend binding...
2009-12-10 Waqas Hussainprosody: Added config option 'ssl_ports' to allow multi...
2009-12-10 Waqas Hussainprosody: Use the multiplex listener when the 'ports...
2009-12-10 Waqas Hussainnet_activate_ports: Use the default config option ...
2009-12-09 Waqas Hussainprosody: Call tostring on the key being used for nil...
2009-12-09 Waqas Hussainprosody: Log a warning and traceback, but don't throw...
2009-12-09 Waqas HussainMainfile: Broke up a really long line.
2009-12-08 Matthew Wildprosody: Report the current socket backend in use
2009-12-08 Matthew Wildprosody: Clarify and add some comments to describe...
2009-12-07 Matthew WildMerge with trunk
2009-12-07 Matthew Wildprosody: Less strict matching for the magic 'interrupte...
2009-12-07 Matthew Wildprosody: Less strict matching for the magic 'interrupte...
2009-12-04 Matthew Wildprosody: Expose global_ssl_ctx through prosody object
2009-12-04 Paul AurichDisable SSLv2 by default, it's known to be insecure.
2009-12-04 Paul AurichDisable SSLv2 by default, it's known to be insecure.
2009-11-29 Tobias MarkmannMerge with tip.
2009-11-25 Matthew WildMerge with Tobias's SASL redesign branch
2009-11-23 Matthew WildMerge with trunk
2009-11-23 Matthew WildMerge with 0.6
2009-11-23 Waqas HussainMerged with 0.6.
2009-11-23 Waqas Hussainprosody: Added support for command line argument '...
2009-11-23 Matthew WildMerge with trunk
2009-11-23 Waqas HussainMerged with 0.6.
2009-11-23 Waqas HussainMainfile: Fixed some comments.
2010-02-13 Matthew Wildprosody: More accurate friendly error message in the...
2010-02-05 Matthew Wildprosody: Add a catch-all friendly message for when...
2010-01-31 Matthew Wildprosody: Show friendly error when no config present...
2010-01-31 Matthew Wildprosody: Log error message when failing to open ports
2010-01-24 Waqas Hussainprosody: Listen for component connections on port 5347...
2009-12-09 Waqas Hussainprosody: Call tostring on the key being used for nil...
2009-12-09 Waqas Hussainprosody: Log a warning and traceback, but don't throw...
next