Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-22 16:20:52 +01:00
Code Releases Activity
6,494 Commits 7 Branches 109 Tags 66 MiB
acc162f4f4
Commit Graph

6494 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paweł Chmielowski
b69fb5aae0 Bump sqlite deps version 2018-01-30 12:51:38 +01:00
Paweł Chmielowski
ddf6076328 Fix elixir tests 2018-01-29 18:28:02 +01:00
Paweł Chmielowski
d2974cf48a Fix processing of ldap_memberattr_format_re option 
This makes sure that "" value is handled as before options processing
overhaul.

This fixed ldap shared roster testcase
 2018-01-29 17:25:31 +01:00
Paweł Chmielowski
dc601610b6 Don't return undefined from ejabberd_config:get_myhosts() 2018-01-29 11:05:59 +01:00
Paweł Chmielowski
719dfe12f6 Use named functions instead of carrying self as argument 2018-01-29 10:02:20 +01:00
Paweł Chmielowski
c47366ba97 Restore original return value to ejabberd_config:add_option 2018-01-29 09:46:11 +01:00
Holger Weiss
1b26c8d214 ejabberdctl: Omit redundant erl option 
The "-detached" flag implies "-noinput".
 2018-01-29 01:16:20 +01:00
Holger Weiss
f31782a252 mod_caps: Only store CAPS if contact is subscribed 
If a user is subscribed to a contact but not vice versa, don't store the
contact's CAPS.  This makes sure no PEP items are leaked to the contact.
 2018-01-29 01:07:38 +01:00
Holger Weiss
d0af61f488 mod_caps: Fix indentation 2018-01-29 00:02:15 +01:00
Evgeniy Khramtsov
795efb2ee1 Improve logging of idle s2s connections 2018-01-28 11:10:22 +03:00
Evgeniy Khramtsov
6e5439db5c Find and fix typos using 'codespell' 2018-01-27 19:35:38 +03:00
Evgeniy Khramtsov
5d582080be Fix a typo in call to create_captcha() 
Thanks to Paul Schaub for spotting this
 2018-01-26 22:56:49 +03:00
Evgeniy Khramtsov
4b012a99d2 Introduce option 'captcha' for mod_block_strangers 
When the option is set to `true`, the module will generate
CAPTCHA challenges for incoming subscription requests. The option
also implies that option `drop` is set to `true`. Note that
the module won't generate CAPTCHA challenges for messages: they
will still be rejected if `drop` is set to `true`.

Fixes #2246
 2018-01-26 15:02:06 +03:00
Paweł Chmielowski
7e561dd20a Fix more tests 2018-01-25 18:43:34 +01:00
Paweł Chmielowski
2afdde84ea Adopt tests to changes in xmpp 2018-01-25 18:24:05 +01:00
Evgeniy Khramtsov
2269d290d8 Switch to newer fast_xml and xmpp and update record fields in the code 2018-01-25 20:02:47 +03:00
Paweł Chmielowski
56d4224e08 Handle ignore from xmpp_socket callback start 
This should help with issue #2244
 2018-01-24 17:32:24 +01:00
Holger Weiss
666da60cba Reduce log level for unexpected XML input 
Log a warning rather than an error when, for example, a client sends a
stanza before opening the stream.
 2018-01-24 12:04:52 +01:00
Holger Weiss
e8f1de8785 mod_block_strangers: Bounce groupchat to bare JID 
If a blocked message is of type 'groupchat', address the error message
to the bare JID (rather than sending it as MUC PM).
 2018-01-24 11:49:31 +01:00
Evgeniy Khramtsov
1f6c0022dd Fix a typo in mod_caps 2018-01-23 23:20:10 +03:00
Paweł Chmielowski
6cdb7b4468 Fix tag used in luerl dependency 2018-01-23 09:37:46 +01:00
Evgeniy Khramtsov
a917f4d451 Merge branch 'mod-default-options' 2018-01-23 11:00:00 +03:00
Evgeniy Khramtsov
ba2b650464 Introduce new gen_mod callback: mod_options/1 
The callback is supposed to provide known options and their default
values, as long as the documentation. Passing default values into
get_mod functions is now deprecated: all defaults should be provided
by the Mod:mod_options/1 callback.
 2018-01-23 10:54:52 +03:00
Christophe Romain
121d12f4d1 Move luerl as optional tools dependency 2018-01-22 17:42:27 +01:00
Christophe Romain
7abd13974b Remove deps override on mix 2018-01-22 17:42:02 +01:00
Holger Weiss
ae86af9399 Merge remote-tracking branch 'processone/pr/2238' 
* processone/pr/2238:
  Fix typo /this/it/
 2018-01-21 15:05:05 +01:00
Licaon_Kter
a0c8cac1b6
Fix typo /this/it/ 2018-01-21 13:44:30 +00:00
Holger Weiss
818ff5a263 Update 'pubsub_node' column name for DB export 
The 'type' column has been renamed in commit
44700d91ba.
 2018-01-19 13:10:14 +01:00
Evgeniy Khramtsov
c0ef054f6f Do not try to start ezlib application too frequently 
This may overload Erlang applicaton controller
 2018-01-16 18:06:31 +03:00
Evgeniy Khramtsov
d35a8805b0 Return debug message back 2018-01-16 17:57:21 +03:00
Christophe Romain
1daa7ef785 Sync mix and rebar for eimp dep 2018-01-16 11:45:29 +01:00
Evgeniy Khramtsov
7b0fa7e6e2 Improve validation of 'convert' option 2018-01-16 01:06:20 +03:00
Christophe Romain
8bdccc25ab Include acme deps in release, fixes f2c3fe8ac 2018-01-15 22:21:24 +01:00
Paweł Chmielowski
59b7c89944 Use correct name of new rebar command 2018-01-15 15:21:04 +01:00
Paweł Chmielowski
a7639fd4ad Call configure on deps in separate rebar command that compile 
This way we rebar.config.script can use vars detected by configure
 2018-01-15 12:31:47 +01:00
Paweł Chmielowski
99f8e58eaf Use override syntax that rebar3 accepts 2018-01-15 11:56:20 +01:00
Evgeniy Khramtsov
d3aab2ea18 Get rid of a call to misc:have_eimp() 2018-01-15 13:14:51 +03:00
Evgeniy Khramtsov
b970c88941 Merge branch 'master' of github.com:processone/ejabberd 2018-01-15 13:00:19 +03:00
Evgeniy Khramtsov
0f86559d83 Always build eimp dependency 
Even if no suitable C graphics libraries are detected
at compile time, the package is still usable because it
provides `eimp:get_type/1` which is used by mod_avatar.
 2018-01-15 12:54:57 +03:00
Paweł Chmielowski
be592c9272 Don't report errors when trying to remove not existing files in make install 2018-01-15 10:38:36 +01:00
Paweł Chmielowski
3df78d3a8f Copy sh_to_ask function from xmerl_regexp.erl 
This way we don't need to include xmerl application in our docker container
 2018-01-15 10:31:26 +01:00
Evgeny Khramtsov
d2427c98c3
Merge pull request #2221 from licaon-kter/patch-1 
Fix example config macro names
 2018-01-14 09:54:22 +03:00
Licaon_Kter
84819ba0fe
Fix example config macro names 
These were missed in c26b56679e (diff-19e0c10699732f76181f70cfbec95d38) I guess.
 2018-01-13 21:38:01 +00:00
Evgeniy Khramtsov
f66a004821 Improve logging of failed s2s EXTERNAL authentication 2018-01-13 13:01:40 +03:00
Paweł Chmielowski
e1da673502 Fix detection of rebar3 
Looks like sometimes rebar3 report version that can't be split to 3 fields
by '.', we need only first one so don't match the rest
 2018-01-12 17:12:46 +01:00
Paweł Chmielowski
7d58b7a100 Improve resolving of system deps 
This version is able to search for know alternative names of deps and
helps with running tests when using system deps
 2018-01-12 16:16:12 +01:00
Christophe Romain
f2c3fe8ac6 Add mix dependencies for acme support 2018-01-12 12:28:31 +01:00
Evgeniy Khramtsov
1c1b12fc64 Note about direct-tls connections in example config 2018-01-12 10:27:33 +03:00
Paweł Chmielowski
1825cfaf05 Include newly releases fast_tls/esip/stun in mix.lock 2018-01-11 14:38:54 +01:00
Paweł Chmielowski
b8319c6617 Update mix.lock 2018-01-11 11:20:07 +01:00