Commit graph

150 commits

Author SHA1 Message Date
Kim Alvefur
f2dac55651 tools: Add a tool to generate net.http.codes from IANA registry 2018-02-08 17:35:42 +01:00
Kim Alvefur
8a9dd05b08 Merge 0.10->trunk 2017-04-10 23:16:13 +02:00
Kim Alvefur
91baabfede SQL: Use standard quotes for columns and other identifiers, rewrite to grave accents for MySQL only (fixes #885) 2017-04-10 23:13:39 +02:00
Kim Alvefur
f01822fbfc Merge 0.10->trunk 2017-04-09 01:25:58 +02:00
Kim Alvefur
699dab7c6d migration/prosody_sql: Commit transaction when all items have been processed 2017-04-08 16:33:42 +02:00
Kim Alvefur
f2f1aa7473 Merge 0.10->trunk 2017-04-08 00:48:15 +02:00
Kim Alvefur
6b3a33a083 migrator/prosody_sql: Abort and demand database be upgraded if it needs to be (#635) 2017-04-07 13:17:00 +02:00
Kim Alvefur
8a7bc589b3 migrator.prosody_sql: Switch to util.sql (#635) 2017-04-07 13:16:12 +02:00
Kim Alvefur
8716255d0c migrator: Remove broken distinction between a load error or a missing storage handler (worked with module()?) 2017-04-07 13:06:06 +02:00
Kim Alvefur
f21bbbab60 Merge 0.10->trunk 2017-02-15 23:05:03 +01:00
Kim Alvefur
fc7dadb6a7 migrator: Fix missing word 2017-02-15 15:30:34 +01:00
Kim Alvefur
00b6eff872 migrator: Fix argument parsing 2017-02-15 15:30:19 +01:00
Kim Alvefur
ff26455099 migrator: Unexpand whitespace 2017-02-15 15:29:37 +01:00
Kim Alvefur
e902bcea2e Merge 0.10->trunk 2017-02-04 01:08:27 +01:00
Kim Alvefur
0a385a3953 tools/migration/migrator/*: Remove use of module() 2017-02-02 20:49:09 +01:00
Kim Alvefur
f0918f4e1b migrator: Remove wrapper around envloadfile since envloadfile does the right thing in a compatible way 2017-02-02 20:11:25 +01:00
Kim Alvefur
fde889b4ec Merge 0.10->trunk 2017-01-09 10:17:39 +01:00
Kim Alvefur
d3f66c0848 tools/erlparse: Remove use of deprecated module() function 2017-01-09 10:17:09 +01:00
Kim Alvefur
782117034d Merge 0.10->trunk 2016-08-18 17:36:46 +02:00
Anton Shestakov
9129ea5b4c ejabberdsql2prosody: rename variable 't' to prevent shadowing upvalues [luacheck]
Let's make the result of parseFile() have a more descriptive name.
2016-08-12 13:51:38 +08:00
Anton Shestakov
41c7847806 ejabberdsql2prosody: rename variable 'host' to prevent shadowing upvalue [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
2016-08-12 13:44:47 +08:00
Anton Shestakov
b6969ffbeb ejabberdsql2prosody: remove unused one-letter loop variables [luacheck] 2016-08-12 13:31:16 +08:00
Anton Shestakov
0bbcab4e51 ejabberdsql2prosody: remove unused function pushback() [luacheck]
The same function seems to exist in tools/erlparse.lua, also unused.
2016-08-12 13:29:27 +08:00
Emmanuel Gil Peyrot
c6048a7cb4 Update every link to the documentation to use HTTPS 2016-04-16 21:08:05 +01:00
Kim Alvefur
3d29bb52de Merge 0.9->0.10 2015-09-25 18:11:24 +02:00
Kim Alvefur
a10c1e367f xep227toprosody: Pass parser to callbacks (needed since addition of stanza size limits) 2015-09-18 16:14:43 +02:00
Kim Alvefur
6ec3c0bee0 ejabberd2prosody: Support password stored as SCRAM hashes 2015-08-20 09:14:15 +02:00
Matthew Wild
83ca1bd5d1 configure, Makefile: Add --libdir option to ./configure, allowing you to override the $PREFIX/lib/ default. Fixes #470. 2015-02-20 15:51:05 +00:00
Kim Alvefur
42475293d1 tools/ejabberd2prosody.lua: Fix JID building, node-less jids became @hostname in some cases 2014-06-17 11:01:51 +02:00
Kim Alvefur
70b5195b4f tools/jabberd14sql2prosody: Fix package.path (thanks daurnimator) 2014-04-22 23:14:53 +02:00
Waqas Hussain
9b804fffc8 tools/ejabberd2prosody: Don't throw an error if XML CDATA is null ([] in Erlang, instead of a string or being missing). 2014-02-18 16:03:13 -05:00
Kim Alvefur
6712a42066 tools/ejabberd2prosody: Handle new room member format. 2014-01-27 16:47:54 +01:00
Waqas Hussain
611b2eb4ed tools/ejabberd2prosody: Disable generating a config, as the format it generates is completely out of date. 2014-01-18 17:26:02 -05:00
Waqas Hussain
796429efbe tools/ejabberd2prosody: “xmlelement” can be “xmlel” in newer ejabberd (thanks cr). 2014-01-18 17:24:10 -05:00
Waqas Hussain
21f6eb82cf tools/ejabberd2prosody: Add support for importing MUC rooms. 2014-01-18 10:37:12 -05:00
Waqas Hussain
0adfe40738 tools/ejabberdsql2prosody: Skip invalid XML in data, and print out errors. 2014-01-16 14:03:27 -05:00
Kim Alvefur
345a2e09f6 Merge 0.9->0.10 2015-08-26 13:17:10 +02:00
Kim Alvefur
f67cdc6ec6 Merge 0.9->0.10 2015-02-21 10:34:56 +01:00
Kim Alvefur
265b49cc49 Merge 0.9->0.10 2014-06-21 15:05:21 +02:00
Kim Alvefur
a4b456c857 Merge 0.9->0.10 2014-04-23 00:22:36 +02:00
Kim Alvefur
42c4183e34 Merge 0.9->0.10 2014-02-26 22:21:55 +01:00
Kim Alvefur
c92bbefd9c Merge 0.9->0.10 2014-02-03 07:23:33 +01:00
Matthew Wild
9498616c81 Merge 0.9->0.10 2014-01-21 03:24:40 +00:00
Matthew Wild
996847e180 Merge 0.9->0.10 2014-01-18 18:46:12 +00:00
Matthew Wild
e60a10abca Merge 0.9->0.10 2014-01-12 06:19:37 -05:00
Waqas Hussain
814d446911 tools/migration/migrator/prosody_files: Fix undefined global access of ‘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. 2014-01-03 15:52:52 -05:00
Florian Zeitz
1d833bb807 Remove all trailing whitespace 2013-08-09 17:48:21 +02:00
Vadim Misbakh-Soloviov
c633ac92a9 additional fix for erlparse loading in ejabberd2prosody.lua 2013-06-14 15:43:35 +07:00
Vadim Misbakh-Soloviov
a97742e477 additional fix for erlparse loading in ejabberd2prosody.lua 2013-06-14 15:43:35 +07:00
Vadim Misbakh-Soloviov
ceff8cb313 package{,c}path fixes for migration tools 2013-06-14 15:15:05 +07:00