Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge 0.10->trunk | Kim Alvefur | 2017-02-15 | 1 | -8/+7 | |
|\| | ||||||
| * | migrator: Fix missing word | Kim Alvefur | 2017-02-15 | 1 | -1/+1 | |
| | | ||||||
| * | migrator: Fix argument parsing | Kim Alvefur | 2017-02-15 | 1 | -5/+4 | |
| | | ||||||
| * | migrator: Unexpand whitespace | Kim Alvefur | 2017-02-15 | 1 | -2/+2 | |
| | | ||||||
* | | Merge 0.10->trunk | Kim Alvefur | 2017-02-04 | 5 | -25/+23 | |
|\| | ||||||
| * | tools/migration/migrator/*: Remove use of module() | Kim Alvefur | 2017-02-02 | 4 | -15/+22 | |
| | | ||||||
| * | migrator: Remove wrapper around envloadfile since envloadfile does the right ↵ | Kim Alvefur | 2017-02-02 | 1 | -10/+1 | |
| | | | | | | | | thing in a compatible way | |||||
* | | Merge 0.10->trunk | Kim Alvefur | 2017-01-09 | 1 | -2/+2 | |
|\| | ||||||
| * | tools/erlparse: Remove use of deprecated module() function | Kim Alvefur | 2017-01-09 | 1 | -2/+2 | |
| | | ||||||
* | | Merge 0.10->trunk | Kim Alvefur | 2016-08-18 | 1 | -28/+24 | |
|\| | ||||||
| * | ejabberdsql2prosody: rename variable 't' to prevent shadowing upvalues ↵ | Anton Shestakov | 2016-08-12 | 1 | -9/+9 | |
| | | | | | | | | | | | | [luacheck] Let's make the result of parseFile() have a more descriptive name. | |||||
| * | ejabberdsql2prosody: rename variable 'host' to prevent shadowing upvalue ↵ | Anton Shestakov | 2016-08-12 | 1 | -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 Shestakov | 2016-08-12 | 1 | -6/+6 | |
| | | ||||||
| * | ejabberdsql2prosody: remove unused function pushback() [luacheck] | Anton Shestakov | 2016-08-12 | 1 | -4/+0 | |
| | | | | | | | | The same function seems to exist in tools/erlparse.lua, also unused. | |||||
* | | Update every link to the documentation to use HTTPS | Emmanuel Gil Peyrot | 2016-04-16 | 1 | -1/+1 | |
|/ | ||||||
* | Merge 0.9->0.10 | Kim Alvefur | 2015-09-25 | 1 | -3/+3 | |
|\ | ||||||
| * | xep227toprosody: Pass parser to callbacks (needed since addition of stanza ↵ | Kim Alvefur | 2015-09-18 | 1 | -3/+3 | |
| | | | | | | | | size limits) | |||||
* | | Merge 0.9->0.10 | Kim Alvefur | 2015-08-26 | 1 | -1/+16 | |
|\| | ||||||
| * | ejabberd2prosody: Support password stored as SCRAM hashes | Kim Alvefur | 2015-08-20 | 1 | -1/+16 | |
| | | ||||||
* | | Merge 0.9->0.10 | Kim Alvefur | 2015-02-21 | 1 | -3/+3 | |
|\| | ||||||
| * | configure, Makefile: Add --libdir option to ./configure, allowing you to ↵ | Matthew Wild | 2015-02-20 | 1 | -3/+3 | |
| | | | | | | | | override the $PREFIX/lib/ default. Fixes #470. | |||||
* | | Merge 0.9->0.10 | Kim Alvefur | 2014-06-21 | 1 | -14/+13 | |
|\| | ||||||
| * | tools/ejabberd2prosody.lua: Fix JID building, node-less jids became ↵ | Kim Alvefur | 2014-06-17 | 1 | -14/+13 | |
| | | | | | | | | @hostname in some cases | |||||
* | | Merge 0.9->0.10 | Kim Alvefur | 2014-04-23 | 1 | -1/+1 | |
|\| | ||||||
| * | tools/jabberd14sql2prosody: Fix package.path (thanks daurnimator) | Kim Alvefur | 2014-04-22 | 1 | -1/+1 | |
| | | ||||||
* | | Merge 0.9->0.10 | Kim Alvefur | 2014-02-26 | 1 | -2/+4 | |
|\| | ||||||
| * | tools/ejabberd2prosody: Don't throw an error if XML CDATA is null ([] in ↵ | Waqas Hussain | 2014-02-18 | 1 | -2/+4 | |
| | | | | | | | | Erlang, instead of a string or being missing). | |||||
* | | Merge 0.9->0.10 | Kim Alvefur | 2014-02-03 | 1 | -1/+1 | |
|\| | ||||||
| * | tools/ejabberd2prosody: Handle new room member format. | Kim Alvefur | 2014-01-27 | 1 | -1/+1 | |
| | | ||||||
* | | Merge 0.9->0.10 | Matthew Wild | 2014-01-21 | 1 | -3/+3 | |
|\| | ||||||
| * | tools/ejabberd2prosody: Disable generating a config, as the format it ↵ | Waqas Hussain | 2014-01-18 | 1 | -2/+2 | |
| | | | | | | | | generates is completely out of date. | |||||
| * | tools/ejabberd2prosody: “xmlelement” can be “xmlel” in newer ↵ | Waqas Hussain | 2014-01-18 | 1 | -1/+1 | |
| | | | | | | | | ejabberd (thanks cr). | |||||
* | | Merge 0.9->0.10 | Matthew Wild | 2014-01-18 | 2 | -10/+75 | |
|\| | ||||||
| * | tools/ejabberd2prosody: Add support for importing MUC rooms. | Waqas Hussain | 2014-01-18 | 1 | -0/+51 | |
| | | ||||||
| * | tools/ejabberdsql2prosody: Skip invalid XML in data, and print out errors. | Waqas Hussain | 2014-01-16 | 1 | -10/+24 | |
| | | ||||||
| * | additional fix for erlparse loading in ejabberd2prosody.lua | Vadim Misbakh-Soloviov | 2013-06-14 | 1 | -0/+1 | |
| | | ||||||
| * | package{,c}path fixes for migration tools | Vadim Misbakh-Soloviov | 2013-06-14 | 5 | -5/+34 | |
| | | ||||||
* | | Merge 0.9->0.10 | Matthew Wild | 2014-01-12 | 1 | -4/+8 | |
|\| | ||||||
| * | tools/migration/migrator/prosody_files: Fix undefined global access of ↵ | Waqas Hussain | 2014-01-03 | 1 | -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 whitespace | Florian Zeitz | 2013-08-09 | 8 | -226/+226 | |
| | | ||||||
* | | additional fix for erlparse loading in ejabberd2prosody.lua | Vadim Misbakh-Soloviov | 2013-06-14 | 1 | -0/+1 | |
| | | ||||||
* | | package{,c}path fixes for migration tools | Vadim Misbakh-Soloviov | 2013-06-14 | 5 | -5/+34 | |
|/ | ||||||
* | tools/migration/Makefile: Apply Lua runtime override (see 53f741a5a73a) | Kim Alvefur | 2013-03-31 | 1 | -1/+2 | |
| | ||||||
* | ejabberd2prosody.lua: Don't make assumptions about file name. | Kim Alvefur | 2013-01-25 | 1 | -2/+2 | |
| | ||||||
* | ejabberd2prosody.lua: Replace util.logger with a dummy before requiring ↵ | Kim Alvefur | 2013-01-24 | 1 | -1/+1 | |
| | | | | util.serialization | |||||
* | tools/migration/migrator/jabberd14: Use util.xml. | Waqas Hussain | 2012-12-03 | 1 | -50/+1 | |
| | ||||||
* | tools/openfire2prosody: Use util.xml. | Waqas Hussain | 2012-12-03 | 1 | -51/+1 | |
| | ||||||
* | tools/jabberd14sql2prosody: Use util.xml. | Waqas Hussain | 2012-12-03 | 1 | -50/+1 | |
| | ||||||
* | tools/ejabberdsql2prosody: Use util.xml. | Waqas Hussain | 2012-12-03 | 1 | -52/+1 | |
| | ||||||
* | tools/jabberd14sql2prosody: Initial commit. Accounts, rosters, vCards, ↵ | Waqas Hussain | 2012-08-28 | 1 | -0/+696 | |
| | | | | subscriptions and offline messages supported (thanks halfdan for all the testing). |