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 |
|
Mickael Remond
|
e5fd1ee4f6
|
Avoid starting several time the owner process
|
2016-07-26 12:12:48 +02:00 |
|
Mickael Remond
|
9ff7257287
|
Make jlib ETS table more resilient
|
2016-07-26 11:58:14 +02: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 |
|
Holger Weiss
|
ff199a323d
|
Fix jid:from_string/1 function specification
|
2016-05-15 16:19:13 +02:00 |
|
Mickael Remond
|
31c194a682
|
Add simple Elixir unit test on jid:from_string
|
2016-03-21 09:44:23 +01:00 |
|
Badlop
|
f448ff608a
|
Update copyright to 2016 (#901)
|
2016-01-13 12:29:14 +01:00 |
|
Evgeniy Khramtsov
|
95265dd3ad
|
Move JID related functions to jid.erl (#847)
|
2015-11-24 18:44:13 +03:00 |
|