3983 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Evgeny Khramtsov	4ef2d08456	Merge pull request #396 from hamano/scram-stringprep-checking ... checking stringprep in scram authentication	2015-01-08 11:02:23 +03:00
HAMANO Tsukasa	ede5a353e8	checking stringprep in scram authentication	2015-01-08 14:12:05 +09:00
Badlop	b88fa6f617	Fix missing presences when adding shared groups (Github PR#99, thanks to Bokner)	2015-01-07 13:11:53 +01:00
Badlop	3882c4d514	Fix binaries in command ejabberdctl stop_kindly	2015-01-07 11:44:04 +01:00
badlop	d24dc4e9c8	Merge pull request #383 from weiss/fix-shutdown ... Give temporary processes a little time to stop cleanly	2015-01-07 11:42:22 +01:00
badlop	afaf68159d	Merge pull request #395 from weiss/fix-turn-example ... Fix example: turn_ip must be specified as string	2015-01-04 12:06:17 +01:00
Holger Weiss	a7f578089a	Fix example: turn_ip must be specified as string	2015-01-04 00:55:00 +01:00
Evgeny Khramtsov	173d9761ca	Merge pull request #387 from weiss/fix-captcha-without-proto ... Fix ejabberd_captcha's listener parsing	2014-12-24 19:16:02 +03:00
Holger Weiss	9dc9d75502	Fix ejabberd_captcha's listener parsing ... If the "captcha_host" is specified without "http://" or "https://" prefix, ejabberd_captcha tries to figure out the protocol automatically. Fix the code that parses the listener configuration in order to do that.	2014-12-24 00:35:22 +01:00
Holger Weiss	06db65e108	Give temporary processes time to stop cleanly ... Allow temporary processes to perform some final actions when shutting down. For example, moc_muc_room:terminate/3 fails to send 'unavailable' presence to the room participants when killed immediately.	2014-12-21 21:03:22 +01:00
Holger Weiss	d734f6beca	Use correct message type for last published items ... When sending last published PubSub/PEP items, set the message type that was used for broadcasting those items originally.	2014-12-21 20:11:05 +01:00
Holger Weiss	e5428c5500	Improve add_message_type/2 function ... Let add_message_type/2 accept the type as an atom, and let the function handle the 'normal' message type. This doesn't change the behavior, but avoids some code duplication.	2014-12-21 18:44:53 +01:00
Jerome Sautret	cc958f7787	Fix upgrade of PubSub mnesia tables from older ejabberd version.	2014-12-18 11:51:28 +01:00
Evgeny Khramtsov	8781c8346b	Merge pull request #379 from weiss/polish-readme ... Polish the README file a bit	2014-12-17 18:36:05 +03:00
Holger Weiss	ad4b41730e	Apply various cosmetic changes to README file	2014-12-16 22:14:36 +01:00
Christophe Romain	5935b4e104	improve readability of links on github page	2014-12-15 10:52:47 +01:00
Christophe Romain	d1f09a29b9	improve README adding feature list	2014-12-15 10:26:57 +01:00
Evgeny Khramtsov	df88d9f2e5	Merge pull request #377 from weiss/new-timestamps ... Add timestamps to stanzas resent from stream management queue	2014-12-13 09:42:30 +03:00
Holger Weiss	466278fde1	Let jlib use "B" instead of "w" to format integers ... As a small optimization, use io:format's "B" control sequence to format integers. We don't need to let Erlang figure out the data type if we already know it.	2014-12-12 23:50:03 +01:00
Holger Weiss	0a19dac4fd	Add fractions of seconds to <delay/> timestamps ... Include fractions of a second with XEP-0203 <delay/> timestamps, as specified in XEP-0082. Old timestamp: 2014-05-19T11:55:00Z New timestamp: 2014-05-19T11:55:00.123Z	2014-12-11 23:11:35 +01:00
Christophe Romain	7e6d310fe4	include static versions of deps in rebar.config/script (thanks to Holger Weiß)(EJAB-1730)	2014-12-11 15:21:58 +01:00
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