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 |
|
HAMANO Tsukasa
|
877d0752e2
|
fix clean redis table
|
2016-08-15 17:51:06 +09:00 |
|
Evgeniy Khramtsov
|
23858469b7
|
Get rid of "jlib.hrl" dependency in some files
|
2016-07-26 11:29:17 +03:00 |
|
Evgeniy Khramtsov
|
068db1a2d9
|
Handle Redis connection in a separate module
|
2016-05-09 08:36:30 +03:00 |
|
Evgeniy Khramtsov
|
4b0860e7de
|
Make it possible to define 'sm_db_type' per virtual host
|
2016-02-19 16:38:43 +03:00 |
|
Badlop
|
f448ff608a
|
Update copyright to 2016 (#901)
|
2016-01-13 12:29:14 +01:00 |
|
Christophe Romain
|
6aeb9dcb38
|
cosmetic cleanup
|
2015-10-07 14:18:38 +02:00 |
|
Evgeniy Khramtsov
|
fb6267f38e
|
Add config validation at startup
|
2015-06-01 15:38:27 +03:00 |
|
Evgeniy Khramtsov
|
69bff82301
|
Fix type spec
|
2015-04-06 12:38:54 +03:00 |
|
Evgeniy Khramtsov
|
a0fafc383a
|
Add Redis backend for SM
|
2015-03-11 14:46:57 +03:00 |
|