Holger Weiss [Sat, 17 Oct 2015 21:15:31 +0000 (23:15 +0200)]
ejabberd_c2s: Let stop/1 close XEP-0198 sessions
The stop/1 function now terminates stream management sessions
immediately, just as it does for other sessions. The new
ejabberd_c2s:close/1 function can be used to close the socket without
terminating the stream management session, like stop/1 did before.
Holger Weiss [Sat, 17 Oct 2015 20:07:29 +0000 (22:07 +0200)]
ejabberd_c2s: Close socket when waiting for resume
Make sure the socket is closed when mod_ping calls ejabberd_c2s:stop/1
for an XEP-0198 session.
Paweł Chmielowski [Thu, 15 Oct 2015 13:08:45 +0000 (15:08 +0200)]
Use OTP directory structure for 'make install'
Paweł Chmielowski [Thu, 15 Oct 2015 08:07:06 +0000 (10:07 +0200)]
Make KEEPALIVE_QUERY list as this is what sql_query/3 expects
Alexey Shchepin [Mon, 12 Oct 2015 17:53:52 +0000 (20:53 +0300)]
Fix cyrsasl_oauth:mech_new call
Christophe Romain [Mon, 12 Oct 2015 08:41:07 +0000 (10:41 +0200)]
Remove obsolete sasl init
Evgeniy Khramtsov [Sun, 11 Oct 2015 16:42:53 +0000 (19:42 +0300)]
Advertise MAM (XEP-0313) v0.4 support in room disco
Paweł Chmielowski [Thu, 8 Oct 2015 11:07:00 +0000 (13:07 +0200)]
Be able to merge old style configs with {listen,...}
Paweł Chmielowski [Wed, 7 Oct 2015 14:44:49 +0000 (16:44 +0200)]
Handler module shouldn't be used for differentiating listeners when merging configs
Christophe Romain [Wed, 7 Oct 2015 14:14:45 +0000 (16:14 +0200)]
Enforce get_allowed_items_call
Christophe Romain [Wed, 7 Oct 2015 13:12:15 +0000 (15:12 +0200)]
Fix acl issue from cleanup
Christophe Romain [Tue, 6 Oct 2015 22:19:42 +0000 (00:19 +0200)]
Revert "Avoid crypto:hmac/3 call for R15B compatibility"
This reverts commit
31e356c126cd5b967df9e7b560ce63f2b3b1529b.
Christophe Romain [Tue, 6 Oct 2015 22:19:32 +0000 (00:19 +0200)]
Revert "Fix compilation on Erlang R15B"
This reverts commit
a5d6044448ad651581db47b33c6991e8ef32eb61.
Christophe Romain [Tue, 6 Oct 2015 22:06:58 +0000 (00:06 +0200)]
cosmetic cleanup
Christophe Romain [Tue, 6 Oct 2015 09:06:04 +0000 (11:06 +0200)]
Remove unused dependency
Evgeniy Khramtsov [Wed, 12 Aug 2015 13:58:56 +0000 (16:58 +0300)]
Avoid MAM dups when routing to multiple resources
Evgeniy Khramtsov [Thu, 20 Aug 2015 16:15:16 +0000 (19:15 +0300)]
Fix force_update_presence
Mickael Remond [Fri, 2 Oct 2015 08:40:55 +0000 (10:40 +0200)]
We want oauth2 to be supported as default in Elixir environment
Paweł Chmielowski [Thu, 1 Oct 2015 19:09:03 +0000 (21:09 +0200)]
Fix problem with --auth in ejabberd_ctl:process2/2
Paweł Chmielowski [Thu, 1 Oct 2015 12:33:39 +0000 (14:33 +0200)]
Switch macros resolving in config files to be global instead of per file
Mickaël Rémond [Tue, 29 Sep 2015 20:37:15 +0000 (22:37 +0200)]
Merge pull request #753 from scrogson/add_links
Add License and Links for display on hex.pm
Mickaël Rémond [Tue, 29 Sep 2015 20:36:02 +0000 (22:36 +0200)]
Merge pull request #755 from scrogson/fix_ejabberd_directory_name
Use lowecase directory name for lib/ejabberd
Sonny Scroggin [Tue, 29 Sep 2015 19:08:39 +0000 (14:08 -0500)]
Use lowecase directory name for lib/ejabberd
Evgeny Khramtsov [Tue, 29 Sep 2015 18:27:49 +0000 (21:27 +0300)]
Merge pull request #754 from scrogson/gitignore
Ignore mnesiadb and _build
Sonny Scroggin [Tue, 29 Sep 2015 18:21:35 +0000 (13:21 -0500)]
Ignore mnesiadb and _build
Sonny Scroggin [Tue, 29 Sep 2015 18:19:35 +0000 (13:19 -0500)]
clean up whitespace
Sonny Scroggin [Tue, 29 Sep 2015 18:18:49 +0000 (13:18 -0500)]
Add additional package information for hex.pm
Paweł Chmielowski [Tue, 29 Sep 2015 13:33:49 +0000 (15:33 +0200)]
Temporary switch to fork of oauth2 that compiles with r18
Christophe Romain [Tue, 29 Sep 2015 12:21:57 +0000 (14:21 +0200)]
Set version 15.09 for mix
Badlop [Tue, 29 Sep 2015 06:19:44 +0000 (08:19 +0200)]
Recompile translations
Alexey Shchepin [Mon, 28 Sep 2015 12:25:43 +0000 (15:25 +0300)]
Update several commands for recent ejabberd_commands changes
Paweł Chmielowski [Mon, 28 Sep 2015 08:08:15 +0000 (10:08 +0200)]
oauth uses jiffy so fetch it unconditionally
Alexey Shchepin [Fri, 25 Sep 2015 16:47:27 +0000 (19:47 +0300)]
Add oauth_access option
Badlop [Fri, 25 Sep 2015 15:00:00 +0000 (17:00 +0200)]
Strip Nick element in message stanzas sent to a room (#686)
Paweł Chmielowski [Fri, 25 Sep 2015 14:39:47 +0000 (16:39 +0200)]
Enable oauth unconditionally
Christophe Romain [Fri, 25 Sep 2015 14:08:34 +0000 (16:08 +0200)]
Revert "Remove "--enable-json" flag"
This reverts commit
5bb137940c11fbd5d0c4da493e3a4560fbfe2d97.
This is needed for mod_http_api
Christophe Romain [Fri, 25 Sep 2015 12:53:25 +0000 (14:53 +0200)]
Add OAuth support (thanks to Aleksey)
Christophe Romain [Fri, 25 Sep 2015 12:20:37 +0000 (14:20 +0200)]
Merge pull request #742 from joudinet/master
Allow root to run join_cluster and leave_cluster
Badlop [Fri, 25 Sep 2015 11:35:03 +0000 (13:35 +0200)]
Fix calling problem introduced when reducing bashisms (#748)
badlop [Thu, 24 Sep 2015 17:26:03 +0000 (19:26 +0200)]
Merge pull request #748 from joudinet/bashisms
Remove bashisms in {join,leave}cluster scripts
Badlop [Thu, 24 Sep 2015 15:21:14 +0000 (17:21 +0200)]
Fix regression introduced when code was binarized (EJAB-641)
Johan Oudinet [Thu, 24 Sep 2015 13:09:39 +0000 (15:09 +0200)]
Remove bashisms in {join,leave}cluster scripts
So they can run in any POSIX shell, not bash only.
Holger Weiss [Thu, 24 Sep 2015 10:00:59 +0000 (12:00 +0200)]
Log TLS errors as [debug] messages only
Closes #652 and closes #679.
Evgeniy Khramtsov [Tue, 22 Sep 2015 18:15:34 +0000 (21:15 +0300)]
Add <stanza-id/> (XEP-0359) to archived messages
Johan Oudinet [Tue, 22 Sep 2015 15:07:39 +0000 (17:07 +0200)]
Allow root to run join_cluster and leave_cluster
Prefix the call to joincluster and leavecluster in ejabberdctl by
$EXEC_CMD. Avoid using sh -c in these scripts.
Should fix #676.
Paweł Chmielowski [Tue, 22 Sep 2015 13:42:34 +0000 (15:42 +0200)]
Set disable caching headers in http-bind responses (EJAB-1643)
Paweł Chmielowski [Tue, 22 Sep 2015 13:33:31 +0000 (15:33 +0200)]
Nameprep host name passed to http-bind before using in (EJAB-1658)
Christophe Romain [Tue, 22 Sep 2015 10:49:55 +0000 (12:49 +0200)]
Improve external module configuration management (EJAB-1746)
Evgeniy Khramtsov [Tue, 22 Sep 2015 09:18:06 +0000 (12:18 +0300)]
Add MAM (XEP-0313) v0.4 support
Christophe Romain [Mon, 21 Sep 2015 15:51:13 +0000 (17:51 +0200)]
Avoid wrong failing cases on make install (#468)
Jerome Sautret [Mon, 21 Sep 2015 15:07:44 +0000 (17:07 +0200)]
Add set_loglevel command (EJABS-2524)
Christophe Romain [Fri, 18 Sep 2015 07:06:51 +0000 (09:06 +0200)]
Merge branch 'master' of github.com:processone/ejabberd
Christophe Romain [Fri, 4 Sep 2015 10:36:33 +0000 (12:36 +0200)]
Remove unused functions from old get_items api
Paweł Chmielowski [Fri, 14 Aug 2015 10:12:55 +0000 (12:12 +0200)]
Make sure that lager is first on our deps list
Paweł Chmielowski [Thu, 17 Sep 2015 09:36:45 +0000 (11:36 +0200)]
Guard against passing undefined C2SPid to xml parser before become_controller gets called
Our new nif xml parser don't handle this gracefully, so we better don't
call it that way.
This is only triggered on old style ssl sockets, where ssl layer must
be activated early, before association between socket and c2s is
established
Holger Weiss [Wed, 16 Sep 2015 22:33:08 +0000 (00:33 +0200)]
Let BOSH/WebSocket support "max_resume_timeout"
Allow for specifying the "max_resume_timeout" option in an ejabberd_http
listener for ejabberd_http_bind and/or ejabberd_http_ws.
Evgeny Khramtsov [Wed, 16 Sep 2015 15:22:19 +0000 (18:22 +0300)]
Merge pull request #736 from quanzhuo/master
Comment unused type, unused term
Quan Zhuo [Wed, 16 Sep 2015 14:52:36 +0000 (22:52 +0800)]
Comment unused type, unused term
Paweł Chmielowski [Wed, 16 Sep 2015 10:19:54 +0000 (12:19 +0200)]
Properly handle define_macros in merged config files
Mickael Remond [Wed, 16 Sep 2015 09:33:00 +0000 (11:33 +0200)]
Update French translation
Mickael Remond [Wed, 16 Sep 2015 09:14:20 +0000 (11:14 +0200)]
Update French translation
Paweł Chmielowski [Wed, 16 Sep 2015 09:08:21 +0000 (11:08 +0200)]
Update polish translation
Holger Weiss [Tue, 15 Sep 2015 20:42:22 +0000 (22:42 +0200)]
XEP-0198: Improve handling of non-message stanzas
When an XEP-0198 session times out, always return an error for
unacknowledged IQ stanzas, and always drop presence stanzas. That is,
the "resend_on_timeout" option no longer applies to those stanzas types,
but only to messages.
Evgeniy Khramtsov [Mon, 14 Sep 2015 11:05:07 +0000 (14:05 +0300)]
Improve MSSQL schema
Evgeniy Khramtsov [Sun, 13 Sep 2015 14:41:54 +0000 (17:41 +0300)]
Simplify MSSQL configuration
Evgeniy Khramtsov [Sun, 13 Sep 2015 11:20:31 +0000 (14:20 +0300)]
Fix MSSQL support
Christophe Romain [Fri, 11 Sep 2015 12:32:58 +0000 (14:32 +0200)]
ext_mod must be started before ejabberd_config
Badlop [Fri, 11 Sep 2015 11:22:52 +0000 (13:22 +0200)]
Update German translation (thanks to Nikolaus Polak)
Badlop [Thu, 10 Sep 2015 19:25:12 +0000 (21:25 +0200)]
Update Hebrew translation (thanks to Isratine Citizen)
Badlop [Thu, 10 Sep 2015 18:11:02 +0000 (20:11 +0200)]
Include ext_mod modules when checking accepted options (ejabberd-contrib#116)
Christophe Romain [Thu, 10 Sep 2015 10:21:50 +0000 (12:21 +0200)]
typo fix
Badlop [Tue, 8 Sep 2015 19:38:23 +0000 (21:38 +0200)]
Update Esperanto and Dutch translations (thanks to Andreas van Cranenburgh)
Mickael Remond [Mon, 7 Sep 2015 15:56:09 +0000 (17:56 +0200)]
Merge branch 'master' of github.com:processone/ejabberd
Mickael Remond [Mon, 7 Sep 2015 15:55:54 +0000 (17:55 +0200)]
Fix typo
Badlop [Mon, 7 Sep 2015 15:46:50 +0000 (17:46 +0200)]
Update Brazilian Portuguese translation (thanks to Otávio Fernandes)
Badlop [Mon, 7 Sep 2015 15:46:05 +0000 (17:46 +0200)]
Update Japanese translation (thanks to Tsukasa Hamano)(#729)
Mickael Remond [Mon, 7 Sep 2015 15:35:58 +0000 (17:35 +0200)]
Use our own includes + includes from all dependencies
Badlop [Mon, 7 Sep 2015 13:06:57 +0000 (15:06 +0200)]
Update Catalan and Spanish translations
Evgeniy Khramtsov [Mon, 7 Sep 2015 12:21:42 +0000 (15:21 +0300)]
Update Russian PO file
Badlop [Mon, 7 Sep 2015 11:37:54 +0000 (13:37 +0200)]
Run "make translations" and get updated PO files
Badlop [Mon, 7 Sep 2015 11:16:56 +0000 (13:16 +0200)]
Fix German translation (thanks to STPKITT)(#726)
Paweł Chmielowski [Fri, 4 Sep 2015 10:42:53 +0000 (12:42 +0200)]
Pass stream management options defined in http listener to http-bind and websocket
Holger Weiss [Thu, 3 Sep 2015 19:20:15 +0000 (21:20 +0200)]
New XEP-0198 option: "max_resume_timeout"
In the past, the "resume_timeout" option defined both the default resume
timeout and the maximum resume timeout clients are permitted to request.
Admins might want to allow clients to request a timeout value that's
larger than the default, though. This can now be done by specifying the
"max_resume_timeout" option.
Badlop [Thu, 3 Sep 2015 14:27:42 +0000 (16:27 +0200)]
Use hide_sensitive_log_data in eldap.erl
Mickael Remond [Wed, 2 Sep 2015 15:02:20 +0000 (17:02 +0200)]
Merge branch 'master' of github.com:processone/ejabberd
Mickael Remond [Wed, 2 Sep 2015 15:02:09 +0000 (17:02 +0200)]
Better to keep config file in a different config directory
Evgeniy Khramtsov [Wed, 2 Sep 2015 13:02:46 +0000 (16:02 +0300)]
Rename idna.erl to ejabberd_idna.erl (#702)
Mickaël Rémond [Wed, 2 Sep 2015 12:25:43 +0000 (14:25 +0200)]
Merge pull request #725 from processone/elixir-mix
Allow building an ejabberd release with mix and elixir release manager
Badlop [Wed, 2 Sep 2015 11:46:03 +0000 (13:46 +0200)]
Add verification of hide_sensitive_log_data global option
Evgeniy Khramtsov [Wed, 2 Sep 2015 11:13:23 +0000 (14:13 +0300)]
Remove unused function now_to_iso/1
Mickael Remond [Wed, 2 Sep 2015 10:49:19 +0000 (12:49 +0200)]
Allow building ejabberd with Elixir mix and building and ejabberd OTP release
Mickael Remond [Wed, 2 Sep 2015 10:48:19 +0000 (12:48 +0200)]
ignore ejabberd release result directory
Mickael Remond [Wed, 2 Sep 2015 09:38:16 +0000 (11:38 +0200)]
Update mix.exs to comply with exrm release system
Mickaël Rémond [Wed, 2 Sep 2015 08:54:24 +0000 (10:54 +0200)]
Update mix.exs
Fix version number.
Mickael Remond [Wed, 2 Sep 2015 07:11:06 +0000 (09:11 +0200)]
Upgrade version number to ejabberd 15.07
We forgot before previous release
Evgeniy Khramtsov [Tue, 1 Sep 2015 09:35:08 +0000 (12:35 +0300)]
Do not forget to set from/to when fetching from MUC history
Paweł Chmielowski [Tue, 1 Sep 2015 08:56:43 +0000 (10:56 +0200)]
Fix problem with merging same port, different ip listeners in config files
Also switch to function used by ejabberd_listener to extract that
information instead of rolling our own code for that.
Evgeniy Khramtsov [Tue, 1 Sep 2015 08:37:07 +0000 (11:37 +0300)]
Fetch MUC MAM messages from room history directly if it's not enabled in room configuration
Holger Weiss [Sun, 30 Aug 2015 21:26:37 +0000 (23:26 +0200)]
Update MAM tests to always expect RSM in response
Evgeny Khramtsov [Fri, 28 Aug 2015 12:23:00 +0000 (15:23 +0300)]
Merge pull request #721 from oxpa/muc_admin
get_room_options will not crash in case of query for a non-existent room