Merge 0.10->trunk
[prosody.git] / prosody.cfg.lua.dist
2013-12-16 Matthew WildMerge 0.9->0.10
2013-12-13 Matthew WildMerge 0.9->0.10
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-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-29 Matthew Wildprosody.cfg.lua.dist: Set c2s_require_encryption =...
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 0.9->trunk
2013-06-13 Matthew WildMerge 0.9->trunk
2013-06-13 Matthew WildMerge 0.9->trunk
2013-06-12 Matthew WildMerge 0.9->trunk
2013-06-12 Matthew WildMerge 0.9->trunk
2013-06-11 Matthew WildMerge 0.9->trunk
2013-06-10 Kim AlvefurMerge 0.9->trunk
2013-06-09 Kim AlvefurMerge 0.9->trunk
2013-06-07 Matthew WildMerge 0.9->trunk
2013-06-05 Matthew WildMerge 0.9->trunk
2013-06-02 Kim AlvefurMerge 0.9->trunk
2013-05-26 Kim AlvefurMerge 0.9->trunk
2013-05-26 Kim AlvefurMerge 0.9->trunk
2013-05-24 Matthew Wildprosody.cfg.lua: Remove some more sneaky ';' characters...
2013-05-24 Matthew Wildprosody.cfg.lua.dist: Remove unnecessary ';' from defau...
2013-05-22 Matthew WildMerge 0.9->trunk
2013-05-21 Matthew Wildprosody.cfg.lua.dist: Suggest 'prosodyctl check config...
2013-05-11 Matthew WildMerge merge merge merge
2013-05-11 Matthew WildMerge 0.9->trunk
2013-05-11 Matthew Wildprosody.cfg.lua.dist: Fix my s2s_secure(_auth) mess
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-03 Matthew WildMerge 0.9->trunk
2013-04-01 Matthew Wildprosody.cfg.lua.dist: Update with new options and comments
2013-01-22 Waqas HussainMerge 0.9->trunk
2013-01-08 Kim Alvefurprosodyctl, prosody.cfg.lua.dist, certs/Makefile: Use...
2012-05-11 Matthew WildMerge with backout
2012-04-28 Matthew Wildprosody.cfg.lua.dist: Rename mod_httpserver to mod_http...
2012-04-24 Matthew WildMerge timber->trunk - thanks everyone!
2012-02-08 Matthew WildMerge with 0.9
2012-01-22 Matthew WildMerge with trunk
2012-01-31 Matthew Wildprosody.cfg.lua.dist: Comment mod_legacyauth by default...
2010-12-21 Matthew Wildprosody.cfg.lua.dist: Add note about external gateways
2010-12-21 Matthew Wildprosody.cfg.lua.dist: Add note about external gateways
2010-12-21 Matthew Wildprosody.cfg.lua.dist: Update for new logging config...
2010-12-21 Matthew Wildprosody.cfg.lua.dist: Update for new logging config...
2010-12-17 Matthew Wildprosody.cfg.lua.dist: Update to reflect new mod_admin_...
2011-06-02 Matthew WildMerge 0.7->0.8
2011-06-02 Matthew WildMerge 0.6->0.7
2011-06-01 Matthew WildMerge 0.7->0.8
2011-06-01 Matthew WildMerge 0.7->0.8
2011-04-05 Matthew WildMerge 0.8->trunk
2011-04-05 Matthew Wildprosody.cfg.lua.dist: Add example of 'authentication...
2011-01-07 Matthew WildMerge 0.8->trunk
2011-01-07 Matthew Wildprosody.cfg.lua: Give example for logging to console
2011-01-07 Matthew Wildprosody.cfg.lua: Improve comment about enabling debug...
2011-01-07 Matthew Wildprosody.cfg.lua: Add mod_offline to the list of modules...
2011-01-07 Matthew WildMerge 0.8->trunk
2011-01-07 Matthew Wildprosody.cfg.lua.dist: Update to include storage configu...
2011-01-07 Matthew Wildprosody.cfg.lua.dist: Add note about the require_encryp...
2011-01-07 Matthew Wildprosody.cfg.lua.dist: Add motd plugin
2010-09-13 Matthew Wildprosody.cfg.lua.dist: Small wording fix in comment...
2010-09-05 Matthew Wildprosody.cfg.lua.dist: Add mod_adhoc and mod_admin_adhoc...
2010-07-31 Waqas Hussainprosody.cfg.lua.dist: Fixed trailing whitespace.
2010-06-15 Waqas Hussainprosody.cfg.lua.dist: Removed commented "defaultauth...
2010-06-04 Matthew WildMerge trunk/MattJ with trunk
2010-05-27 Jeff MitchellHave defaultauth load by default
2010-05-21 Matthew WildMerge with backout
2010-05-07 Waqas HussainMerge 0.6->0.7
2010-05-06 Waqas HussainMerge 0.6->0.7
next