]> granicus.if.org Git - ejabberd/log
ejabberd
8 years agoRename option to regexp_room_id for consistency with other options (#905)
Badlop [Fri, 5 Feb 2016 11:08:40 +0000 (12:08 +0100)]
Rename option to regexp_room_id for consistency with other options (#905)

8 years agoadd room_id_regexp option
HAMANO Tsukasa [Thu, 14 Jan 2016 14:08:31 +0000 (23:08 +0900)]
add room_id_regexp option

8 years agoMake hibernate timeouts configurable
Pablo Polvorin [Thu, 4 Feb 2016 18:45:29 +0000 (15:45 -0300)]
Make hibernate timeouts configurable

Two *global* options added:
c2s_hibernate and receiver_hibernate.

Default if not specified is 90000, the previous hardcoded value.

8 years agoMerge pull request #943 from processone/deps-cleanup
Mickaël Rémond [Thu, 4 Feb 2016 14:48:56 +0000 (15:48 +0100)]
Merge pull request #943 from processone/deps-cleanup

Dependencies rework

8 years agoConvert tests to Fast XML
Mickael Remond [Wed, 3 Feb 2016 18:22:59 +0000 (19:22 +0100)]
Convert tests to Fast XML

8 years agoSwitch to Fast XML module
Mickael Remond [Wed, 3 Feb 2016 18:03:17 +0000 (19:03 +0100)]
Switch to Fast XML module

8 years agoHandle spaces in vsn attribute of app file when installing deps (#940)
Badlop [Wed, 3 Feb 2016 16:45:27 +0000 (17:45 +0100)]
Handle spaces in vsn attribute of app file when installing deps (#940)

8 years agoRemove reference to p1_logger
Mickael Remond [Wed, 3 Feb 2016 15:26:15 +0000 (16:26 +0100)]
Remove reference to p1_logger

8 years agoSwitch to fast_tls and update app names
Mickael Remond [Wed, 3 Feb 2016 15:13:16 +0000 (16:13 +0100)]
Switch to fast_tls and update app names

8 years agoConvert more dependencies to new repository / packages
Mickael Remond [Wed, 3 Feb 2016 11:30:12 +0000 (12:30 +0100)]
Convert more dependencies to new repository / packages

8 years agoProper name for included applications
Mickael Remond [Wed, 3 Feb 2016 10:31:23 +0000 (11:31 +0100)]
Proper name for included applications

8 years agoConvert code to use Fast YAML
Mickael Remond [Wed, 3 Feb 2016 10:30:48 +0000 (11:30 +0100)]
Convert code to use Fast YAML

8 years agoMove to new dependencies for SIP and STUN
Mickael Remond [Wed, 3 Feb 2016 10:26:14 +0000 (11:26 +0100)]
Move to new dependencies for SIP and STUN

8 years agoMove to new iconv package
Mickael Remond [Wed, 3 Feb 2016 10:17:16 +0000 (11:17 +0100)]
Move to new iconv package

8 years agoMove database dependencies to new repository / modules
Mickael Remond [Wed, 3 Feb 2016 10:10:11 +0000 (11:10 +0100)]
Move database dependencies to new repository / modules

8 years agoSyntax highlight file + comment on rebar_elixir_plugin
Mickael Remond [Wed, 3 Feb 2016 10:00:12 +0000 (11:00 +0100)]
Syntax highlight file + comment on rebar_elixir_plugin

8 years agoSwitch a few version to hex.pm version
Mickael Remond [Wed, 3 Feb 2016 09:55:40 +0000 (10:55 +0100)]
Switch a few version to hex.pm version

8 years agoRun ejabberd test on Erlang R18
Mickael Remond [Wed, 3 Feb 2016 09:16:05 +0000 (10:16 +0100)]
Run ejabberd test on Erlang R18

8 years agoUse stringprep app name
Mickael Remond [Wed, 3 Feb 2016 09:12:25 +0000 (10:12 +0100)]
Use stringprep app name

8 years agoMerge pull request #937 from Iperity/fix-presence-based-delivery
Christophe Romain [Tue, 2 Feb 2016 14:41:21 +0000 (15:41 +0100)]
Merge pull request #937 from Iperity/fix-presence-based-delivery

Fix presence-based delivery

8 years agoFix presence-based delivery
Nathan Bruning [Tue, 19 Jan 2016 22:48:48 +0000 (23:48 +0100)]
Fix presence-based delivery

8 years agoMore strict checking for MUC initial presence
Paweł Chmielowski [Mon, 1 Feb 2016 11:09:34 +0000 (12:09 +0100)]
More strict checking for MUC initial presence

8 years agoSend presence with code 170 only in initial presence from MUC
Paweł Chmielowski [Mon, 1 Feb 2016 10:30:17 +0000 (11:30 +0100)]
Send presence with code 170 only in initial presence from MUC

9 years agoAdd 'import_prosody' command
Evgeniy Khramtsov [Fri, 29 Jan 2016 11:30:50 +0000 (14:30 +0300)]
Add 'import_prosody' command

9 years agoImport privacy lists from Prosody
Evgeniy Khramtsov [Fri, 29 Jan 2016 11:14:08 +0000 (14:14 +0300)]
Import privacy lists from Prosody

9 years agoInitial version of migration script from Prosody to ejabberd
Evgeniy Khramtsov [Thu, 28 Jan 2016 11:23:51 +0000 (14:23 +0300)]
Initial version of migration script from Prosody to ejabberd

9 years agoNeed extra line before ## in markdown
Paweł Chmielowski [Wed, 27 Jan 2016 10:42:13 +0000 (11:42 +0100)]
Need extra line before ## in markdown

9 years agoAlways use lagger
Paweł Chmielowski [Tue, 26 Jan 2016 13:33:01 +0000 (14:33 +0100)]
Always use lagger

9 years agoSet set utf8mb4 charset on mysql connection
Christophe Romain [Tue, 26 Jan 2016 12:47:24 +0000 (13:47 +0100)]
Set set utf8mb4 charset on mysql connection

9 years agoAdd header to generated markdown file
Paweł Chmielowski [Tue, 26 Jan 2016 09:46:38 +0000 (10:46 +0100)]
Add header to generated markdown file

9 years agoAdd a way to get all ejabberd_commands, not only those that was registered
Paweł Chmielowski [Tue, 26 Jan 2016 09:00:11 +0000 (10:00 +0100)]
Add a way to get all ejabberd_commands, not only those that was registered

This is part of (TECH-1828).

9 years agoMerge branch 'master' of github.com:processone/ejabberd
Mickael Remond [Mon, 25 Jan 2016 22:28:33 +0000 (23:28 +0100)]
Merge branch 'master' of github.com:processone/ejabberd

9 years agoAs default, attempt to add path to Elixir
Mickael Remond [Mon, 25 Jan 2016 22:28:27 +0000 (23:28 +0100)]
As default, attempt to add path to Elixir

9 years agoGeenarte markdown that is acceptable by docs.ejabberd.org processor
Paweł Chmielowski [Mon, 25 Jan 2016 15:51:54 +0000 (16:51 +0100)]
Geenarte markdown that is acceptable by docs.ejabberd.org processor

9 years agoMerge branch 'master' of github.com:processone/ejabberd
Mickael Remond [Mon, 25 Jan 2016 09:47:29 +0000 (10:47 +0100)]
Merge branch 'master' of github.com:processone/ejabberd

9 years agoIf lager is false, we will use p1_logger
Mickael Remond [Mon, 25 Jan 2016 09:47:20 +0000 (10:47 +0100)]
If lager is false, we will use p1_logger

9 years agoUpdated Portuguese-Brazilian translation (thanks to Otávio Fernandes)
Badlop [Sun, 24 Jan 2016 18:59:53 +0000 (19:59 +0100)]
Updated Portuguese-Brazilian translation (thanks to Otávio Fernandes)

9 years agoAdd missing description
Mickael Remond [Sun, 24 Jan 2016 09:19:28 +0000 (10:19 +0100)]
Add missing description

9 years agoMerge branch 'master' of github.com:processone/ejabberd
Mickael Remond [Sun, 24 Jan 2016 09:07:25 +0000 (10:07 +0100)]
Merge branch 'master' of github.com:processone/ejabberd

9 years agoPrepare hex.pm release
Mickael Remond [Sun, 24 Jan 2016 09:07:12 +0000 (10:07 +0100)]
Prepare hex.pm release

9 years agoMerge pull request #919 from hamano/rename_timestamp_function
Paweł Chmielowski [Sun, 24 Jan 2016 06:51:25 +0000 (07:51 +0100)]
Merge pull request #919 from hamano/rename_timestamp_function

rename timestamp function #917

9 years agoejabberd will handle Mnesia start
Mickael Remond [Sat, 23 Jan 2016 18:00:22 +0000 (19:00 +0100)]
ejabberd will handle Mnesia start

Mix need to know if must not autostart Mnesia before ejabberd

9 years agolager is the default logger, we need to reverse the define flag
Mickael Remond [Sat, 23 Jan 2016 17:57:29 +0000 (18:57 +0100)]
lager is the default logger, we need to reverse the define flag

Also make sure that configure without option does not force lager to false

9 years agoMix requires override
Mickael Remond [Sat, 23 Jan 2016 17:44:38 +0000 (18:44 +0100)]
Mix requires override

9 years agolager is the default logger, we need to reverse the define flag
Mickael Remond [Sat, 23 Jan 2016 17:43:06 +0000 (18:43 +0100)]
lager is the default logger, we need to reverse the define flag

9 years agoMake sure all version are consistent before big repositories changes
Mickael Remond [Sat, 23 Jan 2016 17:42:16 +0000 (18:42 +0100)]
Make sure all version are consistent before big repositories changes

9 years agoMake sure mix does not trigger conflict on p1_utils
Mickael Remond [Sat, 23 Jan 2016 16:36:40 +0000 (17:36 +0100)]
Make sure mix does not trigger conflict on p1_utils

9 years agoUpdate Elixir dependency to latest p1_utils and cache_tab
Mickael Remond [Sat, 23 Jan 2016 16:29:18 +0000 (17:29 +0100)]
Update Elixir dependency to latest p1_utils and cache_tab

9 years agorename timestamp function #917
HAMANO Tsukasa [Sat, 23 Jan 2016 08:56:12 +0000 (17:56 +0900)]
rename timestamp function #917

9 years agoAdd missing ref key
Christophe Romain [Thu, 21 Jan 2016 11:56:03 +0000 (12:56 +0100)]
Add missing ref key

9 years agoFix order of arguments references
Badlop [Wed, 20 Jan 2016 18:43:12 +0000 (19:43 +0100)]
Fix order of arguments references

9 years agoMerge pull request #915 from fotock/master
badlop [Wed, 20 Jan 2016 18:38:54 +0000 (19:38 +0100)]
Merge pull request #915 from fotock/master

Update translations

9 years agoMerge pull request #1 from fotock/fotock-patch-1
Shelley Shyan [Wed, 20 Jan 2016 17:02:28 +0000 (01:02 +0800)]
Merge pull request #1 from fotock/fotock-patch-1

Update zh.po

9 years agoUpdate zh.po
Shelley Shyan [Wed, 20 Jan 2016 17:01:14 +0000 (01:01 +0800)]
Update zh.po

Translated untranslated. Fixed fuzzy messages. Other fixes.

9 years agoUpdate zh.po
Shelley Shyan [Wed, 20 Jan 2016 15:07:45 +0000 (23:07 +0800)]
Update zh.po

to be continued

9 years agoFix fuzzy tag in correct string
Badlop [Tue, 19 Jan 2016 21:34:58 +0000 (22:34 +0100)]
Fix fuzzy tag in correct string

9 years agoAdd error handling to send_stanza
Christophe Romain [Tue, 19 Jan 2016 15:16:04 +0000 (16:16 +0100)]
Add error handling to send_stanza

9 years agomod_mam: Strip existing JID tags from MUC messages
Holger Weiss [Mon, 18 Jan 2016 23:39:10 +0000 (00:39 +0100)]
mod_mam: Strip existing JID tags from MUC messages

Strip any pre-existing <x/> tags which have an <item/> child with a
'jid' attribute from MUC MAM messages.  This way, if such a tag exists,
clients can be sure it was added by mod_mam.

9 years agoUpdate Czech translation (thanks to Jan Pinkas)
Badlop [Mon, 18 Jan 2016 18:09:58 +0000 (19:09 +0100)]
Update Czech translation (thanks to Jan Pinkas)

9 years agoUpdate Walon translation (thanks to Pablo Saratxaga)
Badlop [Mon, 18 Jan 2016 17:42:58 +0000 (18:42 +0100)]
Update Walon translation (thanks to Pablo Saratxaga)

9 years agoUpdate Ukrainian translation (thanks to Oleg Deordiev)
Badlop [Mon, 18 Jan 2016 17:42:28 +0000 (18:42 +0100)]
Update Ukrainian translation (thanks to Oleg Deordiev)

9 years agoMake C2S session establishment optional (ECS-11)
Alexey Shchepin [Mon, 18 Jan 2016 13:33:37 +0000 (16:33 +0300)]
Make C2S session establishment optional (ECS-11)

9 years agomod_mam: Remove unused code
Holger Weiss [Mon, 18 Jan 2016 12:27:29 +0000 (13:27 +0100)]
mod_mam: Remove unused code

This mod_mam version doesn't store groupchat messages in user archives,
and it also doesn't support the "store_body_only" option.

9 years agoUpdate polish localisation
Paweł Chmielowski [Mon, 18 Jan 2016 12:18:40 +0000 (13:18 +0100)]
Update polish localisation

9 years agoMake --disable-debug work again
Paweł Chmielowski [Mon, 18 Jan 2016 12:10:12 +0000 (13:10 +0100)]
Make --disable-debug work again

9 years agoMerge remote-tracking branch 'processone/pr/907'
Holger Weiss [Sat, 16 Jan 2016 23:08:30 +0000 (00:08 +0100)]
Merge remote-tracking branch 'processone/pr/907'

* processone/pr/907:
  don't escape ERL_OPTIONS

9 years agoUse maps instead of dicts in HTTP upload modules
Holger Weiss [Sat, 16 Jan 2016 00:30:22 +0000 (01:30 +0100)]
Use maps instead of dicts in HTTP upload modules

ejabberd currently depends on Erlang/OTP 17.1 or higher, so we can now
use maps.

9 years agoMerge pull request #906 from hamano/stats_processes
badlop [Fri, 15 Jan 2016 18:26:23 +0000 (19:26 +0100)]
Merge pull request #906 from hamano/stats_processes

add stats processes command

9 years agoMerge pull request #911 from hamano/ja
badlop [Fri, 15 Jan 2016 18:21:53 +0000 (19:21 +0100)]
Merge pull request #911 from hamano/ja

update japanese translation

9 years agoupdate japanese translation
HAMANO Tsukasa [Fri, 15 Jan 2016 15:35:23 +0000 (00:35 +0900)]
update japanese translation

9 years agoupdate japanese translation
HAMANO Tsukasa [Fri, 15 Jan 2016 15:15:24 +0000 (00:15 +0900)]
update japanese translation

9 years agoFix records in mod_muc.hrl
Evgeniy Khramtsov [Fri, 15 Jan 2016 12:46:07 +0000 (15:46 +0300)]
Fix records in mod_muc.hrl

9 years agoInclude mod_muc.hrl
Evgeniy Khramtsov [Fri, 15 Jan 2016 12:38:59 +0000 (15:38 +0300)]
Include mod_muc.hrl

9 years agoDo not redefine records
Evgeniy Khramtsov [Fri, 15 Jan 2016 12:34:48 +0000 (15:34 +0300)]
Do not redefine records

9 years agoDescribe option type of 'domain_balancing'
Evgeniy Khramtsov [Fri, 15 Jan 2016 11:32:10 +0000 (14:32 +0300)]
Describe option type of 'domain_balancing'

9 years agoUpdate Spanish and Catalan translation
Badlop [Fri, 15 Jan 2016 11:27:22 +0000 (12:27 +0100)]
Update Spanish and Catalan translation

9 years agoUpdate translations files
Badlop [Fri, 15 Jan 2016 09:40:49 +0000 (10:40 +0100)]
Update translations files

9 years agoXEP-0198: Let MAM take care of pending messages
Holger Weiss [Fri, 15 Jan 2016 00:08:22 +0000 (01:08 +0100)]
XEP-0198: Let MAM take care of pending messages

If a stream management session times out for a user who appears to be
using MAM, drop any unacknowledged messages rather than resending or
bouncing them.  This avoids duplicates or bogus error messages.

However, this is only done if the new mod_mam option "assume_mam_usage"
is set to 'if_enabled' or 'on_request'.  In the former case, a user is
assumed to be using MAM if archiving is enabled for his account.  In the
latter case, MAM usage is assumed only if archiving was explicitly
requested by the client, or if archiving was enabled by means of
mod_mam's "request_activates_archiving" option.

9 years agodon't escape ERL_OPTIONS
HAMANO Tsukasa [Thu, 14 Jan 2016 14:10:01 +0000 (23:10 +0900)]
don't escape ERL_OPTIONS

9 years agoadd stats processes command
HAMANO Tsukasa [Thu, 14 Jan 2016 14:09:03 +0000 (23:09 +0900)]
add stats processes command

9 years agomod_mam: Sort messages returned by Mnesia
Holger Weiss [Thu, 14 Jan 2016 01:27:02 +0000 (02:27 +0100)]
mod_mam: Sort messages returned by Mnesia

Sort the messages retrieved from an Mnesia archive before selecting the
subset limited by the <max/> value.  This makes sure the desired subset
of messages is sent to the client.

9 years agomod_mam: Limit result set page size
Holger Weiss [Thu, 14 Jan 2016 01:12:28 +0000 (02:12 +0100)]
mod_mam: Limit result set page size

If the client doesn't specify a maximum number of messages to retrieve
per page, set a limit of 50 messages.  If the client specifies a limit
larger than 250, cap the number to 250 messages.

These limits aren't enforced for MAM v0.2 requests though, as that
version of the XEP doesn't require clients to support RSM.  The newer
revisions say that "a server MAY place a reasonable limit on how many
stanzas may be pushed to a client in one request.  Whether or not the
client query included a <set/> element, the server MAY simply return its
limited results, modifying the <set/> element it returns appropriately."

9 years agomod_mam: Reject <index/>-based paging
Holger Weiss [Thu, 14 Jan 2016 00:39:19 +0000 (01:39 +0100)]
mod_mam: Reject <index/>-based paging

If an <index/> is specified in the MAM request, reject the request
rather than ignoring the desired index and returning wrong results.
XEP-0059 says that the server "MAY return a <feature-not-implemented/>
error."

9 years agomod_mam: Remove unused variable
Holger Weiss [Thu, 14 Jan 2016 00:15:11 +0000 (01:15 +0100)]
mod_mam: Remove unused variable

9 years agomod_mam: Check whether MUC message is desired
Holger Weiss [Thu, 14 Jan 2016 00:13:16 +0000 (01:13 +0100)]
mod_mam: Check whether MUC message is desired

9 years agomod_mam: Support XEP-0313 v0.2 MUC archive queries
Holger Weiss [Wed, 13 Jan 2016 23:58:48 +0000 (00:58 +0100)]
mod_mam: Support XEP-0313 v0.2 MUC archive queries

9 years agomod_mam: Respond to form requests
Holger Weiss [Wed, 13 Jan 2016 22:56:05 +0000 (23:56 +0100)]
mod_mam: Respond to form requests

If the client requests a data form with the supported filters, return it
as per XEP-0313 v0.3 and newer.

9 years agomod_mam: Add 'from' attribute to <delay/> tag
Holger Weiss [Wed, 13 Jan 2016 22:17:23 +0000 (23:17 +0100)]
mod_mam: Add 'from' attribute to <delay/> tag

9 years agomod_mam: Improve binary comparison of message UIDs
Holger Weiss [Wed, 13 Jan 2016 22:01:51 +0000 (23:01 +0100)]
mod_mam: Improve binary comparison of message UIDs

Make sure the binary comparison performed when clients use message UIDs
to page through Mnesia archives yields correct results even if the
specified UIDs don't have the same number of digits as the UIDs of the
stored messages.  This way, MAM will continue to work as expected after
migrating from mod_mam_mnesia to mod_mam.

9 years agomod_mam: Add "delete_old_mam_messages" command
Holger Weiss [Wed, 13 Jan 2016 21:46:30 +0000 (22:46 +0100)]
mod_mam: Add "delete_old_mam_messages" command

The new "delete_old_mam_messages" command allows for purging all MAM
messages of the specified type older than the specified number of days.
(Currently only implemented for Mnesia archives.)

9 years agomod_mam: Add "request_activates_archiving" option
Holger Weiss [Wed, 13 Jan 2016 20:38:08 +0000 (21:38 +0100)]
mod_mam: Add "request_activates_archiving" option

Enabling "request_activates_archiving" tells mod_mam not to store any
messages for a user until his client issued a MAM request, regardless of
mod_mam's "default" option.  Once a MAM request is issued, messages are
archived as usual.

9 years agoAdvertise MUC MAM v0.4.1 in room JID's disco#info
Holger Weiss [Wed, 13 Jan 2016 19:30:44 +0000 (20:30 +0100)]
Advertise MUC MAM v0.4.1 in room JID's disco#info

9 years agoUpdate copyright to 2016 (#901)
Badlop [Wed, 13 Jan 2016 11:29:14 +0000 (12:29 +0100)]
Update copyright to 2016 (#901)

9 years agoLog failed SQL requests
Evgeniy Khramtsov [Wed, 13 Jan 2016 09:59:00 +0000 (12:59 +0300)]
Log failed SQL requests

9 years agoFix MAM MUC for v0.4.1
Evgeniy Khramtsov [Wed, 13 Jan 2016 08:45:08 +0000 (11:45 +0300)]
Fix MAM MUC for v0.4.1

9 years agoMerge pull request #900 from weiss/suppress-groupchat-error 16.01
Evgeny Khramtsov [Tue, 12 Jan 2016 11:07:58 +0000 (14:07 +0300)]
Merge pull request #900 from weiss/suppress-groupchat-error

Don't return error for blocked headlines and MUC messages

9 years agoDon't return error for blocked MUC messages
Holger Weiß [Tue, 12 Jan 2016 09:20:35 +0000 (10:20 +0100)]
Don't return error for blocked MUC messages

If a message stanza is blocked as per XEP-0016 or XEP-0191, return an
error only if the type of the blocked message is "normal" or "chat".
This makes sure users won't be kicked from MUC rooms when blocking other
participants.

Closes #897.

9 years agoMerge remote-tracking branch 'processone/pr/899'
Holger Weiss [Mon, 11 Jan 2016 11:38:51 +0000 (12:38 +0100)]
Merge remote-tracking branch 'processone/pr/899'

* processone/pr/899:
  mod_http_upload: Use application/octet-stream instead of text/html for security reasons

9 years agoDo not fail on incorrect data coming from SQL (898)
Evgeniy Khramtsov [Mon, 11 Jan 2016 11:35:11 +0000 (14:35 +0300)]
Do not fail on incorrect data coming from SQL (898)

9 years agoCVE-2016-1232: Add Dialback Key Generation and Validation support (XEP-0185)
Evgeniy Khramtsov [Mon, 11 Jan 2016 11:22:17 +0000 (14:22 +0300)]
CVE-2016-1232: Add Dialback Key Generation and Validation support (XEP-0185)