3ac73f9607
Update dependencies
2016-11-25 13:02:31 +01:00
18609befa4
Merge branch 'master' of github.com:processone/ejabberd
2016-11-25 10:07:04 +01:00
ae297a4ae6
Merge branch 'ukutaht-enable-elixir-in-mix'
2016-11-25 10:05:28 +01:00
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
ca1b22bdd4
Use ejabberd_router:route_error/4 wherever possible
2016-11-25 11:41:24 +03:00
4d6eb31264
Use new version of xmpp in mix
2016-11-25 09:31:49 +01:00
e1539e5769
Get rid of compile warnings
2016-11-25 09:48:26 +03:00
993cbcb133
Use new version of xmpp
2016-11-25 09:39:09 +03:00
d554827ebc
Don't check for faked carbons
2016-11-24 20:16:07 +03:00
0f11b1be36
Don't forget to erase cache on user removal
2016-11-24 18:40:20 +03:00
28d0a1b9d2
Make compatible with rebar3
2016-11-24 14:23:20 +01:00
49f1275e20
Get rid of excessive (io)list_to_binary/1 calls
2016-11-24 15:06:06 +03:00
b14843d098
Add missing -callbacks
2016-11-24 12:44:21 +01:00
8f692f51d8
Merge pull request #1391 from weiss/mark-copies
...
Mark messages as copies by attaching metadata
2016-11-24 15:43:38 +04:00
560038c808
Use xmpp:put_meta/3 to update metadata
2016-11-24 10:47:26 +01:00
d12210f4e1
Use new versions of fast_xml and xmpp
2016-11-24 10:45:57 +01:00
9c3ebb7d22
Don't make ejabberd.service file executable
2016-11-24 07:59:27 +01:00
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
cbda2e038e
Merge branch 'weiss-systemd-unit-improvements' ( #1346 )
2016-11-23 14:37:34 +01:00
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
12683b4aaf
Fix typo in copyright date
2016-11-23 14:36:11 +01:00
5d434c1aea
Move copyright definition to ejabberd.hrl
2016-11-23 15:51:48 +03:00
6f2f1e87c9
Don't use deprecated functions from jlib.erl
2016-11-23 10:41:26 +03:00
3325e69ae6
Let mod_carboncopy mark copied messages
...
Carbon copies are now marked with a 'carbon_copy' flag. This makes it
easier to identify them.
2016-11-22 22:21:34 +01:00
114ca786ee
Let ejabberd_sm mark copied messages
...
When multiple resources have the same (highest) priority, ejabberd_sm
dispatches messages addressed to the bare JID (or to an unavailable
resource) to each of these resources. Such messages are now marked with
an 'sm_copy' flag for all but one of the resources. This makes it
easier for other modules to identify those duplicates.
Resolves #1356 .
2016-11-22 19:25:20 +01:00
ee8cc1dac2
Fix xref issue injected by fbfbb96
2016-11-22 17:51:21 +01:00
9ab169bc63
Fix get_roster issue injected by fbfbb96
2016-11-22 16:59:02 +01:00
24ef90c556
Fix vcard_ldap exports
2016-11-22 16:23:02 +01:00
c0e7b298db
Add missing export
2016-11-22 16:12:19 +01:00
cc63bcc997
Fix issues on import improvements
2016-11-22 16:01:08 +01:00
a2fb493f91
Add missing include file
2016-11-22 15:35:47 +01:00
ebadcf71c2
New bosh module
2016-11-22 15:26:15 +01:00
fbfbb96872
Improve ODBC import
2016-11-22 14:48:01 +01:00
577eeb642f
Add new xmpp repo as dependency in mix.exs
2016-11-22 14:43:10 +01:00
7ffab38b44
Remove now() from mod_offline.hrl
2016-11-22 13:15:43 +01:00
2786df651a
Add OTP 19.1 to Travis' testing platforms
2016-11-22 09:52:26 +03:00
c0b5c6e9d4
Fix logging in tests on R17
2016-11-21 22:04:25 +03:00
3189bb3bb9
Set 'sql_pool_size' to 1 by default for sqlite
2016-11-21 21:34:56 +03:00
3908a80ac9
Merge branch 'master' of github.com:processone/ejabberd
2016-11-21 16:55:28 +03:00
1a02a2a51d
Set 'sql_pool_size' to 1 for sqlite tests
2016-11-21 16:55:18 +03:00
b8e8e4b971
Fix elixir tests
2016-11-21 12:50:51 +01:00
04fdf69737
Fix non-empty disco-nodes processing
2016-11-21 14:21:34 +03:00
e57de02e0f
Fix s2s test
2016-11-21 12:06:58 +01:00
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
e6365979bd
Merge branch 'master' of github.com:processone/ejabberd
2016-11-21 12:14:37 +03:00
274303f248
Fix conference disco#items when running multiple virtual hosts
2016-11-21 12:14:24 +03:00
507e756b69
Do not send empty <after/> tag
2016-11-21 12:13:34 +03:00
3f91668c46
Log more data for failed s2s connection
2016-11-21 09:52:36 +01:00
c7ae916afc
Don't forget to start XMPP application
2016-11-21 10:23:09 +03:00
049a6d97f1
Fix RSM for conference disco#items
2016-11-20 18:08:49 +03:00
Christophe Romain