mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 13:17:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions
13812 commits 12 branches 100 tags 40 MiB
Commit graph

208 commits

Author SHA1 Message Date
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
Vadim Misbakh-Soloviov
5554e15437 package{,c}path fixes for migration tools 2013-06-14 15:15:05 +07:00
Kim Alvefur
4d156831cb tools/migration/Makefile: Apply Lua runtime override (see 53f741a5a73a) 2013-03-31 20:09:14 +02:00
Kim Alvefur
f092adcb3c ejabberd2prosody.lua: Don't make assumptions about file name. 2013-01-25 00:36:17 +01:00
Kim Alvefur
f766f157e7 ejabberd2prosody.lua: Replace util.logger with a dummy before requiring util.serialization 2013-01-24 21:48:45 +01:00
Waqas Hussain
20a28d166c tools/migration/migrator/jabberd14: Use util.xml. 2012-12-03 05:44:48 +05:00
Waqas Hussain
997a920d80 tools/openfire2prosody: Use util.xml. 2012-12-03 05:42:17 +05:00
Waqas Hussain
39216ec3d3 tools/jabberd14sql2prosody: Use util.xml. 2012-12-03 05:41:18 +05:00
Waqas Hussain
60d77168d0 tools/ejabberdsql2prosody: Use util.xml. 2012-12-03 05:34:46 +05:00
Waqas Hussain
2ea9714c6f tools/jabberd14sql2prosody: Initial commit. Accounts, rosters, vCards, subscriptions and offline messages supported (thanks halfdan for all the testing). 2012-08-28 05:52:30 +05:00
Matthew Wild
2ce7b8b4e1 Merge 0.9->trunk 2012-08-26 19:58:59 +01:00
Kim Alvefur
63c4de5955 tools/xep227toprosody.lua: Update childtags calls, replace some with ipairs 2012-08-21 18:03:40 +02:00
Waqas Hussain
79de781658 tools/openfire2prosody: Initial commit. 2012-08-11 06:14:12 +05:00
Waqas Hussain
6ae2292381 tools/erlparse: Handle decimal point in numbers. 2012-08-04 23:55:52 +05:00
Waqas Hussain
d69fd55cf6 tools/erlparse: Fix erlang string escape sequences. 2012-08-04 23:23:49 +05:00
Florian Zeitz
8eec297456 mod_admin_telnet, prosody, prosodyctl, ejabberd2prosody: Don't depend on modules setting globals 2012-06-09 02:27:44 +02:00
Florian Zeitz
d49b9bc2ab Eliminate direct setfenv usage 2012-06-08 05:04:38 +02:00
Waqas Hussain
84090686e4 tools/ejabberdsql2prosody: Handle INSERT statement form where column list is specified (by skipping the column list). 2012-02-05 00:10:13 +05:00
Waqas Hussain
a329f8193f migrator/jabberd14: Minor refactoring. 2011-12-09 11:37:30 +05:00
Waqas Hussain
5785bdb7b6 migrator/jabberd14: Support for reading jabberd14 spool files. 2011-11-19 21:12:23 +05:00
Matthew Wild
662e7a289f tools/ejabberdsql2prosody: Track current line for error reporting 2011-09-20 23:30:58 +01:00
Waqas Hussain
364dbbef55 ejabberd2prosody: Added a lot more type checks to ensure XML data has proper data types. Ignore attributes of invalid types. Fixes the cause of issue#261. 2011-09-17 20:25:11 +05:00
Waqas Hussain
316cb51770 ejabberd2prosody: Add support for privacy lists. 2011-08-26 16:02:08 +05:00
Matthew Wild
2c97611fed migrator/prosody_sql.lua: Fix for compatibility with non-MySQL databases 2011-06-05 11:53:41 +01:00
Matthew Wild
27bc9300b8 migrator/prosody_sql.lua: Create (and upgrade) MySQL tables to use MEDIUMTEXT for the 'value' column to avoid truncation 2011-06-03 00:57:25 +01:00
Matthew Wild
aded9653e0 migrator/prosody_files: Don't choke on empty data stores for a user (thanks @eoranged) 2011-06-02 17:18:23 +01:00
Matthew Wild
32c5970584 tools/migration/migrator/prosody_sql.lua: Fix compatibility with PostgreSQL (thanks Timo) 2011-04-11 17:01:06 +01:00
Matthew Wild
f9191fdb2c tools/migration/migrator/prosody_files.lua: Fix for previous commit 2011-04-05 14:34:48 +01:00
Matthew Wild
747f5e7ccf tools/migration/prosody-migrator.lua: Add messages to show when migration is in progress 2011-04-05 14:34:06 +01:00
Matthew Wild
667fc392e9 tools/migration: Support for ~/ in paths 2011-04-05 14:11:25 +01:00
Matthew Wild
0e4599d1b5 tools/migration/prosody-migrator.lua: Refactor store handler loading to report errors they throw 2011-04-05 12:59:24 +01:00
Matthew Wild
cef7f598c0 tools/migration/migrator/prosody_sql: Throw a friendlier error when LuaDBI is not found 2011-04-05 12:58:14 +01:00
Matthew Wild
1f049ed80d tools/migration: Rename main.lua -> prosody-migrator.lua and update the Makefile 2011-03-21 19:39:04 +00:00
Matthew Wild
ceffa60caf tools/migration/Makefile: Don't install main.lua (we already install it as prosody-migrator) (thanks Enrico) 2011-03-03 18:14:08 +00:00
Matthew Wild
2b4811c843 tools/migration/*: Numerous changes and restructuring, and the addition of a Makefile 2011-02-26 00:23:48 +00:00
Matthew Wild
35a339b1d3 tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling for config and command-line parameters 2011-02-25 03:32:44 +00:00
Matthew Wild
7c054e5160 tools/migration/main.lua: Add command-line parsing, including --config=CONFIG_FILE, and the ability to specify to/from stores to migrate 2011-02-25 01:31:08 +00:00
Matthew Wild
a33886bcb1 tools/migration/config.lua: Minor fixes for more sensible defaults 2011-02-25 01:29:31 +00:00
Matthew Wild
ba01859e1c tools/migration/*.lua: Convert to unix line endings 2011-02-23 18:31:48 +00:00
Waqas Hussain
0a2b87128f tools/migration/*: Initial commit of a new migration tool. Currently supports Prosody files and Prosody SQL as input and output. 2011-02-23 02:16:19 +05:00
Matthew Wild
3895a74e99 tools/xep227toprosody.lua: Rename ns_xep227 to xmlns_xep227 for consistency with main Prosody code 2010-12-07 19:22:08 +00:00
Matthew Wild
245099fadd tools/xep227toprosody.lua: Convert to use util.xmppstream 2010-12-07 19:20:33 +00:00
Waqas Hussain
1df82fb6a9 ejabberdsql2prosody: Added a global 'prosody' table to fix a traceback. 2010-10-20 03:57:47 +05:00