aboutsummaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.10->trunkKim Alvefur2017-01-091-2/+2
|\
| * tools/erlparse: Remove use of deprecated module() functionKim Alvefur2017-01-091-2/+2
| |
* | Merge 0.10->trunkKim Alvefur2016-08-181-28/+24
|\|
| * ejabberdsql2prosody: rename variable 't' to prevent shadowing upvalues ↵Anton Shestakov2016-08-121-9/+9
| | | | | | | | | | | | [luacheck] Let's make the result of parseFile() have a more descriptive name.
| * ejabberdsql2prosody: rename variable 'host' to prevent shadowing upvalue ↵Anton Shestakov2016-08-121-15/+15
| | | | | | | | | | | | | | | | | | | | | | [luacheck] Functions roster(), roster_pending(), roster_group(), private_storage() and offline_msg() have argument named "host", which used to shadow upvalue of this variable before this change. Instead of renaming this argument, let's rename the variable to match what the script says in usage: Usage: ejabberdsql2prosody.lua filename.txt hostname
| * ejabberdsql2prosody: remove unused one-letter loop variables [luacheck]Anton Shestakov2016-08-121-6/+6
| |
| * ejabberdsql2prosody: remove unused function pushback() [luacheck]Anton Shestakov2016-08-121-4/+0
| | | | | | | | The same function seems to exist in tools/erlparse.lua, also unused.
* | Update every link to the documentation to use HTTPSEmmanuel Gil Peyrot2016-04-161-1/+1
|/
* Merge 0.9->0.10Kim Alvefur2015-09-251-3/+3
|\
| * xep227toprosody: Pass parser to callbacks (needed since addition of stanza ↵Kim Alvefur2015-09-181-3/+3
| | | | | | | | size limits)
* | Merge 0.9->0.10Kim Alvefur2015-08-261-1/+16
|\|
| * ejabberd2prosody: Support password stored as SCRAM hashesKim Alvefur2015-08-201-1/+16
| |
* | Merge 0.9->0.10Kim Alvefur2015-02-211-3/+3
|\|
| * configure, Makefile: Add --libdir option to ./configure, allowing you to ↵Matthew Wild2015-02-201-3/+3
| | | | | | | | override the $PREFIX/lib/ default. Fixes #470.
* | Merge 0.9->0.10Kim Alvefur2014-06-211-14/+13
|\|
| * tools/ejabberd2prosody.lua: Fix JID building, node-less jids became ↵Kim Alvefur2014-06-171-14/+13
| | | | | | | | @hostname in some cases
* | Merge 0.9->0.10Kim Alvefur2014-04-231-1/+1
|\|
| * tools/jabberd14sql2prosody: Fix package.path (thanks daurnimator)Kim Alvefur2014-04-221-1/+1
| |
* | Merge 0.9->0.10Kim Alvefur2014-02-261-2/+4
|\|
| * tools/ejabberd2prosody: Don't throw an error if XML CDATA is null ([] in ↵Waqas Hussain2014-02-181-2/+4
| | | | | | | | Erlang, instead of a string or being missing).
* | Merge 0.9->0.10Kim Alvefur2014-02-031-1/+1
|\|
| * tools/ejabberd2prosody: Handle new room member format.Kim Alvefur2014-01-271-1/+1
| |
* | Merge 0.9->0.10Matthew Wild2014-01-211-3/+3
|\|
| * tools/ejabberd2prosody: Disable generating a config, as the format it ↵Waqas Hussain2014-01-181-2/+2
| | | | | | | | generates is completely out of date.
| * tools/ejabberd2prosody: “xmlelement” can be “xmlel” in newer ↵Waqas Hussain2014-01-181-1/+1
| | | | | | | | ejabberd (thanks cr).
* | Merge 0.9->0.10Matthew Wild2014-01-182-10/+75
|\|
| * tools/ejabberd2prosody: Add support for importing MUC rooms.Waqas Hussain2014-01-181-0/+51
| |
| * tools/ejabberdsql2prosody: Skip invalid XML in data, and print out errors.Waqas Hussain2014-01-161-10/+24
| |
| * additional fix for erlparse loading in ejabberd2prosody.luaVadim Misbakh-Soloviov2013-06-141-0/+1
| |
| * package{,c}path fixes for migration toolsVadim Misbakh-Soloviov2013-06-145-5/+34
| |
* | Merge 0.9->0.10Matthew Wild2014-01-121-4/+8
|\|
| * tools/migration/migrator/prosody_files: Fix undefined global access of ↵Waqas Hussain2014-01-031-4/+8
| | | | | | | | ‘error’, print the actual error message and correct file path in the error message when we fail to load a file, skip broken files instead of failing migration.
* | Remove all trailing whitespaceFlorian Zeitz2013-08-098-226/+226
| |
* | additional fix for erlparse loading in ejabberd2prosody.luaVadim Misbakh-Soloviov2013-06-141-0/+1
| |
* | package{,c}path fixes for migration toolsVadim Misbakh-Soloviov2013-06-145-5/+34
|/
* tools/migration/Makefile: Apply Lua runtime override (see 53f741a5a73a)Kim Alvefur2013-03-311-1/+2
|
* ejabberd2prosody.lua: Don't make assumptions about file name.Kim Alvefur2013-01-251-2/+2
|
* ejabberd2prosody.lua: Replace util.logger with a dummy before requiring ↵Kim Alvefur2013-01-241-1/+1
| | | | util.serialization
* tools/migration/migrator/jabberd14: Use util.xml.Waqas Hussain2012-12-031-50/+1
|
* tools/openfire2prosody: Use util.xml.Waqas Hussain2012-12-031-51/+1
|
* tools/jabberd14sql2prosody: Use util.xml.Waqas Hussain2012-12-031-50/+1
|
* tools/ejabberdsql2prosody: Use util.xml.Waqas Hussain2012-12-031-52/+1
|
* tools/jabberd14sql2prosody: Initial commit. Accounts, rosters, vCards, ↵Waqas Hussain2012-08-281-0/+696
| | | | subscriptions and offline messages supported (thanks halfdan for all the testing).
* Merge 0.9->trunkMatthew Wild2012-08-261-0/+153
|\
| * tools/openfire2prosody: Initial commit.Waqas Hussain2012-08-111-0/+153
| |
* | tools/xep227toprosody.lua: Update childtags calls, replace some with ipairsKim Alvefur2012-08-211-6/+6
|/
* tools/erlparse: Handle decimal point in numbers.Waqas Hussain2012-08-041-0/+6
|
* tools/erlparse: Fix erlang string escape sequences.Waqas Hussain2012-08-041-1/+1
|
* mod_admin_telnet, prosody, prosodyctl, ejabberd2prosody: Don't depend on ↵Florian Zeitz2012-06-091-1/+1
| | | | modules setting globals
* Eliminate direct setfenv usageFlorian Zeitz2012-06-082-14/+11
|