aboutsummaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge 0.10->trunkKim Alvefur2017-04-101-6/+6
|\
| * SQL: Use standard quotes for columns and other identifiers, rewrite to grave ↵Kim Alvefur2017-04-101-6/+6
| | | | | | | | accents for MySQL only (fixes #885)
* | Merge 0.10->trunkKim Alvefur2017-04-091-1/+1
|\|
| * migration/prosody_sql: Commit transaction when all items have been processedKim Alvefur2017-04-081-1/+1
| |
* | Merge 0.10->trunkKim Alvefur2017-04-082-80/+63
|\|
| * migrator/prosody_sql: Abort and demand database be upgraded if it needs to ↵Kim Alvefur2017-04-071-1/+32
| | | | | | | | be (#635)
| * migrator.prosody_sql: Switch to util.sql (#635)Kim Alvefur2017-04-071-73/+30
| |
| * migrator: Remove broken distinction between a load error or a missing ↵Kim Alvefur2017-04-071-7/+2
| | | | | | | | storage handler (worked with module()?)
* | Merge 0.10->trunkKim Alvefur2017-02-151-8/+7
|\|
| * migrator: Fix missing wordKim Alvefur2017-02-151-1/+1
| |
| * migrator: Fix argument parsingKim Alvefur2017-02-151-5/+4
| |
| * migrator: Unexpand whitespaceKim Alvefur2017-02-151-2/+2
| |
* | Merge 0.10->trunkKim Alvefur2017-02-045-25/+23
|\|
| * tools/migration/migrator/*: Remove use of module()Kim Alvefur2017-02-024-15/+22
| |
| * migrator: Remove wrapper around envloadfile since envloadfile does the right ↵Kim Alvefur2017-02-021-10/+1
| | | | | | | | thing in a compatible way
* | 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
|/