Evgeniy Khramtsov
|
28f66ddd7c
|
Attach modules to gen_mod's supervisor
|
2017-02-14 12:39:26 +03:00 |
|
Evgeniy Khramtsov
|
f664e39374
|
Improve modules start/stop procedures
|
2017-02-14 10:25:08 +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 |
|
Evgeniy Khramtsov
|
1e55e018e5
|
Adopt remaining code to support new hooks
|
2017-01-09 17:02:17 +03:00 |
|
Badlop
|
5fdd1c39fe
|
Update copyright date automatically (#1442)
|
2017-01-02 21:42:06 +01:00 |
|
Evgeniy Khramtsov
|
13d5da4da6
|
Add some copyright notices
|
2016-11-13 16:46:04 +03:00 |
|
Evgeniy Khramtsov
|
7e9f1a6dc1
|
Don't auto-decode forwarded payload
|
2016-11-13 13:41:04 +03:00 |
|
Evgeniy Khramtsov
|
78a44e0176
|
Merge branch 'master' into xml-ng
Conflicts:
src/adhoc.erl
src/cyrsasl_oauth.erl
src/ejabberd_c2s.erl
src/ejabberd_config.erl
src/ejabberd_service.erl
src/gen_mod.erl
src/mod_admin_extra.erl
src/mod_announce.erl
src/mod_carboncopy.erl
src/mod_client_state.erl
src/mod_configure.erl
src/mod_echo.erl
src/mod_mam.erl
src/mod_muc.erl
src/mod_muc_room.erl
src/mod_offline.erl
src/mod_pubsub.erl
src/mod_stats.erl
src/node_flat_sql.erl
src/randoms.erl
|
2016-11-12 13:27:15 +03:00 |
|
Christophe Romain
|
af0a493c66
|
Merge pull request #1253 from Amuhar/xep0356
|
2016-09-07 14:34:31 +02:00 |
|