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 |
|
Badlop
|
149cc9654f
|
Append ; to privacy_list_data exporting lines (thanks to Marcio Luciano Donada)
|
2016-10-24 13:42:33 +02:00 |
|
Evgeniy Khramtsov
|
fa31e3ef23
|
Deprecate jlib:integer_to_binary/1 and jlib:binary_to_integer/1
|
2016-09-24 23:34:28 +03:00 |
|
Evgeniy Khramtsov
|
23858469b7
|
Get rid of "jlib.hrl" dependency in some files
|
2016-07-26 11:29:17 +03:00 |
|
Evgeniy Khramtsov
|
9a8e197d7e
|
Initial version based on XML generator
|
2016-07-18 15:01:32 +03:00 |
|
Alexey Shchepin
|
0ea0ba3004
|
Update more SQL queries
|
2016-05-05 15:51:58 +03:00 |
|
Evgeniy Khramtsov
|
1aae8a9fda
|
Rename odbc to sql everywhere
|
2016-04-20 13:25:42 +03:00 |
|
Evgeniy Khramtsov
|
c8c4a41b66
|
Clean mod_privacy.erl from DB specific code
|
2016-04-14 14:16:32 +03:00 |
|