Evgeniy Khramtsov
|
0b3cf26406
|
Fix a typo
|
2017-03-29 13:20:15 +03:00 |
|
Evgeniy Khramtsov
|
12e01a5119
|
Add SQL as mod_muc RAM backend
|
2017-03-29 12:58:01 +03:00 |
|
Evgeniy Khramtsov
|
ba6c88cb90
|
Add Redis as mod_bosh RAM backend
|
2017-03-28 21:12:26 +03:00 |
|
Evgeniy Khramtsov
|
e5815553cb
|
Add SQL as mod_bosh RAM backend
|
2017-03-28 20:33:57 +03:00 |
|
Evgeniy Khramtsov
|
cba6e1b3ab
|
Add Redis as router RAM backend
|
2017-03-28 19:34:04 +03:00 |
|
Christophe Romain
|
0f864d9466
|
Mix needs include path to p1_utils
|
2017-03-28 16:08:10 +02:00 |
|
Evgeniy Khramtsov
|
117f31125d
|
Add SQL as router RAM backend
|
2017-03-28 16:31:37 +03:00 |
|
Holger Weiss
|
510fde58d8
|
mod_http_upload: Don't add "Server" header line
Administrators can add the "Server" header line using the new listener
option "custom_headers", if desired.
|
2017-03-28 00:03:17 +02:00 |
|
Holger Weiss
|
191fc1b4e8
|
ejabberd_http: Expand @VERSION@ in custom headers
Let ejabberd_http expand the @VERSION@ keyword to the ejabberd version
if specified in the "custom_headers" listener option.
Closes #1414.
|
2017-03-27 23:52:49 +02:00 |
|
Holger Weiss
|
41de5e78d0
|
ejabberd_http: Add "custom_headers" option
If the new listener option "custom_headers" is specified, include those
headers with the HTTP(S) response.
Closes #517.
|
2017-03-27 23:19:11 +02:00 |
|
Christophe Romain
|
5b6d042de2
|
Fix PEP issues (#1636)
|
2017-03-27 16:24:24 +02:00 |
|
Evgeniy Khramtsov
|
e30d41e5f0
|
Merge branch 'new_queue'
Conflicts:
rebar.config
src/mod_muc_admin.erl
|
2017-03-24 13:27:56 +03:00 |
|
Evgeniy Khramtsov
|
e1f01f0c8a
|
Avoid PID collisions
Fixes #1470
|
2017-03-24 11:03:23 +03:00 |
|
Christophe Romain
|
e56c6545fa
|
Add inets in included_application for mix
|
2017-03-23 12:20:02 +01:00 |
|
Paweł Chmielowski
|
cb0627e6b2
|
Expand ejabberd.yml.example by enabling mod_http_api with couple commands
|
2017-03-22 14:30:12 +01:00 |
|
Christophe Romain
|
6c0419db2b
|
Update mix dependencies
|
2017-03-22 11:59:39 +01:00 |
|
Christophe Romain
|
232cb3dd45
|
Update dependencies
|
2017-03-22 10:06:21 +01:00 |
|
Christophe Romain
|
430fc8eb62
|
Update docker files from latest Rafael's changes
|
2017-03-21 18:59:12 +01:00 |
|
Holger Weiss
|
e469b6ffb4
|
prosody2ejabberd: Fix offline message record type
mod_offline now expects a #message{} rather than an #xmlel{} record.
|
2017-03-21 18:35:07 +01:00 |
|
Holger Weiss
|
a1068df602
|
prosody2ejabberd: Fix message attribute removal
Actually remove the 'stamp' and 'stamp_legacy' attributes from imported
offline messages as intended.
|
2017-03-21 18:23:55 +01:00 |
|
Paweł Chmielowski
|
f819272b88
|
Fix crash in mod_muc_admin, we operate on integers here not lists
|
2017-03-21 15:36:42 +01:00 |
|
Alexey Shchepin
|
9fb188afbc
|
Don't block contacts with subscription=to in mod_block_strangers (#1609)
|
2017-03-21 15:42:38 +03:00 |
|
Christophe Romain
|
70050b52ad
|
Use item creation date in rsm order (#1516)
|
2017-03-21 12:45:41 +01:00 |
|
Evgeny Khramtsov
|
44484fa4ae
|
Merge pull request #1626 from weiss/fix-scram-import
prosody2ejabberd: Fix SCRAM hash conversion
|
2017-03-21 15:44:29 +04:00 |
|
Christophe Romain
|
69b52196bd
|
Replace mod_http_bind by mod_bosh in config example
|
2017-03-21 11:15:01 +01:00 |
|
Evgeniy Khramtsov
|
f7cb7ef014
|
Remove misleading sentence about s2s dialback
|
2017-03-20 21:48:31 +03:00 |
|
Paweł Chmielowski
|
b9cd5ca07f
|
Resolve vars.config relative to to rebar.config.script
This fixes problem with missing deps in make rel - issue #1615
|
2017-03-20 18:28:49 +01:00 |
|
Christophe Romain
|
6017785e10
|
Fix compilation with mix (#1588)
|
2017-03-20 16:58:48 +01:00 |
|
Christophe Romain
|
186fda098c
|
Update mix deps
|
2017-03-20 16:26:16 +01:00 |
|
Christophe Romain
|
b6e1858ce6
|
Update xmpp and fast_tls versions
|
2017-03-20 15:33:55 +01:00 |
|
Evgeniy Khramtsov
|
7ab4f32c1a
|
Revert "Bump OTP version to 19.3 in Travis config"
This reverts commit 7113f2b8ba.
|
2017-03-20 14:08:58 +03:00 |
|
Evgeniy Khramtsov
|
7113f2b8ba
|
Bump OTP version to 19.3 in Travis config
|
2017-03-20 13:49:23 +03:00 |
|
Evgeniy Khramtsov
|
c526c02d92
|
Remove webtool from erlang.plt creation
|
2017-03-20 13:48:17 +03:00 |
|
Evgeniy Khramtsov
|
f3ecba0445
|
Use new xdata compiler API
|
2017-03-20 09:57:11 +03:00 |
|
Evgeniy Khramtsov
|
06f42bc749
|
Better log s2s auth failures when TLS is not available
|
2017-03-18 13:59:24 +03:00 |
|
Evgeniy Khramtsov
|
72da5bd062
|
Log startup time
|
2017-03-18 10:24:42 +03:00 |
|
Evgeny Khramtsov
|
e56a76299c
|
Merge pull request #1617 from edwardchow33/patch-1
Fix wrong parameter values in mod_muc_admin
|
2017-03-18 02:40:14 +04:00 |
|
Edward Chow
|
c5af421cee
|
Fixed wrong parameter values in mod_muc_admin
Corrected wrong parameter values passing to register_online_room(Room, Host, Pid) of mod_muc
|
2017-03-18 03:07:23 +08:00 |
|
Evgeniy Khramtsov
|
91245141e9
|
Set translation callback on startup
|
2017-03-17 21:35:02 +03:00 |
|
Paweł Chmielowski
|
2d67ff2249
|
Teach mod_http_fileserver ability to send 304 Not Modified
|
2017-03-17 11:58:40 +01:00 |
|
Holger Weiss
|
0ef6973457
|
prosody2ejabberd: Fix SCRAM hash conversion
Closes #1549.
|
2017-03-16 23:15:08 +01:00 |
|
Badlop
|
1aeaa794e1
|
Encode in base64 when getting scram data with import_prosody (#1549)
|
2017-03-15 11:42:26 +01:00 |
|
Evgeniy Khramtsov
|
b932afb0cd
|
Use correct pid when registering local route
This fixes #1600
|
2017-03-15 10:27:22 +03:00 |
|
Alexey Shchepin
|
9a142eb807
|
Update cyrsasl_oauth to internal API changes
|
2017-03-14 17:25:09 +03:00 |
|
Alexey Shchepin
|
069d28b1ed
|
Get rid of p1_sha calls
|
2017-03-14 02:31:51 +03:00 |
|
Paweł Chmielowski
|
301b1b7a7a
|
Fix handling of xmlrpc request without authentication structure
This is problem from issue #1602
|
2017-03-13 16:41:52 +01:00 |
|
Badlop
|
113ed66f49
|
In module_install copy also deps/ebin and priv files (ejabberd-contrib#200)
|
2017-03-13 11:26:58 +01:00 |
|
Evgeny Khramtsov
|
a90c337297
|
Merge pull request #1603 from strugee/patch-1
Note how to apply s2s Access Rights in the example
|
2017-03-12 18:34:14 +04:00 |
|
Evgeniy Khramtsov
|
071c1dcb64
|
Return 'closed' instead of 'einval' on closed sockets
|
2017-03-12 08:55:54 +03:00 |
|
Alex Jordan
|
c4ed1c2764
|
Note how to apply s2s Access Rights in the example
|
2017-03-10 23:53:01 -05:00 |
|