aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Fix example: turn_ip must be specified as stringHolger Weiss2015-01-041-1/+1
|/ /
* | Merge pull request #387 from weiss/fix-captcha-without-protoEvgeny Khramtsov2014-12-241-9/+9
|\ \ | |/ |/| Fix ejabberd_captcha's listener parsing
| * Fix ejabberd_captcha's listener parsingHolger Weiss2014-12-241-9/+9
|/ | | | | | 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.
* Fix upgrade of PubSub mnesia tables from older ejabberd version.Jerome Sautret2014-12-181-56/+99
|
* Merge pull request #379 from weiss/polish-readmeEvgeny Khramtsov2014-12-171-115/+119
|\ | | | | Polish the README file a bit
| * Apply various cosmetic changes to README fileHolger Weiss2014-12-161-115/+119
|/
* improve readability of links on github page14.12Christophe Romain2014-12-151-4/+4
|
* improve README adding feature listChristophe Romain2014-12-151-8/+101
|
* Merge pull request #377 from weiss/new-timestampsEvgeny Khramtsov2014-12-137-163/+167
|\ | | | | Add timestamps to stanzas resent from stream management queue
| * Let jlib use "B" instead of "w" to format integersHolger Weiss2014-12-121-8/+8
| | | | | | | | | | | | 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.
| * Add fractions of seconds to <delay/> timestampsHolger Weiss2014-12-111-9/+14
| | | | | | | | | | | | | | | | 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
| * Let CSI code add timestamp at later point in timeHolger Weiss2014-12-071-13/+17
| | | | | | | | | | As a small optimization, make sure we won't add timestamps to presence stanzas which end up being thrown away by the CSI code.
| * XEP-0198: Add timestamp to resent stanzasHolger Weiss2014-12-071-9/+18
| | | | | | | | | | | | 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.
| * Improve interface for adding timestampsHolger Weiss2014-12-077-134/+120
| | | | | | | | | | | | 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.
* | include static versions of deps in rebar.config/script (thanks to Holger ↵Christophe Romain2014-12-111-0/+78
| | | | | | | | Weiß)(EJAB-1730)
* | Merge pull request #374 from weiss/fix-muc-log-configEvgeny Khramtsov2014-12-081-1/+7
|\ \ | |/ |/| mod_muc_log: Fix configuration parsing
| * mod_muc_log: Fix configuration parsingHolger Weiss2014-12-081-1/+7
|/ | | | | | Fix mod_muc_log's parsing of the "file_permissions" option. Resolves #373.
* Merge pull request #366 from weiss/remove-unused-fieldEvgeny Khramtsov2014-11-261-2/+1
|\ | | | | Remove unused field from ejabberd_c2s #state
| * Remove unused field from c2s #stateHolger Weiss2014-11-261-2/+1
|/
* Merge pull request #350 from flygoast/masterEvgeny Khramtsov2014-11-251-3/+2
|\ | | | | Used current working home as base directory to config relative path.
| * Used current working home as base directory to config relative path.Gu Feng2014-11-161-3/+2
| | | | | | | | | | | | | | | | 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>
* | Merge pull request #365 from weiss/csi-configEvgeny Khramtsov2014-11-251-2/+6
|\ \ | | | | | | Fix mod_client_state's configuration parsing
| * | Fix mod_client_state's configuration parsingHolger Weiss2014-11-251-2/+6
| | | | | | | | | | | | | | | Don't log an "invalid value" message when "queue_presence" or "drop_chat_states" is set to "false".
* | | Merge pull request #364 from weiss/copy-normal-messagesEvgeny Khramtsov2014-11-251-4/+18
|\ \ \ | | | | | | | | Also carbon-copy messages of type "normal"
| * | | Also carbon-copy messages of type "normal"Holger Weiss2014-11-241-4/+18
| |/ / | | | | | | | | | | | | It makes no sense to restrict carbon-copying to "chat" messages. XEP-0280 is expected to be updated accordingly.
* | | Merge pull request #363 from weiss/drop-pep-errorsEvgeny Khramtsov2014-11-253-7/+82
|\ \ \ | | | | | | | | Don't route PEP error messages to clients
| * | | Don't route PEP error messages to clientsHolger Weiss2014-11-242-2/+66
| | | |
| * | | Add new hook: c2s_filter_packet_inHolger Weiss2014-11-241-5/+16
| |/ / | | | | | | | | | | | | The c2s_filter_packet_in hook can be used to modify or drop incoming packets before they are transmitted to the client.
* | | Merge pull request #354 from weiss/pep-privacyEvgeny Khramtsov2014-11-251-1/+7
|\ \ \ | | | | | | | | Respect privacy lists for incoming PEP messages
| * | | Respect privacy lists for incoming PEP messagesHolger Weiss2014-11-181-1/+7
| | | |
* | | | Merge pull request #352 from weiss/no-last-pep-duplicatesEvgeny Khramtsov2014-11-252-4/+12
|\ \ \ \ | |_|/ / |/| | | Don't duplicate last published PEP items
| * | | Don't duplicate last published PEP itemsHolger Weiss2014-11-182-4/+12
| |/ / | | | | | | | | | | | | | | | | | | 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.
* | | Merge pull request #223 from kaLaJengkinG/patch-1badlop2014-11-241-1/+1
|\ \ \ | | | | | | | | Update id.msg
| * | | Update id.msgbLaDe2014-05-241-1/+1
| | | |
* | | | Merge pull request #361 from weiss/parse-ldap-dn-filterEvgeny Khramtsov2014-11-221-1/+1
|\ \ \ \ | | | | | | | | | | Fix parsing of "ldap_dn_filter" option
| * | | | Fix parsing of "ldap_dn_filter" optionHolger Weiss2014-11-221-1/+1
| | |/ / | |/| |
* | | | Merge pull request #360 from lbanders/masterEvgeny Khramtsov2014-11-201-2/+2
|\ \ \ \ | |/ / / |/| | | Fix for ejabbed bug #359 - now strings are formatted correctly.
| * | | Fix for ejabbed bug #359 - now strings are formatted correctly.Leif Bredgaard Honore2014-11-201-2/+2
|/ / /
* | | Merge pull request #351 from weiss/floating-muc-intervalsEvgeny Khramtsov2014-11-161-11/+13
|\ \ \ | |_|/ |/| | Support floating point message/presence intervals
| * | Support floating point message/presence intervalsHolger Weiss2014-11-151-11/+13
|/ / | | | | | | | | Let mod_muc support floating point values for "min_message_interval" and "min_presence_interval", as documented in the guide.
* | Merge pull request #345 from weiss/last-pep-itemsEvgeny Khramtsov2014-11-144-53/+114
|\ \ | | | | | | Fix sending of last published PEP items to newly-available resources
| * | Send last PEP items to remote subscribersHolger Weiss2014-11-142-16/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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".
| * | Don't broadcast last published PEP itemsHolger Weiss2014-11-144-11/+57
| | | | | | | | | | | | | | | 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.
| * | Move routing of last PEP items into new functionHolger Weiss2014-11-142-65/+50
| | | | | | | | | | | | This doesn't change the behavior, but avoids some code duplication.
| * | ODBC: Sync last item notifications with mod_pubsubHolger Weiss2014-11-141-2/+14
| | | | | | | | | | | | | | | | | | 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.
* | | Merge pull request #346 from weiss/fix-typeEvgeny Khramtsov2014-11-141-1/+1
|\ \ \ | |/ / |/| | Cosmetic fix: Use correct type for initial c2s #state.user value
| * | Use correct type for initial c2s #state.user valueHolger Weiss2014-11-141-1/+1
|/ /
* | Merge pull request #341 from sezuan/fix-kick-user-commandEvgeny Khramtsov2014-11-101-1/+1
|\ \ | | | | | | Fix kick_user command
| * | Fix kick_user commandMatthias Rieber2014-11-101-1/+1
|/ /
* | Merge pull request #340 from weiss/disable-mechanismsEvgeny Khramtsov2014-11-102-3/+30
|\ \ | | | | | | New option: disable_sasl_mechanisms
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-04 04:15:52 +0000