Mickaël Rémond
c6f48022a4
Merge pull request #781 from scrogson/master
...
Fix-up mix.exs; Include mix.lock
2015-10-22 18:50:11 +02:00
colm
d048d1e619
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)
2015-10-22 13:48:40 +01:00
Christophe Romain
efdf5636be
Add simple metrics module for use with grapherl
2015-10-22 14:02:26 +02:00
Evgeny Khramtsov
81a7ca7b1e
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)
2015-10-22 13:50:36 +03:00
colm
92b9fb30e0
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
2015-10-21 23:22:53 +01:00
Badlop
c62bd0c911
Use homogeneous s2s connections stats ( #761 )
2015-10-21 12:51:22 +02:00
Alexey Shchepin
8a2fa62cac
Remove access_commands 'unrestricted' option, use [] instead. Fix unauthenticated calls to commands with policy=user.
2015-10-20 17:20:13 +03:00
Paweł Chmielowski
2d22d6061e
Pass {C,CPP,LD}FLAGS used in main ./configure call to invocations from deps
2015-10-20 15:23:23 +02:00
Alexey Shchepin
7c1e7e5b5f
Improve access_commands option backward compatibility
2015-10-19 20:16:04 +03:00
Alexey Shchepin
1f2b7e8f20
Fix access_commands option handling
2015-10-19 18:50:44 +03:00
Paweł Chmielowski
06701b126b
Make COPY_template compatible with gmake 3.8
2015-10-19 16:39:08 +02:00
Holger Weiss
ff4a00b1f3
Let Travis CI test "make install"
2015-10-19 14:23:37 +02:00
Paweł Chmielowski
97a93263c1
Make install should work even without having DESTDIR set
2015-10-19 13:47:01 +02:00
Holger Weiss
28e28e926a
ejabberd_listener: Fix ETS update on port reuse
2015-10-18 01:14:48 +02:00
Holger Weiss
5e467b96a1
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.
2015-10-17 23:15:31 +02:00
Holger Weiss
53bd0ee818
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.
2015-10-17 22:07:29 +02:00
Paweł Chmielowski
70606667c6
Use OTP directory structure for 'make install'
2015-10-15 15:08:45 +02:00
Paweł Chmielowski
7d99484859
Make KEEPALIVE_QUERY list as this is what sql_query/3 expects
2015-10-15 10:07:24 +02:00
Sonny Scroggin
35c33a8a29
Improve line lengths; use spaces in between commas.
2015-10-14 22:52:27 -05:00
Sonny Scroggin
98c172aed6
mix.lock should be commited to ensure consistent builds.
2015-10-14 22:50:28 -05:00
Sonny Scroggin
25f95d6954
This dependency was removed in 83dd79a
2015-10-14 22:49:47 -05:00
Alexey Shchepin
4fce1a17d7
Fix cyrsasl_oauth:mech_new call
2015-10-12 20:53:52 +03:00
Christophe Romain
1578f17eff
Remove obsolete sasl init
2015-10-12 10:41:07 +02:00
Evgeniy Khramtsov
87273619a6
Advertise MAM (XEP-0313) v0.4 support in room disco
2015-10-11 19:43:24 +03:00
Paweł Chmielowski
b5ac0db895
Be able to merge old style configs with {listen,...}
2015-10-08 13:07:00 +02:00
Paweł Chmielowski
6d25db6600
Handler module shouldn't be used for differentiating listeners when merging configs
2015-10-07 16:45:07 +02:00
Christophe Romain
880114a909
Enforce get_allowed_items_call
2015-10-07 16:40:37 +02:00
Christophe Romain
653105a44f
Fix acl issue from cleanup
2015-10-07 15:12:15 +02:00
Christophe Romain
f938c2a5e2
Revert "Avoid crypto:hmac/3 call for R15B compatibility"
...
This reverts commit 31e356c126
2015-10-07 14:18:56 +02:00
Christophe Romain
6a23cad454
Revert "Fix compilation on Erlang R15B"
...
This reverts commit a5d6044448
2015-10-07 14:18:47 +02:00
Christophe Romain
6aeb9dcb38
cosmetic cleanup
2015-10-07 14:18:38 +02:00
Christophe Romain
83dd79a6a7
Remove unused dependency
2015-10-06 11:06:04 +02:00
Evgeniy Khramtsov
6378c673df
Avoid MAM dups when routing to multiple resources
2015-10-02 16:09:55 +02:00
Evgeniy Khramtsov
c7750689e8
Fix force_update_presence
2015-10-02 16:06:47 +02:00
Mickael Remond
41d65f8fe2
We want oauth2 to be supported as default in Elixir environment
2015-10-02 10:40:55 +02:00
Paweł Chmielowski
24fa95fd60
Fix problem with --auth in ejabberd_ctl:process2/2
2015-10-01 21:09:03 +02:00
Paweł Chmielowski
67d3b50598
Switch macros resolving in config files to be global instead of per file
2015-10-01 14:34:48 +02:00
Mickaël Rémond
df39fec5d0
Merge pull request #753 from scrogson/add_links
...
Add License and Links for display on hex.pm
2015-09-29 22:37:15 +02:00
Mickaël Rémond
152d80827a
Merge pull request #755 from scrogson/fix_ejabberd_directory_name
...
Use lowecase directory name for lib/ejabberd
2015-09-29 22:36:02 +02:00
Sonny Scroggin
9c82f160e5
Use lowecase directory name for lib/ejabberd
2015-09-29 14:08:39 -05:00
Evgeny Khramtsov
189267c1a1
Merge pull request #754 from scrogson/gitignore
...
Ignore mnesiadb and _build
2015-09-29 21:27:49 +03:00
Sonny Scroggin
59b6a46f82
Ignore mnesiadb and _build
2015-09-29 13:21:35 -05:00
Sonny Scroggin
6b81a1ed90
clean up whitespace
2015-09-29 13:19:35 -05:00
Sonny Scroggin
b63c51c245
Add additional package information for hex.pm
2015-09-29 13:18:49 -05:00
Paweł Chmielowski
704844fd2a
Temporary switch to fork of oauth2 that compiles with r18
2015-09-29 15:34:02 +02:00
Christophe Romain
3fc1d8ca9a
Set version 15.09 for mix
2015-09-29 14:21:57 +02:00
Badlop
d08f73da47
Recompile translations
2015-09-29 08:19:44 +02:00
Alexey Shchepin
cf975da8f2
Update several commands for recent ejabberd_commands changes
2015-09-28 15:29:25 +03:00
Paweł Chmielowski
846b520edc
oauth uses jiffy so fetch it unconditionally
2015-09-28 10:08:27 +02:00
Alexey Shchepin
88a206400a
Add oauth_access option
2015-09-25 19:48:53 +03:00
