67 Commits

Author	SHA1	Message	Date
Jean-Sébastien Pédron	4eaa8e19c9	Merge from trunk (r1457 to r1563). ... SVN Revision: 1564	2008-09-16 14:39:57 +00:00
Jean-Sébastien Pédron	332fb55e3a	MFC: ... Merge revisions from 1362 to revision 1434 from trunk. SVN Revision: 1435	2008-07-11 12:48:27 +00:00
Christophe Romain	fe82bf3e81	temporary roster_groups_allowed (EJAB-655) ... SVN Revision: 1359	2008-06-18 16:35:03 +00:00
Christophe Romain	638d789ae6	pubsub get_default bugfix (EJAB-656) ... SVN Revision: 1358	2008-06-18 16:19:18 +00:00
Christophe Romain	edf1ed5c87	remove unused served_hosts option ... SVN Revision: 1306	2008-04-28 13:02:07 +00:00
Christophe Romain	367610dd38	pubsub identity and database update bugfix ... SVN Revision: 1285	2008-04-10 14:11:06 +00:00
Christophe Romain	37fc28ef49	add condition inclusion of pep in disco identity (EJAB-564) ... SVN Revision: 1268	2008-04-02 09:06:28 +00:00
Badlop	5fd627b85b	* doc/api/Makefile: Report the correct ejabberd version. When ... cleaning, remove also erlang.png * src/mod_muc/mod_muc_room.erl: Update source code to prevent warning messages from EDoc * src/mod_pubsub/mod_pubsub.erl: Likewise * src/mod_pubsub/node_default.erl: Likewise * src/mod_pubsub/nodetree_default.erl: Likewise * src/mod_pubsub/nodetree_virtual.erl: Likewise * src/mod_pubsub/pubsub.hrl: Likewise SVN Revision: 1265	2008-04-01 10:11:39 +00:00
Christophe Romain	1247a98cf2	Pubsub subscription is now wrapped in pubsub tags (EJAB-580) ... SVN Revision: 1244	2008-03-21 16:05:32 +00:00
Christophe Romain	7f6cdc6cfe	use if event instead of x when xmlns is pubsub#event (EJAB-518) ... SVN Revision: 1181	2008-02-11 15:21:24 +00:00
Mickaël Rémond	4e096f1590	* src/mod_pubsub/gen_pubsub_node.erl: API improvement: Added a way to generate custom item name ... * src/mod_pubsub/node_dispatch.erl: Likewise * src/mod_pubsub/node_buddy.erl: Likewise * src/mod_pubsub/node_private.erl: Likewise * src/mod_pubsub/node_club.erl: Likewise * src/mod_pubsub/node_public.erl: Likewise * src/mod_pubsub/node_default.erl: Likewise * src/mod_pubsub/node_pep.erl: Likewise * src/mod_pubsub/mod_pubsub.erl: Small API improvements and refactoring SVN Revision: 1173	2008-02-06 18:04:23 +00:00
Mickaël Rémond	fff45aca21	* src/mod_pubsub/mod_pubsub.erl: Added the from field in the ... get_subnodes pubsub plugin API function. This is usefull to write plugins to generate the pubsub hierarchy dynamically, based on who is doing the browsing request. * src/mod_pubsub/gen_pubsub_nodetree.erl: Likewise * src/mod_pubsub/nodetree_default.erl: Likewise * src/mod_pubsub/nodetree_virtual.erl: Likewise SVN Revision: 1168	2008-02-02 14:15:37 +00:00
Christophe Romain	c8e580987d	pubsub dirty_sync typo fix on node configuration transaction ... SVN Revision: 1159	2008-01-25 10:17:59 +00:00
Christophe Romain	58c491ade3	pubsub configuration patch (EJAB-508) and (EJAB-509) ... SVN Revision: 1158	2008-01-25 09:24:10 +00:00
Badlop	2d2fcc8210	* doc/guide.tex: Updated copyright dates to 2008 ... * src/*: Likewise SVN Revision: 1153	2008-01-15 17:02:57 +00:00
Christophe Romain	aa685c7794	set_subscription fix (EJAB-494) ... SVN Revision: 1148	2008-01-12 19:47:19 +00:00
Christophe Romain	20c27ea9d9	EJAB-491 fix ... SVN Revision: 1145	2008-01-11 01:39:10 +00:00
Christophe Romain	b3bf437dd1	Send last published PEP event now checks the correct peer caps (EJAB-491) ... SVN Revision: 1143	2008-01-10 15:02:54 +00:00
Mickaël Rémond	22f928122f	* Applied copyright patch 3. ... SVN Revision: 1113	2007-12-24 13:57:53 +00:00
Christophe Romain	56194f742b	pubsub: remove useless get_roster_info call ... SVN Revision: 1109	2007-12-24 11:28:56 +00:00
Christophe Romain	1f8c32cbff	debug log fix ... SVN Revision: 1098	2007-12-22 01:14:56 +00:00
Christophe Romain	d74c527101	EJAB-469 bugfix ... SVN Revision: 1097	2007-12-22 01:13:06 +00:00
Christophe Romain	02eaf9eaec	several pubsub/pep bugfix ... SVN Revision: 1096	2007-12-22 00:04:05 +00:00
Christophe Romain	e7fda4a23f	pubsub disco#items bugfix (EJAB-465) ... SVN Revision: 1089	2007-12-21 00:08:59 +00:00
Christophe Romain	583f2fd19f	PEP notification bugfix ... SVN Revision: 1085	2007-12-20 16:38:38 +00:00
Christophe Romain	c0b2c5744f	Purge related pep nodes at remove_user ... SVN Revision: 1077	2007-12-18 14:45:26 +00:00
Badlop	090fceebc2	* src/mod_irc/mod_irc.erl: No need to translate copyright notice ... * src/mod_muc/mod_muc.erl: Likewise * src/mod_proxy65/mod_proxy65_service.erl: Likewise * src/mod_pubsub/mod_pubsub.erl: Likewise * src/mod_vcard.erl: Likewise * src/mod_vcard_ldap.erl: Likewise * src/mod_vcard_odbc.erl: Likewise * src/msgs/*.msg: Likewise * contrib/extract_translations/prepare-translation.sh: Bugfix SVN Revision: 1071	2007-12-15 12:02:00 +00:00
Christophe Romain	348427fab0	pubsub presence handler bugfix ... SVN Revision: 1068	2007-12-12 16:16:00 +00:00
Christophe Romain	f3322710c0	pubsub notification broadcast bugfix ... SVN Revision: 1065	2007-12-11 16:19:17 +00:00
Christophe Romain	bf239fac9d	auto-create pe node bugfix ... SVN Revision: 1060	2007-12-10 14:09:31 +00:00
Christophe Romain	b9286778d4	return back to good location for database upgrade call ... SVN Revision: 1059	2007-12-10 09:56:15 +00:00
Christophe Romain	d4ff7eeb4a	pubsub database upgrade bugfix ... SVN Revision: 1058	2007-12-10 09:33:30 +00:00
Christophe Romain	23b91e953a	pubsub disco_sm_items bugfix ... SVN Revision: 1051	2007-12-08 15:24:38 +00:00
Badlop	95c69b0251	* src/mod_irc/iconv.erl: Fix compilation warnings: 3 (EJAB-290) ... * src/mod_irc/mod_irc.erl: Likewise * src/mod_irc/mod_irc_connection.erl: Likewise * src/mod_pubsub/mod_pubsub.erl: Likewise * src/stringprep/stringprep.erl: Likewise * src/web/ejabberd_http.erl: Likewise * src/web/ejabberd_http_poll.erl: Likewise SVN Revision: 1047	2007-12-07 00:48:11 +00:00
Badlop	d3a86d7660	* src/mod_pubsub/mod_pubsub.erl: Fixed URI. ... SVN Revision: 1020	2007-12-04 21:35:41 +00:00
Badlop	1724ee2b15	* src/mod_pubsub/mod_pubsub.erl: Bugfix: don't report the Jabber ... server as a pubsub service. SVN Revision: 1019	2007-12-04 11:38:00 +00:00
Alexey Shchepin	c3c782d882	* src/mod_caps.erl: CAPS support (thanks to Magnus Henoch) ... * src/ejabberd_local.erl: Support for IQ responses * src/jlib.erl: Added iq_query_or_response_info/1 function * src/jlib.hrl: Added NS_PUBSUB_ERRORS and NS_CAPS * src/mod_pubsub/Makefile.in: New pubsub+pep implementation (thanks to Christophe Romain and Magnus Henoch) * src/ejabberd_sm.erl: Added get_session_pid/3 function * src/ejabberd_c2s.erl: Added get_subscribed_and_online/1 function SVN Revision: 1004	2007-12-01 05:16:30 +00:00
Badlop	0996e569a6	* doc/guide.tex: Update URI of ejabberd official home page, URI ... of ejabberd.jabber.ru, and copyright dates (EJAB-366) * doc/introduction.tex: * src/ejabberd.hrl: * src/ejabberd_admin.erl: * src/mod_irc/mod_irc.erl: * src/mod_irc/mod_irc_connection.erl: * src/mod_muc/mod_muc.erl: * src/mod_muc/mod_muc_log.erl: * src/mod_proxy65/mod_proxy65_service.erl: * src/mod_pubsub/mod_pubsub.erl: * src/mod_vcard.erl: * src/mod_vcard_ldap.erl: * src/mod_vcard_odbc.erl: * src/msgs/*.msg: * src/web/ejabberd_web_admin.erl: SVN Revision: 997	2007-11-27 23:35:26 +00:00
Alexey Shchepin	5dfa6edda3	* src/gen_mod.erl: Substitute @HOST@ with hostname in the 'host' ... option (thanks to Badlop) * src/mod_vcard.erl: Likewise * src/mod_vcard_ldap.erl: Likewise * src/mod_vcard_odbc.erl: Likewise * src/mod_muc/mod_muc.erl: Likewise * src/mod_irc/mod_irc.erl: Likewise * src/mod_echo.erl: Likewise * src/mod_pubsub/mod_pubsub.erl: Likewise * src/mod_proxy65/mod_proxy65_service.erl: Likewise SVN Revision: 888	2007-08-25 17:24:00 +00:00
Mickaël Rémond	03740c8bca	* src/mod_vcard.erl: Make services description translatable in discovery (EJAB-236 - thanks to Badlop) ... * src/mod_muc/mod_muc.erl: Likewise * src/mod_irc/mod_irc.erl: Likewise * src/mod_pubsub/mod_pubsub.erl: Likewise * src/mod_proxy65/mod_proxy65_service.erl: Likewise * src/msgs/fr.msg: Added service description translation SVN Revision: 774	2007-05-29 13:14:09 +00:00
Alexey Shchepin	39c1eb4be7	* src/mod_pubsub/mod_pubsub.erl: Bugfix ... SVN Revision: 737	2007-02-22 07:39:05 +00:00
Christophe Romain	cf3ec810d5	support presence_delivery in cluster ... SVN Revision: 702	2007-01-09 10:09:51 +00:00
Mickaël Rémond	112c609222	* src/mod_muc/mod_muc.erl: Component name is now more user ... friendly (thanks to Badlop). * src/mod_irc/mod_irc.erl: Likewise. * src/mod_pubsub/mod_pubsub.erl: Likewise. SVN Revision: 620	2006-09-22 17:01:16 +00:00
Mickaël Rémond	b80002a8bb	* src/mod_pubsub/mod_pubsub.erl: Discovery query on an item does ... no more return an "item not found error". Discovery stop correctly at the item level (Thanks to Christophe Romain) (EJAB-105). SVN Revision: 578	2006-06-07 14:07:18 +00:00
Mickaël Rémond	9dcd3f4080	* src/mod_pubsub/mod_pubsub.erl: Support for pubsub node ... creation ACL. It is now possible to limit the node creation rights using an ACL from ejabberd config file (Thanks to Christophe Romain) (EJAB-104). * doc/guide.tex: Likewise. * src/ejabberd.cfg.example. SVN Revision: 577	2006-06-07 08:38:37 +00:00
Mickaël Rémond	49917e284e	* src/mod_pubsub/mod_pubsub.erl: Fixed pubsub root node creation ... (conflict error was send on node creation) SVN Revision: 529	2006-04-07 13:39:48 +00:00
Alexey Shchepin	0cc168a9aa	* src/mod_muc/mod_muc_room.erl: Kick non-members when room ... reconfigured to be member-only or when membership is revoked in member-only room, allowed "true" and "false" in x:data forms (thanks to Sergei Golovan) * src/mod_configure.erl: Added "Host" parameter to get_form and set_form functions (thanks to Sergei Golovan) * src/ejabberd_s2s_out.erl: Bugfix * src/msgs/es.msg: Updated (thanks to Badlop) * src/web/ejabberd_web.erl: Bugfix (thanks to Badlop) * src/mod_irc/mod_irc.erl: Updated copyright dates * src/mod_muc/mod_muc.erl: Likewise * src/mod_pubsub/mod_pubsub.erl: Likewise * src/mod_vcard.erl: Likewise * src/mod_vcard_ldap.erl: Likewise * src/mod_vcard_odbc.erl: Likewise * src/web/ejabberd_web_admin.erl: Likewise SVN Revision: 500	2006-02-06 05:12:54 +00:00
Alexey Shchepin	971001e7aa	* src/mod_pubsub/mod_pubsub.erl: Updated to use gen_server ... behaviour and ejabberd supervision tree * src/mod_muc/mod_muc.erl: Added a supervisor for conference room processes * src/mod_muc/mod_muc_room.erl: Likewise SVN Revision: 496	2006-02-02 05:00:27 +00:00
Alexey Shchepin	d520f35819	* src/mod_pubsub/mod_pubsub.erl: Updated to J-EAI version ... SVN Revision: 378	2005-07-20 03:09:34 +00:00
Alexey Shchepin	4098c3ecba	* (all): Enhanced virtual hosting support ... SVN Revision: 370	2005-06-20 03:18:13 +00:00