Merge 0.9->0.10
[prosody.git] / tools / ejabberd2prosody.lua
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-18 Waqas Hussaintools/ejabberd2prosody: Don't throw an error if XML...
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-27 Kim Alvefurtools/ejabberd2prosody: Handle new room member format.
2014-01-21 Matthew WildMerge 0.9->0.10
2014-01-18 Waqas Hussaintools/ejabberd2prosody: Disable generating a config...
2014-01-18 Waqas Hussaintools/ejabberd2prosody: ?xmlelement? can be ?xmlel...
2014-01-18 Matthew WildMerge 0.9->0.10
2014-01-18 Waqas Hussaintools/ejabberd2prosody: Add support for importing MUC...
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.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-24 Matthew WildMerge 0.9->trunk
2013-08-09 Florian ZeitzRemove all trailing whitespace
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-14 Vadim Misbakh-Soloviovadditional fix for erlparse loading in ejabberd2prosody.lua
2013-06-14 Vadim Misbakh-Soloviovadditional fix for erlparse loading in ejabberd2prosody.lua
2013-06-14 Vadim Misbakh-Soloviovpackage{,c}path fixes for migration tools
2013-06-14 Vadim Misbakh-Soloviovpackage{,c}path fixes for migration tools
2013-05-01 Matthew WildMerge tls branch
2013-05-01 Matthew WildMerge s2s branch
2013-05-01 Matthew WildMerge sasl branch
2013-02-03 Kim AlvefurMerge 0.9->trunk
2013-01-24 Kim Alvefurejabberd2prosody.lua: Don't make assumptions about...
2013-01-24 Kim Alvefurejabberd2prosody.lua: Replace util.logger with a dummy...
2012-07-28 Matthew WildMerge with Florob
2012-06-09 Florian Zeitzmod_admin_telnet, prosody, prosodyctl, ejabberd2prosody...
2011-09-17 Waqas Hussainejabberd2prosody: Added a lot more type checks to ensur...
2011-08-26 Waqas Hussainejabberd2prosody: Add support for privacy lists.
2010-05-21 Matthew WildMerge with backout
2010-05-05 Matthew WildMerge Tobias's fancy SASL branch->trunk
2010-03-25 Matthew WildMerge 0.7->trunk
2010-03-25 Matthew Wildtools/ejabberd2prosody: Create prosody singleton so...
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-03 Matthew WildMerge 0.6.2/waqas with 0.6.2/MattJ
2010-02-25 Matthew WildMerge with 0.6
2010-02-21 Matthew WildMerge with 0.7
2010-02-21 Matthew Wildejabberd2prosody: Don't print passwords of imported...
2010-02-21 Matthew Wildejabberd2prosody: Don't print passwords of imported...
2009-11-16 Tobias MarkmannMerge with sasl branch.
2009-09-18 Waqas Hussainejabberd2prosody: Fixed a problem with null roster...
2009-09-17 Waqas Hussainejabberd2prosody: Added support for ask='both' in subsc...
2009-08-20 Matthew WildMerge with 0.5
2009-08-20 Matthew Wildejabberd2prosody: More intelligent searching for erlpar...
2009-07-22 Matthew WildMerge with 0.5
2009-07-21 Matthew Wildejabberd2prosody, erlparse.lua: Convert from Windows...
2009-07-21 Matthew Wildejabberd2prosody, erlparse.lua: Convert from Windows...
2009-07-10 Matthew WildRemove version number from copyright headers
2009-05-05 Waqas Hussaintools/ejabberd2prosody: Fixed private storage export
2009-05-05 Waqas Hussaintools/ejabberd2prosody: Fixed private storage export
2009-03-20 Matthew WildMerge
2009-03-20 Matthew Wild0.3->0.4
2009-01-30 Matthew WildUpdate copyright notices for 2009
2009-01-30 Matthew Wild0.2->0.3
2009-01-30 Matthew WildGPL->MIT!
2009-01-29 Matthew WildAutomated merge with http://waqas.ath.cx:8000/
2009-01-29 Waqas Hussaintools/ejabberd2prosody: Support for pending-in roster...
2008-12-25 Matthew WildAutomated merge with http://waqas.ath.cx:8000/
2008-12-25 Waqas HussainMoved directory auto-creation to datamanager
next