Mickael Remond [Sat, 23 Jan 2016 17:44:38 +0000 (18:44 +0100)]
Mix requires override
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
Mickael Remond [Sat, 23 Jan 2016 17:42:16 +0000 (18:42 +0100)]
Make sure all version are consistent before big repositories changes
Mickael Remond [Sat, 23 Jan 2016 16:36:40 +0000 (17:36 +0100)]
Make sure mix does not trigger conflict on p1_utils
Mickael Remond [Sat, 23 Jan 2016 16:29:18 +0000 (17:29 +0100)]
Update Elixir dependency to latest p1_utils and cache_tab
Christophe Romain [Thu, 21 Jan 2016 11:56:03 +0000 (12:56 +0100)]
Add missing ref key
Badlop [Wed, 20 Jan 2016 18:43:12 +0000 (19:43 +0100)]
Fix order of arguments references
badlop [Wed, 20 Jan 2016 18:38:54 +0000 (19:38 +0100)]
Merge pull request #915 from fotock/master
Update translations
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
Shelley Shyan [Wed, 20 Jan 2016 17:01:14 +0000 (01:01 +0800)]
Update zh.po
Translated untranslated. Fixed fuzzy messages. Other fixes.
Shelley Shyan [Wed, 20 Jan 2016 15:07:45 +0000 (23:07 +0800)]
Update zh.po
to be continued
Badlop [Tue, 19 Jan 2016 21:34:58 +0000 (22:34 +0100)]
Fix fuzzy tag in correct string
Christophe Romain [Tue, 19 Jan 2016 15:16:04 +0000 (16:16 +0100)]
Add error handling to send_stanza
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.
Badlop [Mon, 18 Jan 2016 18:09:58 +0000 (19:09 +0100)]
Update Czech translation (thanks to Jan Pinkas)
Badlop [Mon, 18 Jan 2016 17:42:58 +0000 (18:42 +0100)]
Update Walon translation (thanks to Pablo Saratxaga)
Badlop [Mon, 18 Jan 2016 17:42:28 +0000 (18:42 +0100)]
Update Ukrainian translation (thanks to Oleg Deordiev)
Alexey Shchepin [Mon, 18 Jan 2016 13:33:37 +0000 (16:33 +0300)]
Make C2S session establishment optional (ECS-11)
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.
Paweł Chmielowski [Mon, 18 Jan 2016 12:18:40 +0000 (13:18 +0100)]
Update polish localisation
Paweł Chmielowski [Mon, 18 Jan 2016 12:10:12 +0000 (13:10 +0100)]
Make --disable-debug work again
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
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.
badlop [Fri, 15 Jan 2016 18:26:23 +0000 (19:26 +0100)]
Merge pull request #906 from hamano/stats_processes
add stats processes command
badlop [Fri, 15 Jan 2016 18:21:53 +0000 (19:21 +0100)]
Merge pull request #911 from hamano/ja
update japanese translation
HAMANO Tsukasa [Fri, 15 Jan 2016 15:35:23 +0000 (00:35 +0900)]
update japanese translation
HAMANO Tsukasa [Fri, 15 Jan 2016 15:15:24 +0000 (00:15 +0900)]
update japanese translation
Evgeniy Khramtsov [Fri, 15 Jan 2016 12:46:07 +0000 (15:46 +0300)]
Fix records in mod_muc.hrl
Evgeniy Khramtsov [Fri, 15 Jan 2016 12:38:59 +0000 (15:38 +0300)]
Include mod_muc.hrl
Evgeniy Khramtsov [Fri, 15 Jan 2016 12:34:48 +0000 (15:34 +0300)]
Do not redefine records
Evgeniy Khramtsov [Fri, 15 Jan 2016 11:32:10 +0000 (14:32 +0300)]
Describe option type of 'domain_balancing'
Badlop [Fri, 15 Jan 2016 11:27:22 +0000 (12:27 +0100)]
Update Spanish and Catalan translation
Badlop [Fri, 15 Jan 2016 09:40:49 +0000 (10:40 +0100)]
Update translations files
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.
HAMANO Tsukasa [Thu, 14 Jan 2016 14:10:01 +0000 (23:10 +0900)]
don't escape ERL_OPTIONS
HAMANO Tsukasa [Thu, 14 Jan 2016 14:09:03 +0000 (23:09 +0900)]
add stats processes command
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.
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."
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."
Holger Weiss [Thu, 14 Jan 2016 00:15:11 +0000 (01:15 +0100)]
mod_mam: Remove unused variable
Holger Weiss [Thu, 14 Jan 2016 00:13:16 +0000 (01:13 +0100)]
mod_mam: Check whether MUC message is desired
Holger Weiss [Wed, 13 Jan 2016 23:58:48 +0000 (00:58 +0100)]
mod_mam: Support XEP-0313 v0.2 MUC archive queries
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.
Holger Weiss [Wed, 13 Jan 2016 22:17:23 +0000 (23:17 +0100)]
mod_mam: Add 'from' attribute to <delay/> tag
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.
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.)
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.
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
Badlop [Wed, 13 Jan 2016 11:29:14 +0000 (12:29 +0100)]
Update copyright to 2016 (#901)
Evgeniy Khramtsov [Wed, 13 Jan 2016 09:59:00 +0000 (12:59 +0300)]
Log failed SQL requests
Evgeniy Khramtsov [Wed, 13 Jan 2016 08:45:08 +0000 (11:45 +0300)]
Fix MAM MUC for v0.4.1
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
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.
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
Evgeniy Khramtsov [Mon, 11 Jan 2016 11:35:11 +0000 (14:35 +0300)]
Do not fail on incorrect data coming from SQL (898)
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)
Matthias Rieber [Mon, 11 Jan 2016 11:11:24 +0000 (12:11 +0100)]
mod_http_upload: Use application/octet-stream instead of text/html for security reasons
Badlop [Fri, 8 Jan 2016 12:14:10 +0000 (13:14 +0100)]
Update Hebrew translation (thanks to Genghis Khan)
Badlop [Fri, 8 Jan 2016 12:13:30 +0000 (13:13 +0100)]
Clarify a little more room error string (thanks to Genghis Khan)
Christophe Romain [Fri, 8 Jan 2016 10:22:59 +0000 (11:22 +0100)]
Fix 'make install' to work on osx
Paweł Chmielowski [Thu, 7 Jan 2016 17:49:55 +0000 (18:49 +0100)]
Add version sufixes to application locations in 'make install'
Paweł Chmielowski [Thu, 7 Jan 2016 13:10:54 +0000 (14:10 +0100)]
Extract deps from rebar.config to use in reltool.config.script
Christophe Romain [Wed, 6 Jan 2016 15:03:10 +0000 (16:03 +0100)]
We need to checkout elixir first when elixir enabled
Christophe Romain [Wed, 6 Jan 2016 11:27:43 +0000 (12:27 +0100)]
Update mix deps
Paweł Chmielowski [Wed, 6 Jan 2016 11:06:28 +0000 (12:06 +0100)]
Update deps in reltool.config.scripts
Holger Weiss [Tue, 5 Jan 2016 23:12:36 +0000 (00:12 +0100)]
mod_http_upload: Use full PUT URL for process name
Don't just use the "put_url" domain name, but also any path components
of the specified URL, to generate a mod_http_upload process name. This
way, a single domain name can be used for multiple virtual hosts by
specifying a "put_url" such as "https://example.com/@HOST@/".
Holger Weiss [Tue, 5 Jan 2016 21:06:34 +0000 (22:06 +0100)]
mod_http_upload: Rename variable for clarity
Christophe Romain [Tue, 5 Jan 2016 15:00:47 +0000 (16:00 +0100)]
Update dependencies
Badlop [Tue, 5 Jan 2016 11:29:13 +0000 (12:29 +0100)]
Error converting times in mod_fail2ban (#889)
Paweł Chmielowski [Mon, 4 Jan 2016 21:06:19 +0000 (22:06 +0100)]
Fix handling of some options in old style configs
This fixes issue #893.
Paweł Chmielowski [Mon, 4 Jan 2016 11:13:18 +0000 (12:13 +0100)]
Improve escaping of arguments passed to ejabberdctl
This fixes issue #804
Alexey Shchepin [Mon, 4 Jan 2016 10:55:25 +0000 (13:55 +0300)]
Use crypto:rand_uniform instead of random:uniform
Holger Weiss [Mon, 4 Jan 2016 00:01:14 +0000 (01:01 +0100)]
mod_http_upload: Fix logging of file size mismatch
Holger Weiss [Sun, 3 Jan 2016 22:35:41 +0000 (23:35 +0100)]
ejabberdctl: Call erl without -pa argument
The path to ejabberd's ebin directories is now specified by setting the
ERL_LIBS variable.
Holger Weiss [Sat, 2 Jan 2016 20:27:48 +0000 (21:27 +0100)]
mod_admin_extra: Replace deprecated function calls
Holger Weiss [Sat, 2 Jan 2016 19:57:01 +0000 (20:57 +0100)]
mod_muc_admin: Allow for setting MAM option
Fixes #890.
Badlop [Wed, 30 Dec 2015 11:53:40 +0000 (12:53 +0100)]
New send_stanza command (ejabberd_contrib#142)
Holger Weiss [Tue, 29 Dec 2015 10:11:50 +0000 (11:11 +0100)]
mod_muc_room: Replace deprecated function call
Holger Weiss [Tue, 29 Dec 2015 08:54:48 +0000 (09:54 +0100)]
mod_mam: Use <stanza-id/> tags for deduplication
Use <stanza-id/> elements instead of <delay/> tags to check for messages
resent by the stream management code. The <stanza-id/> element is
preferable, as it is added by mod_mam itself.
Badlop [Mon, 28 Dec 2015 14:09:49 +0000 (15:09 +0100)]
Update translations
Badlop [Mon, 28 Dec 2015 14:08:59 +0000 (15:08 +0100)]
Improve explanation in registration page (#876)
Paweł Chmielowski [Mon, 28 Dec 2015 11:19:49 +0000 (12:19 +0100)]
Add commands for generating html or markdown documentation for commands
Evgeniy Khramtsov [Thu, 24 Dec 2015 12:01:33 +0000 (15:01 +0300)]
Restrict access to MAM archives for members-only rooms
Badlop [Wed, 23 Dec 2015 19:54:40 +0000 (20:54 +0100)]
Support binary strings in extract_translations
Badlop [Wed, 23 Dec 2015 18:34:23 +0000 (19:34 +0100)]
Degenderise room error message (#747)
Paweł Chmielowski [Wed, 23 Dec 2015 13:11:49 +0000 (14:11 +0100)]
Update set-dep-versions script to work with new rebar.config
Holger Weiss [Tue, 22 Dec 2015 12:20:23 +0000 (13:20 +0100)]
Revert "mod_mam: Keep 'to' attribute for MUC MAM messages"
This reverts commit
0e330da2a631aad97ab634014c7a272a5c0a0b71. XEP-0313
says: "When sending out the archives to a requesting client, the 'to' of
the forwarded stanza MUST be empty".
Paweł Chmielowski [Tue, 22 Dec 2015 10:48:25 +0000 (11:48 +0100)]
Use built-in nif for integer_to_binary/binary_to_integer
Badlop [Mon, 21 Dec 2015 15:19:24 +0000 (16:19 +0100)]
Adding WEBIRC, custom realname & ident, ISO-8859-15 (thanks to iwalkalone69)(#877)
Alexey Shchepin [Sun, 20 Dec 2015 23:23:50 +0000 (02:23 +0300)]
Support presence_broadcast in default_room_options mod_muc option
Holger Weiss [Sun, 20 Dec 2015 22:30:11 +0000 (23:30 +0100)]
ejabberd_http: Cope with large POST/PUT requests
gen_tcp returns 'enomem' if we try to receive more than 64 MiB.
Holger Weiss [Sun, 20 Dec 2015 22:26:57 +0000 (23:26 +0100)]
ejabberd_http: Log debug message on receive errors
Paweł Chmielowski [Fri, 18 Dec 2015 16:20:18 +0000 (17:20 +0100)]
Add --enable-latest-deps to configure
This option make 'rebar get-deps' command to always fetch latest versions
of deps that are developed together with ejabberd instead of using frozen
commit/branch/tag.
Paweł Chmielowski [Fri, 18 Dec 2015 16:17:13 +0000 (17:17 +0100)]
Convert rebar.config.script to more declarative format
Christophe Romain [Thu, 17 Dec 2015 09:16:17 +0000 (10:16 +0100)]
Fix pubsub virtual nodetree plugin
Christophe Romain [Wed, 16 Dec 2015 16:04:45 +0000 (17:04 +0100)]
Fix last item message type as message attribute
Christophe Romain [Wed, 16 Dec 2015 15:19:35 +0000 (16:19 +0100)]
Use correct notification_type for last items (#827)
Alexey Shchepin [Wed, 16 Dec 2015 14:26:44 +0000 (17:26 +0300)]
Add accept_interval option in ejabberd_listener
Christophe Romain [Wed, 16 Dec 2015 12:01:12 +0000 (13:01 +0100)]
Merge branch 'master' of github.com:processone/ejabberd
Christophe Romain [Wed, 16 Dec 2015 11:56:06 +0000 (12:56 +0100)]
Don't read pubsub options when plugin does not use them
This also revert commit
6052f7b