5606 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Evgeniy Khramtsov	c0b5c6e9d4	Fix logging in tests on R17	2016-11-21 22:04:25 +03:00
Evgeniy Khramtsov	3189bb3bb9	Set 'sql_pool_size' to 1 by default for sqlite	2016-11-21 21:34:56 +03:00
Evgeniy Khramtsov	3908a80ac9	Merge branch 'master' of github.com:processone/ejabberd	2016-11-21 16:55:28 +03:00
Evgeniy Khramtsov	1a02a2a51d	Set 'sql_pool_size' to 1 for sqlite tests	2016-11-21 16:55:18 +03:00
Paweł Chmielowski	b8e8e4b971	Fix elixir tests	2016-11-21 12:50:51 +01:00
Evgeniy Khramtsov	04fdf69737	Fix non-empty disco-nodes processing	2016-11-21 14:21:34 +03:00
Paweł Chmielowski	e57de02e0f	Fix s2s test	2016-11-21 12:06:58 +01:00
Badlop	c5e7b4738f	Fix handling mod_http_upload disco#info queries: need decoded elements ... As reported in https://www.ejabberd.im/forum/28605/ejabberd-modhttpupload-error-405-not-allowed	2016-11-21 12:06:11 +01:00
Evgeniy Khramtsov	e6365979bd	Merge branch 'master' of github.com:processone/ejabberd	2016-11-21 12:14:37 +03:00
Evgeniy Khramtsov	274303f248	Fix conference disco#items when running multiple virtual hosts	2016-11-21 12:14:24 +03:00
Evgeniy Khramtsov	507e756b69	Do not send empty <after/> tag	2016-11-21 12:13:34 +03:00
Paweł Chmielowski	3f91668c46	Log more data for failed s2s connection	2016-11-21 09:52:36 +01:00
Evgeniy Khramtsov	c7ae916afc	Don't forget to start XMPP application	2016-11-21 10:23:09 +03:00
Evgeniy Khramtsov	049a6d97f1	Fix RSM for conference disco#items	2016-11-20 18:08:49 +03:00
Evgeniy Khramtsov	13c6039700	Use xmpp_util.erl from XMPP library	2016-11-19 13:57:25 +03:00
Evgeniy Khramtsov	de7a143a2c	Transform ejabberd_commands on the start	2016-11-19 13:05:13 +03:00
Evgeniy Khramtsov	9aff7e52a8	Switch to stand-alone XMPP library	2016-11-19 13:03:33 +03:00
Paweł Chmielowski	d00a634025	Fix includes in eunit compilation flags	2016-11-18 14:02:47 +01:00
Paweł Chmielowski	daab95e3b5	Fix elixir tests	2016-11-18 12:54:06 +01:00
Christophe Romain	45e77ea483	Remove useless NO_EXT_LIB flag	2016-11-18 12:25:01 +01:00
Paweł Chmielowski	e69937d93a	Get rid of substitute_forwarded	2016-11-18 11:51:57 +01:00
Evgeniy Khramtsov	f57f267c54	Merge branch 'master' of github.com:processone/ejabberd ... Conflicts: test/ejabberd_SUITE.erl	2016-11-18 13:39:10 +03:00
Evgeniy Khramtsov	b8dcc911a3	Make common tests working again	2016-11-18 13:38:08 +03:00
Paweł Chmielowski	995c97671d	Add auth to mod_http_fileserver	2016-11-17 12:59:46 +01:00
Christophe Romain	1c90b19d74	Fix typo	2016-11-16 18:24:12 +01:00
Christophe Romain	8ced3bdbe9	Remove obsolete/temp file	2016-11-16 14:18:51 +01:00
Badlop	3cd174cb56	Ensure that presence_broadcast room option is stored (#1380)	2016-11-16 13:35:50 +01:00
Badlop	e69ddd981f	Tell git to ignore the example file ejabberd.service	2016-11-16 13:12:57 +01:00
Badlop	b1723c6e2d	Handle correctly p1_http:request result	2016-11-16 13:11:23 +01:00
Rafael Römhild	5a01b5f1fc	add docker support	2016-11-16 11:48:50 +01:00
Christophe Romain	2929f5b5bc	Minor cosmetic changes on pubsub code	2016-11-15 18:35:20 +01:00
Christophe Romain	4d4ad922a2	Cosmetic validator changes	2016-11-15 18:14:21 +01:00
Christophe Romain	8df68266f2	Add missing verbs for RESTfull operation	2016-11-15 14:35:26 +01:00
Christophe Romain	2b93de6912	apply string optimizations	2016-11-15 14:32:22 +01:00
Christophe Romain	909e0eb5dd	Add configurable weight for commands	2016-11-15 14:18:34 +01:00
Paweł Chmielowski	e75dd17e2c	Fix tests that use #forwarded	2016-11-15 10:02:21 +01:00
Paweł Chmielowski	41794c57d6	Use new version of fast_xml	2016-11-15 10:02:21 +01:00
Paweł Chmielowski	5ffc01db53	Fix types in check_password_hash	2016-11-15 10:02:21 +01:00
Paweł Chmielowski	717159a98f	Make string args in http_api be list strings	2016-11-15 10:02:21 +01:00
Christophe Romain	309962fb8b	Use p1_http from p1_utils 1.0.6	2016-11-14 16:52:03 +01:00
Evgeniy Khramtsov	3765210698	Fix IQ result processing	2016-11-13 16:56:05 +03:00
Evgeniy Khramtsov	13d5da4da6	Add some copyright notices	2016-11-13 16:46:04 +03:00
Evgeniy Khramtsov	75c15d3853	Make xref working again if elixir is disabled	2016-11-13 14:29:52 +03:00
Evgeniy Khramtsov	ebefd0d8d6	Add more control for decoding IQ payloads	2016-11-13 14:17:21 +03:00
Evgeniy Khramtsov	7e9f1a6dc1	Don't auto-decode forwarded payload	2016-11-13 13:41:04 +03:00
Evgeniy Khramtsov	132033d01a	Remove unused header file	2016-11-13 10:57:53 +03:00
Evgeniy Khramtsov	21d78ed7f4	Don't use jlib.hrl outside of jlib.erl	2016-11-13 10:56:36 +03:00
Evgeniy Khramtsov	b8f22ff538	Deprecate most of the functions from jlib.erl	2016-11-13 10:44:53 +03:00
Evgeniy Khramtsov	534e73f732	Uncomment forgotten block of code	2016-11-12 14:51:43 +03:00
Evgeniy Khramtsov	de81c50199	Revert "Support to provide password when subscribing to a room (#1306)" ... This reverts commit 566ac872fe.	2016-11-12 14:47:29 +03:00