Badlop
|
5fdd1c39fe
|
Update copyright date automatically (#1442)
|
2017-01-02 21:42:06 +01: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 |
|
Evgeniy Khramtsov
|
5ec972b00f
|
Improve pubsub code
|
2016-09-08 15:49:27 +03:00 |
|
Christophe Romain
|
a9c6748ec7
|
Add missing comas in sql statement (#1219)
|
2016-08-01 10:55:02 +02:00 |
|
Christophe Romain
|
3820aaa421
|
Quote reserver 'type' keyword for pgsql to fix e300f80
|
2016-07-05 16:16:40 +02:00 |
|
Christophe Romain
|
e300f8095d
|
Fix use of like parameter in sql pubsub's requests
|
2016-07-05 15:43:59 +02:00 |
|
Alexey Shchepin
|
d201f013b2
|
Stronger tests in the test suite, SQL updates and fixes
|
2016-06-02 18:09:58 +03:00 |
|
Alexey Shchepin
|
792f47b4bd
|
Update SQL escaping
|
2016-05-13 17:56:48 +03:00 |
|
Evgeniy Khramtsov
|
1aae8a9fda
|
Rename odbc to sql everywhere
|
2016-04-20 13:25:42 +03:00 |