]>
granicus.if.org Git - ejabberd/log
Holger Weiss [Thu, 29 Oct 2015 09:09:55 +0000 (10:09 +0100)]
mod_http_upload: Add missing trailing dot
(Thanks to Matthias Rieber.)
Holger Weiss [Wed, 28 Oct 2015 22:53:53 +0000 (23:53 +0100)]
mod_mam: Update supported XEP version
Holger Weiss [Wed, 28 Oct 2015 22:52:33 +0000 (23:52 +0100)]
mod_http_upload: Document protocol support
Paweł Chmielowski [Wed, 28 Oct 2015 17:12:39 +0000 (18:12 +0100)]
Copy elixir files in copy-files makefile target
Christophe Romain [Wed, 28 Oct 2015 15:07:00 +0000 (16:07 +0100)]
Revert "set dependencies versions for 15.10"
This reverts commit
a497cdff5ee0bf41749d076a445ba7371ddbd69e .
Christophe Romain [Wed, 28 Oct 2015 14:53:12 +0000 (15:53 +0100)]
set dependencies versions for 15.10
Holger Weiss [Mon, 26 Oct 2015 21:46:58 +0000 (22:46 +0100)]
ejabberdctl.cfg: Document CONTRIB_MODULES_CONF_DIR
Holger Weiss [Mon, 26 Oct 2015 21:42:07 +0000 (22:42 +0100)]
ejabberdctl: export CONTRIB_MODULES_CONF_DIR
Holger Weiss [Mon, 26 Oct 2015 21:32:12 +0000 (22:32 +0100)]
mod_http_upload: Fix string()/binary() type issue
Holger Weiss [Mon, 26 Oct 2015 21:30:58 +0000 (22:30 +0100)]
mod_http_upload: Add/fix function specifications
Holger Weiss [Mon, 26 Oct 2015 21:10:32 +0000 (22:10 +0100)]
mod_http_upload: Strip newline from command output
The list_to_integer/1 function doesn't cope with trailing newline
characters.
Holger Weiss [Mon, 26 Oct 2015 12:10:10 +0000 (13:10 +0100)]
Support user quotas for HTTP File Upload
mod_http_upload_quota implements two features:
- When a "hard quota" is exceeded during a file upload, old files are
removed until the disk usage equals or falls below the "soft quota".
- Once a day, all uploaded files (and directories) older than a
configurable number of days are deleted.
Evgeniy Khramtsov [Mon, 26 Oct 2015 12:05:28 +0000 (15:05 +0300)]
Rename badly entitled record field
Evgeniy Khramtsov [Mon, 26 Oct 2015 11:10:55 +0000 (14:10 +0300)]
Add HTTP File Upload support (XEP-0363)
Evgeniy Khramtsov [Fri, 23 Oct 2015 15:41:35 +0000 (18:41 +0300)]
Don't crash on certificates without extensions (EJAB-1724)
Christophe Romain [Fri, 23 Oct 2015 15:21:19 +0000 (17:21 +0200)]
Let modules_update_specs report failures (#756)
Evgeny Khramtsov [Thu, 22 Oct 2015 18:00:08 +0000 (21:00 +0300)]
Merge pull request #790 from gardenia/mod_ping_configurable_ack_timeout
Configurable ping ack timeout for mod_ping
Mickaël Rémond [Thu, 22 Oct 2015 16:50:11 +0000 (18:50 +0200)]
Merge pull request #781 from scrogson/master
Fix-up mix.exs; Include mix.lock
colm [Thu, 22 Oct 2015 12:48:40 +0000 (13:48 +0100)]
mod_ping: allowed the ping ack timeout (the length of time taken to deem that a ping has not being responded to) configurable. it still defaults to 32 seconds as per the constant IQ_TIMEOUT (in ejabberd_local.erl) this just makes it optionally configurable (in my case I needed to be more trigger happy than 32 seconds)
Christophe Romain [Thu, 22 Oct 2015 12:00:17 +0000 (14:00 +0200)]
Add simple metrics module for use with grapherl
Evgeny Khramtsov [Thu, 22 Oct 2015 10:50:36 +0000 (13:50 +0300)]
Merge pull request #789 from gardenia/mod_shared_roster_remove_resource_in_push_from
Don't send full JID in 'from' of Roster Push (RFC 6121 section 2.1.6)
colm [Wed, 21 Oct 2015 22:22:53 +0000 (23:22 +0100)]
Don't send full JID in 'from' of Roster Push (RFC 6121 section 2.1.6). This is a patch by @badlop in the comments of github issue #367
Badlop [Wed, 21 Oct 2015 10:51:22 +0000 (12:51 +0200)]
Use homogeneous s2s connections stats (#761)
Alexey Shchepin [Tue, 20 Oct 2015 14:19:31 +0000 (17:19 +0300)]
Remove access_commands 'unrestricted' option, use [] instead. Fix unauthenticated calls to commands with policy=user.
Paweł Chmielowski [Tue, 20 Oct 2015 13:22:39 +0000 (15:22 +0200)]
Pass {C,CPP,LD}FLAGS used in main ./configure call to invocations from deps
Alexey Shchepin [Mon, 19 Oct 2015 17:16:04 +0000 (20:16 +0300)]
Improve access_commands option backward compatibility
Alexey Shchepin [Mon, 19 Oct 2015 15:50:26 +0000 (18:50 +0300)]
Fix access_commands option handling
Paweł Chmielowski [Mon, 19 Oct 2015 14:38:31 +0000 (16:38 +0200)]
Make COPY_template compatible with gmake 3.8
Holger Weiss [Mon, 19 Oct 2015 12:23:37 +0000 (14:23 +0200)]
Let Travis CI test "make install"
Paweł Chmielowski [Mon, 19 Oct 2015 11:46:51 +0000 (13:46 +0200)]
Make install should work even without having DESTDIR set
Holger Weiss [Sat, 17 Oct 2015 23:14:48 +0000 (01:14 +0200)]
ejabberd_listener: Fix ETS update on port reuse
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
Sonny Scroggin [Thu, 15 Oct 2015 03:52:27 +0000 (22:52 -0500)]
Improve line lengths; use spaces in between commas.
Sonny Scroggin [Thu, 15 Oct 2015 03:50:28 +0000 (22:50 -0500)]
mix.lock should be commited to ensure consistent builds.
Sonny Scroggin [Thu, 15 Oct 2015 03:49:47 +0000 (22:49 -0500)]
This dependency was removed in
83dd79a
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