Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | 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). | |||||
* | Merge 0.9->trunk | Matthew Wild | 2012-08-26 | 1 | -0/+153 | |
|\ | ||||||
| * | tools/openfire2prosody: Initial commit. | Waqas Hussain | 2012-08-11 | 1 | -0/+153 | |
| | | ||||||
* | | tools/xep227toprosody.lua: Update childtags calls, replace some with ipairs | Kim Alvefur | 2012-08-21 | 1 | -6/+6 | |
|/ | ||||||
* | tools/erlparse: Handle decimal point in numbers. | Waqas Hussain | 2012-08-04 | 1 | -0/+6 | |
| | ||||||
* | tools/erlparse: Fix erlang string escape sequences. | Waqas Hussain | 2012-08-04 | 1 | -1/+1 | |
| | ||||||
* | mod_admin_telnet, prosody, prosodyctl, ejabberd2prosody: Don't depend on ↵ | Florian Zeitz | 2012-06-09 | 1 | -1/+1 | |
| | | | | modules setting globals | |||||
* | Eliminate direct setfenv usage | Florian Zeitz | 2012-06-08 | 2 | -14/+11 | |
| | ||||||
* | tools/ejabberdsql2prosody: Handle INSERT statement form where column list is ↵ | Waqas Hussain | 2012-02-05 | 1 | -1/+6 | |
| | | | | specified (by skipping the column list). | |||||
* | migrator/jabberd14: Minor refactoring. | Waqas Hussain | 2011-12-09 | 1 | -9/+6 | |
| | ||||||
* | migrator/jabberd14: Support for reading jabberd14 spool files. | Waqas Hussain | 2011-11-19 | 1 | -0/+194 | |
| | ||||||
* | tools/ejabberdsql2prosody: Track current line for error reporting | Matthew Wild | 2011-09-20 | 1 | -2/+6 | |
| | ||||||
* | ejabberd2prosody: Added a lot more type checks to ensure XML data has proper ↵ | Waqas Hussain | 2011-09-17 | 1 | -1/+8 | |
| | | | | data types. Ignore attributes of invalid types. Fixes the cause of issue#261. | |||||
* | ejabberd2prosody: Add support for privacy lists. | Waqas Hussain | 2011-08-26 | 1 | -0/+67 | |
| | ||||||
* | migrator/prosody_sql.lua: Fix for compatibility with non-MySQL databases | Matthew Wild | 2011-06-05 | 1 | -1/+1 | |
| | ||||||
* | migrator/prosody_sql.lua: Create (and upgrade) MySQL tables to use ↵ | Matthew Wild | 2011-06-03 | 1 | -0/+18 | |
| | | | | MEDIUMTEXT for the 'value' column to avoid truncation | |||||
* | migrator/prosody_files: Don't choke on empty data stores for a user (thanks ↵ | Matthew Wild | 2011-06-02 | 1 | -1/+6 | |
| | | | | @eoranged) | |||||
* | tools/migration/migrator/prosody_sql.lua: Fix compatibility with PostgreSQL ↵ | Matthew Wild | 2011-04-11 | 1 | -1/+5 | |
| | | | | (thanks Timo) | |||||
* | tools/migration/migrator/prosody_files.lua: Fix for previous commitvault/0.8.00.8.0 | Matthew Wild | 2011-04-05 | 1 | -1/+2 | |
| | ||||||
* | tools/migration/prosody-migrator.lua: Add messages to show when migration is ↵ | Matthew Wild | 2011-04-05 | 1 | -1/+2 | |
| | | | | in progress |