Holger Weiss
fee2530b1c
Always use occupant JID as 'from' for room subject
...
When sending the room subject to a new participant, always use the
occupant JID that corresponds to the subject author as the 'from'
address. It was already done this way when the subject was sent as part
of the room history.
2015-11-25 00:05:24 +01:00
Evgeniy Khramtsov
87fb5132be
Make JID related functions from jlib.erl deprecated
2015-11-24 20:31:26 +03:00
Evgeniy Khramtsov
95265dd3ad
Move JID related functions to jid.erl ( #847 )
2015-11-24 18:44:13 +03:00
Evgeniy Khramtsov
7eddfe073b
Make Riak working on R18
2015-11-24 17:53:44 +03:00
Christophe Romain
16881597c9
Remove useless export_all flag
2015-11-23 12:03:08 +01:00
Christophe Romain
f3ff660eae
Export content_type/3 needed by mod_http_upload
2015-11-23 11:53:36 +01:00
Christophe Romain
4480749a52
Merge branch 'cluster_fix'
2015-11-20 14:52:36 +01:00
Christophe Romain
b4ae1b63bc
Allow longer command execution time
2015-11-20 10:39:32 +01:00
Christophe Romain
67a70b9107
Integrate join/leave cluster as ejabberd command
2015-11-20 10:39:27 +01:00
Evgeny Khramtsov
0e29307ad5
Merge pull request #840 from cenobites/mod_ping
...
Adding ping_ack_timeout in mod_opt_type configuration
2015-11-18 16:35:49 +03:00
Badlop
2659e2c4a0
Explain that reload_config only affects to ACL and Access
2015-11-18 13:25:19 +01:00
Nycholas de Oliveira e Oliveira
49a8de7c56
Adding ping_ack_timeout in mod_opt_type configuration
...
Avoid the error output
```
2015-11-18 12:02:40.297 [error] <0.37.0>@gen_mod:validate_opts:250 unknown option 'ping_ack_timeout' for module 'mod_ping' will be likely ignored, available options are: 'iqdisc', 'ping_interval', 'send_pings', 'timeout_action'
2015-11-18 12:02:40.334 [error] <0.37.0>@gen_mod:validate_opts:250 unknown option 'ping_ack_timeout' for module 'mod_ping' will be likely ignored, available options are: 'iqdisc', 'ping_interval', 'send_pings', 'timeout_action'
```
In setting mod_opt_type default, ping_ack_timeout parameter was added.
2015-11-18 10:25:01 -02:00
Badlop
2f9f4e6938
Fix example config about ejabberd_xmlrpc ( #771 )
2015-11-17 21:33:28 +01:00
Holger Weiss
43626f5c97
mod_http_upload: Return error atoms, not strings
...
Don't convert error atoms to strings before actually logging them. This
avoids a bogus error message when a user who has no uploaded files is
removed.
2015-11-17 00:12:20 +01:00
Badlop
53d72bd85a
Disable vJUD by default also in mod_vcard_ldap source code
2015-11-13 19:33:23 +01:00
Badlop
f6d8f47451
Disable vJUD search in the default config and when not specified
2015-11-13 19:30:11 +01:00
Alexey Shchepin
aa5caa30e2
Support for muc#roomconfig_presencebroadcast option
2015-11-12 19:53:10 +03:00
Paweł Chmielowski
3ee5195b7a
Fix problem with pipelined http requests arriving in single packet
...
This fixes github issue ejabberd#835
2015-11-12 17:23:59 +01:00
Holger Weiss
55a92c2983
mod_http_upload: Log message if URL looks wrong
...
Log an [info] message if a PUT request looks like the specified
"put_url" contains a path component that doesn't match the
"request_handlers" path, as in the following configuration:
listen:
-
module: ejabberd_http
port: 5444
request_handlers:
"/": mod_http_upload
modules:
mod_http_upload:
put_url: "http://example.com/path/ "
2015-11-11 22:51:40 +01:00
Holger Weiss
415a75c25a
mod_http_upload_quota: Don't track all users
...
Don't track the disk usage of accounts that have an unlimited quota.
2015-11-10 22:08:16 +01:00
Holger Weiss
20709f9880
mod_http_upload: Make case indentation consistent
...
Use four spaces (or the corresponding amount of tab characters) for case
indentation everywhere in mod_http_upload and mod_http_upload_quota.
2015-11-09 19:23:52 +01:00
Holger Weiss
113c315857
mod_http_upload: Apply cosmetic changes
2015-11-09 19:12:08 +01:00
Holger Weiss
842db2ca15
mod_http_upload: Don't flatten command strings
2015-11-09 18:50:45 +01:00
Holger Weiss
9c80cb2b26
mod_http_upload: Don't let identify/1 return error
...
Let identify/1 return 'pass' when it failed to identify the file type,
as this doesn't (necessarily) indicate an error condition. This also
makes it consistent with the return value of convert/2.
2015-11-09 18:41:31 +01:00
Paweł Chmielowski
58c1bc4276
Use xml_stream:reset() when possible
2015-11-09 16:05:09 +01:00
Evgeny Khramtsov
de7422b372
Merge pull request #821 from scrogson/update_readme_openssl
...
Update minimum required OpenSSL version
2015-11-05 12:10:38 +03:00
Sonny Scroggin
d252b9948c
Update minimum required OpenSSL version
2015-11-04 23:21:08 -06:00
Christophe Romain
341be9b682
Remove supervisor option, disable it for c2s and muc
2015-11-04 16:24:35 +01:00
Holger Weiss
fec7e47169
Add copyright and license to HTTP upload modules
2015-11-04 01:22:39 +01:00
Holger Weiss
46bf190fd0
mod_client_state: Add my email address to header
2015-11-04 01:19:19 +01:00
Paweł Chmielowski
e54e543a66
Faster string_to_jid/1 implementation
...
This version is about 10-15% faster than old one
2015-11-03 14:41:01 +01:00
Holger Weiss
ff46738218
mod_http_upload_quota: Omit info message
...
The mod_http_upload_quota module attempts to delete a directory whenever
it removes a file from that directory. However, if thumbnail creation
is enabled, directories will often contain two files. Therefore, don't
log an info (but only a debug) message if directory removal fails.
2015-11-03 00:00:44 +01:00
Holger Weiss
4566325241
mod_http_upload: Don't complain during shutdown
...
Ignore the case where, for some reason, no process is found to be
stopped.
Closes #810 .
2015-11-02 23:46:58 +01:00
Holger Weiss
1b368a86b7
mod_http_upload: Use binary strings in most places
...
Switch to binary strings to fix a type issue, and for consistency.
Closes #808 .
2015-11-02 23:46:31 +01:00
Holger Weiss
9d2f1d5f0d
mod_http_upload: Check availability of ImageMagick
...
Log an error message during startup if the thumbnail option is enabled
but ImageMagick is not installed.
2015-11-02 01:12:10 +01:00
Holger Weiss
eeb705fc2f
mod_http_upload: Suppress error on non-image files
...
Don't log an error (but only a debug) message if ImageMagick fails to
indentify the file type for thumbnail creation. The image might be
encrypted, or it could be a non-image file.
Closes #809 .
2015-11-01 23:29:22 +01:00
Evgeniy Khramtsov
8bff06bea9
Merge branch 'master' of github.com:processone/ejabberd
2015-10-30 17:20:50 +03:00
Evgeniy Khramtsov
99f506135b
Fix ipv6 configuration processing ( #803 )
2015-10-30 17:20:32 +03:00
Paweł Chmielowski
2814dd2cb8
Merge pull request #801 from nanoz/patch-1
...
feat(ejabberdctl): Foreground option for docker
2015-10-29 19:46:18 +01:00
Arno B
bee767158d
feat(ejabberdctl): Foreground option for docker
...
Docker needs services to run in foreground.
2015-10-29 19:39:21 +01:00
Holger Weiss
915383e150
mod_http_upload: Add missing trailing dot
...
(Thanks to Matthias Rieber.)
2015-10-29 10:09:55 +01:00
Holger Weiss
43e7814714
mod_mam: Update supported XEP version
2015-10-28 23:53:53 +01:00
Holger Weiss
32fe74c923
mod_http_upload: Document protocol support
2015-10-28 23:52:33 +01:00
Paweł Chmielowski
f112a91321
Copy elixir files in copy-files makefile target
2015-10-28 18:12:39 +01:00
Christophe Romain
1d5a441ce8
Revert "set dependencies versions for 15.10"
...
This reverts commit a497cdff5e
2015-10-28 16:07:00 +01:00
Christophe Romain
a497cdff5e
set dependencies versions for 15.10
2015-10-28 15:53:12 +01:00
Holger Weiss
47b17acbaf
ejabberdctl.cfg: Document CONTRIB_MODULES_CONF_DIR
2015-10-26 22:46:58 +01:00
Holger Weiss
788049be7b
ejabberdctl: export CONTRIB_MODULES_CONF_DIR
2015-10-26 22:42:07 +01:00
Holger Weiss
62ea763089
mod_http_upload: Fix string()/binary() type issue
2015-10-26 22:32:12 +01:00
Holger Weiss
3e7ee6af6d
mod_http_upload: Add/fix function specifications
2015-10-26 22:30:58 +01:00
