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

52 commits

Author SHA1 Message Date
Kim Alvefur
43351d2b54 Spelling: Fix various spelling mistakes (thanks timeless) 
Words, sometimes I wonder how they even work

Maybe I missed something.
 2022-03-07 00:13:56 +01:00
arcseconds
3872237625 ejabberd2prosody.lua: fix MUC subject conversion with appropriate destructuring 2021-10-26 23:29:40 +13:00
Matthew Wild
21eeadecc7 ejabberd2prosody: Don't import disabled or empty passwords 2021-10-13 10:04:11 +01:00
Matthew Wild
8660ec61ce prosody2ejabberd: Check for iteration count at position 6 
In some data dumps, presumably from newer ejabberd versions, position 5 is
the string "sha", and the iteration count follows it.
 2021-10-07 13:02:28 +01:00
Matthew Wild
7925b95a58 ejabberd2prosody: Convert SCRAM iteration count to number (thanks arcseconds) 2021-10-07 11:16:46 +01:00
Kim Alvefur
345a2e09f6 Merge 0.9->0.10 2015-08-26 13:17:10 +02:00
Kim Alvefur
6ec3c0bee0 ejabberd2prosody: Support password stored as SCRAM hashes 2015-08-20 09:14:15 +02: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
265b49cc49 Merge 0.9->0.10 2014-06-21 15:05:21 +02:00
Kim Alvefur
42c4183e34 Merge 0.9->0.10 2014-02-26 22:21:55 +01: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
c92bbefd9c Merge 0.9->0.10 2014-02-03 07:23:33 +01:00
Kim Alvefur
6712a42066 tools/ejabberd2prosody: Handle new room member format. 2014-01-27 16:47:54 +01:00
Matthew Wild
9498616c81 Merge 0.9->0.10 2014-01-21 03:24:40 +00: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
Matthew Wild
996847e180 Merge 0.9->0.10 2014-01-18 18:46:12 +00:00
Waqas Hussain
21f6eb82cf tools/ejabberd2prosody: Add support for importing MUC rooms. 2014-01-18 10:37:12 -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
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
Florian Zeitz
8eec297456 mod_admin_telnet, prosody, prosodyctl, ejabberd2prosody: Don't depend on modules setting globals 2012-06-09 02:27:44 +02: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
fb8aa8bc8b tools/ejabberd2prosody: Create prosody singleton so datamanager can detect the platform (set no platform to use lfs, pposix isn't necessary here) 2010-03-25 18:52:34 +00:00
Matthew Wild
2bc0606453 Update copyright headers for 2010 2010-03-22 17:06:15 +00:00
Matthew Wild
a12fea9a9b ejabberd2prosody: Don't print passwords of imported accounts 2010-02-21 16:57:06 +00:00
Waqas Hussain
0040bc6b93 ejabberd2prosody: Fixed a problem with null roster groups. 2009-09-18 05:16:26 +05:00
Waqas Hussain
7fc7394567 ejabberd2prosody: Added support for ask='both' in subscriptions. 2009-09-18 00:54:12 +05:00
Matthew Wild
8dca0cdd3e ejabberd2prosody: More intelligent searching for erlparse library 2009-08-20 16:30:03 +01:00
Matthew Wild
bd85a60673 ejabberd2prosody, erlparse.lua: Convert from Windows line endings (thanks teo) 2009-07-21 19:23:03 +01:00
Matthew Wild
118883d655 Remove version number from copyright headers 2009-07-10 03:11:45 +01:00
Waqas Hussain
cdb7f7a610 tools/ejabberd2prosody: Fixed private storage export 2009-05-05 21:13:09 +05:00
Matthew Wild
c80f91dc02 0.3->0.4 2009-03-20 20:16:25 +00:00
Matthew Wild
c5ee166aa9 Update copyright notices for 2009 2009-01-30 17:59:26 +00:00
Matthew Wild
f2d020191f 0.2->0.3 2009-01-30 17:40:25 +00:00
Matthew Wild
bf3b96204d GPL->MIT! 2009-01-30 17:22:56 +00:00
Waqas Hussain
8fc233d7f5 tools/ejabberd2prosody: Support for pending-in roster items 2009-01-29 22:37:25 +05:00
Waqas Hussain
1f5c712bcd Moved directory auto-creation to datamanager 2008-12-25 06:35:05 +05:00
Waqas Hussain
d3d9a986ba Fixed URL encoding to generate %0x instead of %x 2008-12-16 03:46:17 +05:00
Matthew Wild
d3ad4a5123 0.1 -> 0.2 2008-12-10 15:44:03 +00:00
Waqas Hussain
e99904914b Make the ejabberd importer work with host-only roster items 2008-12-08 07:11:35 +05:00
Waqas Hussain
83fc91cb10 Changed the ejabberd import script to use util.serialization 2008-12-04 23:40:15 +05:00
Matthew Wild
0c5cc83112 Insert copyright/license headers 2008-12-03 14:39:07 +00:00
Waqas Hussain
48e386d5de Fixed the ejabberd importer to work with the pipe sign "|" as a separator in erlang lists 2008-11-30 02:08:37 +05:00
Matthew Wild
f5830f6ada Make ejabberd2prosody.lua a little more cross-platform :) 2008-11-29 19:52:20 +00:00