4062 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Evgeny Khramtsov	ffe3ea8917	Merge pull request #374 from weiss/fix-muc-log-config ... mod_muc_log: Fix configuration parsing	2014-12-08 22:56:20 +03:00
Holger Weiss	455039ae69	mod_muc_log: Fix configuration parsing ... Fix mod_muc_log's parsing of the "file_permissions" option. Resolves #373.	2014-12-08 15:51:06 +01:00
Holger Weiss	a78a0a65fe	Let CSI code add timestamp at later point in time ... As a small optimization, make sure we won't add timestamps to presence stanzas which end up being thrown away by the CSI code.	2014-12-07 16:27:51 +01:00
Holger Weiss	ba8f38e2eb	XEP-0198: Add timestamp to resent stanzas ... When an unacknowledged stanza is resent from the Stream Management queue, add a timestamp so that the receiving client can display the time at which the stanza was originally sent.	2014-12-07 16:12:06 +01:00
Holger Weiss	9899935e42	Improve interface for adding timestamps ... Provide a simpler interface for adding <delay/> and <x/> timestamps to stanzas. This also makes sure that only one <delay/> tag and one <x/> tag is added to a given stanza.	2014-12-07 15:55:18 +01:00
Evgeny Khramtsov	865509757c	Merge pull request #366 from weiss/remove-unused-field ... Remove unused field from ejabberd_c2s #state	2014-11-26 02:42:00 +03:00
Holger Weiss	2cb16bc509	Remove unused field from c2s #state	2014-11-26 00:15:19 +01:00
Evgeny Khramtsov	00dfcc1e10	Merge pull request #350 from flygoast/master ... Used current working home as base directory to config relative path.	2014-11-25 14:24:37 +03:00
Evgeny Khramtsov	4163626844	Merge pull request #365 from weiss/csi-config ... Fix mod_client_state's configuration parsing	2014-11-25 14:21:18 +03:00
Evgeny Khramtsov	f60c721f84	Merge pull request #364 from weiss/copy-normal-messages ... Also carbon-copy messages of type "normal"	2014-11-25 14:21:06 +03:00
Evgeny Khramtsov	e97e56d776	Merge pull request #363 from weiss/drop-pep-errors ... Don't route PEP error messages to clients	2014-11-25 14:20:11 +03:00
Evgeny Khramtsov	6b916e7a04	Merge pull request #354 from weiss/pep-privacy ... Respect privacy lists for incoming PEP messages	2014-11-25 14:20:01 +03:00
Evgeny Khramtsov	6279c3fd8d	Merge pull request #352 from weiss/no-last-pep-duplicates ... Don't duplicate last published PEP items	2014-11-25 14:19:53 +03:00
Holger Weiss	6900a41e7d	Fix mod_client_state's configuration parsing ... Don't log an "invalid value" message when "queue_presence" or "drop_chat_states" is set to "false".	2014-11-25 12:05:09 +01:00
Holger Weiss	a456482e2f	Also carbon-copy messages of type "normal" ... It makes no sense to restrict carbon-copying to "chat" messages. XEP-0280 is expected to be updated accordingly.	2014-11-24 22:37:14 +01:00
Holger Weiss	30687c40ef	Don't route PEP error messages to clients	2014-11-24 21:19:32 +01:00
Holger Weiss	16311b73c8	Add new hook: c2s_filter_packet_in ... The c2s_filter_packet_in hook can be used to modify or drop incoming packets before they are transmitted to the client.	2014-11-24 20:55:18 +01:00
badlop	b85357d280	Merge pull request #223 from kaLaJengkinG/patch-1 ... Update id.msg	2014-11-24 11:49:26 +01:00
Evgeny Khramtsov	946b64e166	Merge pull request #361 from weiss/parse-ldap-dn-filter ... Fix parsing of "ldap_dn_filter" option	2014-11-22 10:36:21 +03:00
Holger Weiss	46d035c142	Fix parsing of "ldap_dn_filter" option	2014-11-22 01:33:23 +01:00
Evgeny Khramtsov	982215d644	Merge pull request #360 from lbanders/master ... Fix for ejabbed bug #359 - now strings are formatted correctly.	2014-11-20 13:45:27 +03:00
Leif Bredgaard Honore	5afa1f6ade	Fix for ejabbed bug #359 - now strings are formatted correctly.	2014-11-20 14:21:51 +04:00
Holger Weiss	c566b1d01e	Respect privacy lists for incoming PEP messages	2014-11-18 01:25:12 +01:00
Holger Weiss	84c227e6ae	Don't duplicate last published PEP items ... When a contact becomes available, usually both the 'caps_update' hook and the 'presence_probe_hook' are called. For remote contacts, both hooks triggered PEP notifications, so each item was sent twice. Fix this by ignoring the 'presence_probe_hook' for remote contacts.	2014-11-18 01:13:22 +01:00
Evgeny Khramtsov	ab12270837	Merge pull request #351 from weiss/floating-muc-intervals ... Support floating point message/presence intervals	2014-11-16 12:35:21 +03:00
Holger Weiss	3b96525550	Support floating point message/presence intervals ... Let mod_muc support floating point values for "min_message_interval" and "min_presence_interval", as documented in the guide.	2014-11-15 22:35:56 +01:00
Gu Feng	62ccf1cf0e	Used current working home as base directory to config relative path. ... When a config relative path specified, get_absolute_path would not return an absolute path. The patch fixed it using current working home as base directory. Signed-off-by: Gu Feng <flygoast@126.com>	2014-11-16 00:09:52 +08:00
Evgeny Khramtsov	d5ecd32cec	Merge pull request #345 from weiss/last-pep-items ... Fix sending of last published PEP items to newly-available resources	2014-11-14 21:27:24 +03:00
Evgeny Khramtsov	e770d3174d	Merge pull request #346 from weiss/fix-type ... Cosmetic fix: Use correct type for initial c2s #state.user value	2014-11-14 21:22:46 +03:00
Holger Weiss	2446b66016	Use correct type for initial c2s #state.user value	2014-11-14 15:32:48 +01:00
Holger Weiss	f69d1ca282	Send last PEP items to remote subscribers ... When a remote subscriber becomes available, send him the last published PEP items, as we do for local subscribers. However, the current implementation depends on a running ejabberd_c2s process of the publisher to send items to remote subscribers. So, for those, the behavior is always like it is for local subscribers when "ignore_pep_from_offline" is set to "true".	2014-11-14 01:33:11 +01:00
Holger Weiss	830fdccd21	Don't broadcast last published PEP items ... When a client becomes available, don't send the last published PEP items of all his peers to all his other peers, but only to that client.	2014-11-14 01:03:26 +01:00
Holger Weiss	5cc30c3977	Move routing of last PEP items into new function ... This doesn't change the behavior, but avoids some code duplication.	2014-11-14 00:16:13 +01:00
Holger Weiss	8efae1f05b	ODBC: Sync last item notifications with mod_pubsub ... A while back, mod_pubsub was modified to address EJAB-1456. However, the change was only partially applied to mod_pubsub_odbc. This commit adds the remaining part.	2014-11-14 00:02:59 +01:00
Evgeny Khramtsov	de3e1c3508	Merge pull request #341 from sezuan/fix-kick-user-command ... Fix kick_user command	2014-11-10 23:14:34 +03:00
Matthias Rieber	8184326eb9	Fix kick_user command	2014-11-10 20:53:00 +01:00
Evgeny Khramtsov	f47a59de2f	Merge pull request #340 from weiss/disable-mechanisms ... New option: disable_sasl_mechanisms	2014-11-10 11:47:10 +03:00
Holger Weiss	ee0ecd2419	New option: disable_sasl_mechanisms ... The new "disable_sasl_mechanisms" option allows for restricting the list of SASL mechanisms offered to the client. Closes #339.	2014-11-10 01:10:04 +01:00
Evgeny Khramtsov	7138cc5633	Merge pull request #337 from weiss/fix-install-without-json ... Fix "make install" without JSON support	2014-11-06 21:11:17 +03:00
Holger Weiss	f95f22aea0	Fix "make install" without JSON support ... Don't bail out during "make install" when ./configure was called without "--enable-json".	2014-11-06 17:11:15 +01:00
Evgeny Khramtsov	25e5253f33	Merge pull request #335 from weiss/avoid-carbon-dups ... Avoid duplicates of carbon copies	2014-11-05 23:17:45 +03:00
Holger Weiss	41dc1efde4	Avoid duplicates of carbon copies ... When multiple resources have the same (highest) priority, the session manager routes messages sent to their bare JID to each of these resources. When another resource has a lower priority but receives carbon copies, make sure it won't receive multiple copies of such messages.	2014-11-05 19:04:02 +01:00
Jerome Sautret	1d2efcc168	Add xref test to travis. ... Conflicts: .travis.yml	2014-10-31 11:24:56 +01:00
Evgeniy Khramtsov	dfb21e802e	Fix race in CSI test case	2014-10-31 00:26:22 +03:00
Evgeniy Khramtsov	9a0b951855	Add tests for mod_vcard_xupdate	2014-10-30 23:57:15 +03:00
Christophe Romain	7819986ec0	Merge branch 'master' of github.com:processone/ejabberd	2014-10-30 17:44:04 +01:00
Christophe Romain	295681283a	don't stop on error if jiffy.so symlink exists #309	2014-10-30 17:43:57 +01:00
Jerome Sautret	5b0d8b7776	Merge branch 'master' of github.com:processone/ejabberd	2014-10-30 17:19:37 +01:00
Jerome Sautret	1d2ef85b33	Clean up rebar script.	2014-10-30 16:51:01 +01:00
Christophe Romain	b550f247e7	fix invalid path of jiffy.so on install #309	2014-10-30 15:47:33 +01:00