5169 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Christophe Romain	bcc04d93e1	Enforce pubsub node removal, revert previous commit (#1320) ... This reverts commit 2976c2d921. and enforce node purge/removal instead	2016-12-09 12:51:08 +01:00
Christophe Romain	2976c2d921	Enforce affiliation removal, remove corresponding items (#1320)	2016-12-09 11:35:51 +01:00
Paweł Chmielowski	a50247c20d	Improve handling on acl rules in api_permissions	2016-12-08 18:08:54 +01:00
Mickael Remond	fdf69dcd0d	API call does not necessary use token, it could use basic auth	2016-12-08 16:28:47 +01:00
Paweł Chmielowski	a3b12fd745	Recognize "- who:" not only "who:" syntax in api_permissions	2016-12-08 12:01:24 +01:00
Christophe Romain	8a7ea85a7e	Cleanup ext_mod and fix compilation path	2016-12-07 09:27:21 +01:00
Paweł Chmielowski	a681874f67	Try to fix interminent failures in cyrsasl tests	2016-12-06 18:33:16 +01:00
Mickael Remond	1c8edd07a1	Update xmpp lib version and fix path when using deps.get and compile in same commande	2016-12-06 17:54:21 +01:00
Christophe Romain	1883a98d1c	Fix compilation of external module with new xmpp lib	2016-12-06 12:01:04 +01:00
Christophe Romain	0c2491d9ea	Remove obsolete remove_node api (use leave_cluster)	2016-12-05 14:17:57 +01:00
Christophe Romain	23f7075313	Fix reload_config	2016-12-02 16:29:46 +01:00
Paweł Chmielowski	23786c95c9	Grab new version of xmpp dep	2016-12-02 16:28:14 +01:00
Badlop	847376924e	Add password support in muc_subscribe (#1306)	2016-12-02 16:18:35 +01:00
Badlop	d7e1f6d7b3	When unsubscribes, check if room should get closed (#1396)	2016-12-01 22:09:57 +01:00
Badlop	34f2a8a4f2	Fix error formatting, which closed client connection (#1389)	2016-12-01 21:02:54 +01:00
Paweł Chmielowski	68cf6845e1	Fix mod_http_api_mock_test on 19.1	2016-12-01 18:51:23 +01:00
Paweł Chmielowski	294d58a393	Add more tests for digest-md5 cyrsasl	2016-12-01 18:51:23 +01:00
Mickael Remond	732eecac43	Move to latest Elixir version	2016-12-01 15:44:52 +01:00
Mickael Remond	a3c134c43b	We can now use dependencies published in hex.pm	2016-12-01 15:10:00 +01:00
Mickael Remond	309fd56fb4	Merge branch 'master' of github.com:processone/ejabberd	2016-12-01 15:05:09 +01:00
Badlop	8618af4e34	Fixes pt-br translation (thanks to Rodrigues)(#1393)	2016-11-30 16:51:42 +01:00
Christophe Romain	32f484a349	Fix typo introduced by 92db9ff changes	2016-11-30 13:50:46 +01:00
Christophe Romain	92db9ff105	Improve handling of mnesia schema	2016-11-30 11:09:17 +01:00
Christophe Romain	95a4b1b266	Cleanup admin_extra, add few functions	2016-11-30 10:31:36 +01:00
Christophe Romain	2cd70280d2	Merge branch 'docker' from Rafael Römhild	2016-11-30 10:30:19 +01:00
Christophe Romain	fc7e52df71	Adds optional post_install and pre_uninstall hooks (thanks Igor Manturov Jr.)(#1300)	2016-11-28 17:15:57 +01:00
Evgeniy Khramtsov	56b30ab598	Improve translation of some messages	2016-11-26 10:05:22 +03:00
Christophe Romain	3ac73f9607	Update dependencies	2016-11-25 13:02:31 +01:00
Christophe Romain	18609befa4	Merge branch 'master' of github.com:processone/ejabberd	2016-11-25 10:07:04 +01:00
Christophe Romain	ae297a4ae6	Merge branch 'ukutaht-enable-elixir-in-mix'	2016-11-25 10:05:28 +01:00
Christophe Romain	9432a16893	Merge branch 'enable-elixir-in-mix' of https://github.com/ukutaht/ejabberd into ukutaht-enable-elixir-in-mix	2016-11-25 10:05:01 +01:00
Evgeniy Khramtsov	ca1b22bdd4	Use ejabberd_router:route_error/4 wherever possible	2016-11-25 11:41:24 +03:00
Christophe Romain	4d6eb31264	Use new version of xmpp in mix	2016-11-25 09:31:49 +01:00
Evgeniy Khramtsov	e1539e5769	Get rid of compile warnings	2016-11-25 09:48:26 +03:00
Evgeniy Khramtsov	993cbcb133	Use new version of xmpp	2016-11-25 09:39:09 +03:00
Evgeniy Khramtsov	d554827ebc	Don't check for faked carbons	2016-11-24 20:16:07 +03:00
Evgeniy Khramtsov	0f11b1be36	Don't forget to erase cache on user removal	2016-11-24 18:40:20 +03:00
Paweł Chmielowski	28d0a1b9d2	Make compatible with rebar3	2016-11-24 14:23:20 +01:00
Evgeniy Khramtsov	49f1275e20	Get rid of excessive (io)list_to_binary/1 calls	2016-11-24 15:06:06 +03:00
Paweł Chmielowski	b14843d098	Add missing -callbacks	2016-11-24 12:44:21 +01:00
Evgeny Khramtsov	8f692f51d8	Merge pull request #1391 from weiss/mark-copies ... Mark messages as copies by attaching metadata	2016-11-24 15:43:38 +04:00
Holger Weiss	560038c808	Use xmpp:put_meta/3 to update metadata	2016-11-24 10:47:26 +01:00
Holger Weiss	d12210f4e1	Use new versions of fast_xml and xmpp	2016-11-24 10:45:57 +01:00
Holger Weiss	9c3ebb7d22	Don't make ejabberd.service file executable	2016-11-24 07:59:27 +01:00
Holger Weiss	b6ddcf3e58	Makefile.in: Substitute all @variables@ in a line ... There are now lines with multiple occurrences of the @ctlscriptpath@ variable in the ejabberd.service template.	2016-11-24 07:55:06 +01:00
Christophe Romain	cbda2e038e	Merge branch 'weiss-systemd-unit-improvements' (#1346)	2016-11-23 14:37:34 +01:00
Christophe Romain	6a4f2a78ff	Merge branch 'systemd-unit-improvements' of https://github.com/weiss/ejabberd into weiss-systemd-unit-improvements	2016-11-23 14:36:50 +01:00
Christophe Romain	12683b4aaf	Fix typo in copyright date	2016-11-23 14:36:11 +01:00
Evgeniy Khramtsov	5d434c1aea	Move copyright definition to ejabberd.hrl	2016-11-23 15:51:48 +03:00
Evgeniy Khramtsov	6f2f1e87c9	Don't use deprecated functions from jlib.erl	2016-11-23 10:41:26 +03:00