Peter Lemenkov
|
c377708da1
|
No need to explicitly return ok here
No need to explicitly return ok here. Return value will be ignored
anyway.
Signed-off-by: Peter Lemenkov <lemenkov@redhat.com>
|
2017-01-30 14:52:04 +01:00 |
|
Paweł Chmielowski
|
326e8da06d
|
Use newer version of epam
|
2017-01-29 14:51:03 +01:00 |
|
Paweł Chmielowski
|
44a9ceac0b
|
More changes that are required from p1_pam -> epam
|
2017-01-29 14:35:22 +01:00 |
|
Paweł Chmielowski
|
5c1168c33f
|
Change name of pam dep from p1_pam to epam
We need to use same name as .app file or rebar complains
|
2017-01-29 14:26:46 +01:00 |
|
Paweł Chmielowski
|
dd458c637e
|
Floating deps should always be executed
This fixes problem with recognizing latest_deps configure option
|
2017-01-29 12:14:32 +01:00 |
|
Paweł Chmielowski
|
2f3f6f8b71
|
Improve compilation with rebar3
|
2017-01-26 16:45:04 +01:00 |
|
Evgeniy Khramtsov
|
11326692f2
|
Merge branch 'master' of github.com:processone/ejabberd
|
2017-01-26 10:59:31 +03:00 |
|
Evgeniy Khramtsov
|
9d144bd495
|
Do not drop default TLS options
Fixes #1484
|
2017-01-26 10:58:26 +03:00 |
|
Paweł Chmielowski
|
a284722fd0
|
Adapt to coveralls api change
|
2017-01-24 19:16:50 +01:00 |
|
Evgeniy Khramtsov
|
c0a89e328a
|
Change OTP version from 19.1 to 19.2 in travis config
|
2017-01-24 10:39:40 +03:00 |
|
Evgeniy Khramtsov
|
99fd621aed
|
Speedup features list when a lot of virtual hosts configured
|
2017-01-24 10:38:29 +03:00 |
|
Paweł Chmielowski
|
5183f7724d
|
Fix tests
|
2017-01-23 20:43:35 +01:00 |
|
Evgeniy Khramtsov
|
0c57044c59
|
Make mod_disco handle features of mod_ping
|
2017-01-23 22:33:46 +03:00 |
|
Evgeniy Khramtsov
|
5e2c105396
|
Merge branch 'master' of github.com:processone/ejabberd
|
2017-01-23 21:52:35 +03:00 |
|
Evgeniy Khramtsov
|
0ce3a3665a
|
Make sure only {exit, normal} is not catched when executing a hook
|
2017-01-23 21:52:25 +03:00 |
|
PaweÅ Chmielowski
|
b0e72ece43
|
Adapt to new ejabberd_sm changes
|
2017-01-23 19:34:29 +01:00 |
|
Alexey Shchepin
|
8b5e6e4a13
|
Compatibility with R17 in mod_block_strangers
|
2017-01-23 19:04:22 +03:00 |
|
Alexey Shchepin
|
43bfa0efbc
|
Check message subject in mod_block_strangers
|
2017-01-23 17:10:28 +03:00 |
|
Christophe Romain
|
ca298c7c39
|
Update deps in mix.lock
|
2017-01-23 14:42:52 +01:00 |
|
Evgeniy Khramtsov
|
48d8498dbb
|
Avoid using maps:get/2 to keep compatibility with OTP 17.5
|
2017-01-23 16:30:16 +03:00 |
|
Evgeniy Khramtsov
|
19bec62eb5
|
Fix calling to mod_offline:store_packet
|
2017-01-23 15:00:46 +03:00 |
|
Paweł Chmielowski
|
5e5a8bbdcf
|
Don't use maps:take it available in R19 only
|
2017-01-23 12:56:08 +01:00 |
|
Paweł Chmielowski
|
7c2ccb2cb7
|
Add tool for checking which dependences need update
|
2017-01-23 12:24:25 +01:00 |
|
Evgeniy Khramtsov
|
435e5e6263
|
Make test suite working again
|
2017-01-23 13:51:05 +03:00 |
|
Evgeniy Khramtsov
|
e564f9ae31
|
Make a message is not bounced if it's archived
|
2017-01-21 13:47:47 +03:00 |
|
Evgeniy Khramtsov
|
68cf45a8b9
|
Archive message before delivering it to offline storage (#1348)
|
2017-01-21 11:47:04 +03:00 |
|
Evgeniy Khramtsov
|
94b23482a9
|
Send <compressed/> in correct order
|
2017-01-21 10:47:55 +03:00 |
|
Evgeny Khramtsov
|
1e968f5487
|
Merge pull request #1478 from weiss/multi-host-pubsub-cache
mod_pubsub: Fix last item cache for multiple hosts
|
2017-01-21 11:17:06 +04:00 |
|
Holger Weiss
|
14e771d871
|
mod_pubsub: Fix last item cache for multiple hosts
Don't let the last item cache intermix PubSub items of different virtual
domains.
|
2017-01-21 00:14:56 +01:00 |
|
Evgeniy Khramtsov
|
56ef607904
|
Add stanza-id to every archived message (#1477)
|
2017-01-20 23:21:06 +03:00 |
|
Evgeniy Khramtsov
|
17fe272dc5
|
Update copyright headers in new files
|
2017-01-20 19:56:19 +03:00 |
|
Evgeniy Khramtsov
|
d5d906184f
|
Merge branch 'new_stream'
Conflicts:
src/cyrsasl.erl
src/ejabberd_c2s.erl
src/ejabberd_cluster.erl
src/ejabberd_frontend_socket.erl
src/ejabberd_node_groups.erl
src/ejabberd_router.erl
src/mod_bosh.erl
src/mod_ip_blacklist.erl
src/mod_muc_mnesia.erl
src/mod_offline.erl
src/mod_proxy65_sm.erl
|
2017-01-20 19:35:46 +03:00 |
|
Christophe Romain
|
3b2c2b5c04
|
Prepare 17.01 for hex.pm
|
2017-01-20 12:19:55 +01:00 |
|
Christophe Romain
|
39cfee239d
|
Use xmpp 1.1.6
|
2017-01-20 11:51:56 +01:00 |
|
Paweł Chmielowski
|
1f02567507
|
Make shim for mod_http_api admin_ip_access more robust
|
2017-01-20 10:19:09 +01:00 |
|
Christophe Romain
|
4f5d54f062
|
Try db migration only when mnesia is configured (#1458)
|
2017-01-20 09:26:13 +01:00 |
|
Evgeniy Khramtsov
|
fc2b71a04e
|
Restore muc_invite_hook (#1467)
|
2017-01-19 18:24:29 +03:00 |
|
Evgeniy Khramtsov
|
87b964a7f6
|
Make sure 'jabber:client' namespace is added to forwarded messages (#1474)
|
2017-01-19 18:03:07 +03:00 |
|
Evgeniy Khramtsov
|
4cf83ca3a7
|
Restore multiple invitations support (#1468)
|
2017-01-19 17:26:08 +03:00 |
|
Evgeniy Khramtsov
|
3d9997288d
|
Don't forget to convert muc#roomconfig_mam
|
2017-01-19 16:42:04 +03:00 |
|
Evgeniy Khramtsov
|
527472f18c
|
Support legacy muc#roomconfig values (#1469)
|
2017-01-19 11:12:27 +03:00 |
|
Christophe Romain
|
d2b8569452
|
Fix typo
|
2017-01-18 17:11:08 +01:00 |
|
Christophe Romain
|
3482ee5c75
|
Reset table only if new def change from runtime
|
2017-01-18 17:02:03 +01:00 |
|
Christophe Romain
|
3029e84faf
|
Improve check of mnesia schema opearations
|
2017-01-18 16:53:36 +01:00 |
|
Evgeniy Khramtsov
|
044e55b98e
|
Fix reporting dialback failures
|
2017-01-18 18:26:31 +03:00 |
|
Evgeniy Khramtsov
|
60a09285b7
|
Don't attempt to resolve _jabber._tcp SRV record
|
2017-01-18 17:54:42 +03:00 |
|
Evgeniy Khramtsov
|
ba47fd4649
|
Improve <delay/> tag insertion
|
2017-01-18 14:09:39 +03:00 |
|
Evgeniy Khramtsov
|
2de2d00f14
|
Cope with malformed values in 'rosterusers' SQL table (#1466)
|
2017-01-18 11:59:46 +03:00 |
|
Evgeniy Khramtsov
|
7b8c01da12
|
Better log bytestream termination
|
2017-01-17 23:06:55 +03:00 |
|
Evgeniy Khramtsov
|
9021ba01ac
|
Use crypto:exor/2 instead of hand-crafted bxor
|
2017-01-17 22:37:44 +03:00 |
|