Badlop
|
5fdd1c39fe
|
Update copyright date automatically (#1442)
|
2017-01-02 21:42:06 +01:00 |
|
Evgeniy Khramtsov
|
666608544b
|
Improve return values in cyrsasl API
|
2017-01-02 14:55:06 +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 |
|
Mickael Remond
|
674a8039ef
|
Add support for sending back missing scope error to API ReST command calls
|
2016-07-30 18:51:54 +02:00 |
|
Evgeniy Khramtsov
|
9a8e197d7e
|
Initial version based on XML generator
|
2016-07-18 15:01:32 +03:00 |
|
Badlop
|
f448ff608a
|
Update copyright to 2016 (#901)
|
2016-01-13 12:29:14 +01:00 |
|
Alexey Shchepin
|
4fce1a17d7
|
Fix cyrsasl_oauth:mech_new call
|
2015-10-12 20:53:52 +03:00 |
|
Christophe Romain
|
a1129dc96b
|
Add OAuth support (thanks to Aleksey)
|
2015-09-25 15:49:07 +02:00 |