846b520edc
oauth uses jiffy so fetch it unconditionally
2015-09-28 10:08:27 +02:00
88a206400a
Add oauth_access option
2015-09-25 19:48:53 +03:00
1781a58929
Strip Nick element in message stanzas sent to a room ( #686 )
2015-09-25 17:00:00 +02:00
e2cc45933f
Enable oauth unconditionally
2015-09-25 16:39:47 +02:00
5eab6e315e
Revert "Remove "--enable-json" flag"
...
This reverts commit 5bb137940c
2015-09-25 16:09:46 +02:00
a1129dc96b
Add OAuth support (thanks to Aleksey)
2015-09-25 15:49:07 +02:00
7cf904f4cf
Merge pull request #742 from joudinet/master
...
Allow root to run join_cluster and leave_cluster
2015-09-25 14:20:37 +02:00
deccf91280
Fix calling problem introduced when reducing bashisms ( #748 )
2015-09-25 13:35:03 +02:00
825f4fcc35
Merge pull request #748 from joudinet/bashisms
...
Remove bashisms in {join,leave}cluster scripts
2015-09-24 19:26:03 +02:00
ee456cc2af
Fix regression introduced when code was binarized (EJAB-641)
2015-09-24 17:21:14 +02:00
1f4d8fd4d7
Remove bashisms in {join,leave}cluster scripts
...
So they can run in any POSIX shell, not bash only.
2015-09-24 15:32:06 +02:00
484fd1f51f
Log TLS errors as [debug] messages only
...
Closes #652 and closes #679 .
2015-09-24 12:00:59 +02:00
89b3471742
Add <stanza-id/> (XEP-0359) to archived messages
2015-09-22 21:15:34 +03:00
c360326cdb
Allow root to run join_cluster and leave_cluster
...
Prefix the call to joincluster and leavecluster in ejabberdctl by
$EXEC_CMD. Avoid using sh -c in these scripts.
Should fix #676 .
2015-09-22 17:07:39 +02:00
3300c8d994
Set disable caching headers in http-bind responses (EJAB-1643)
2015-09-22 15:42:57 +02:00
e289344972
Nameprep host name passed to http-bind before using in (EJAB-1658)
2015-09-22 15:42:57 +02:00
23a1aceac0
Improve external module configuration management (EJAB-1746)
2015-09-22 12:49:55 +02:00
70b1dc479c
Add MAM (XEP-0313) v0.4 support
2015-09-22 12:23:36 +03:00
e57c1896f7
Avoid wrong failing cases on make install ( #468 )
2015-09-21 17:51:13 +02:00
df3862cf84
Add set_loglevel command (EJABS-2524)
2015-09-21 17:07:44 +02:00
497cbb3ec2
Merge branch 'master' of github.com:processone/ejabberd
2015-09-18 09:06:51 +02:00
ec1969ddca
Remove unused functions from old get_items api
2015-09-17 18:00:17 +02:00
a1a7beb24d
Make sure that lager is first on our deps list
2015-09-17 17:59:13 +02:00
f6b892b366
Guard against passing undefined C2SPid to xml parser before become_controller gets called
...
Our new nif xml parser don't handle this gracefully, so we better don't
call it that way.
This is only triggered on old style ssl sockets, where ssl layer must
be activated early, before association between socket and c2s is
established
2015-09-17 11:37:01 +02:00
4a4065c9c6
Let BOSH/WebSocket support "max_resume_timeout"
...
Allow for specifying the "max_resume_timeout" option in an ejabberd_http
listener for ejabberd_http_bind and/or ejabberd_http_ws.
2015-09-17 00:33:08 +02:00
5d11a19087
Merge pull request #736 from quanzhuo/master
...
Comment unused type, unused term
2015-09-16 18:22:19 +03:00
ae51277316
Comment unused type, unused term
2015-09-16 22:52:36 +08:00
5593ebbbca
Properly handle define_macros in merged config files
2015-09-16 12:20:07 +02:00
a8d6439a4b
Update French translation
2015-09-16 11:33:00 +02:00
18d3329f8f
Update French translation
2015-09-16 11:14:20 +02:00
e6279123e5
Update polish translation
2015-09-16 11:08:21 +02:00
59321ac56e
XEP-0198: Improve handling of non-message stanzas
...
When an XEP-0198 session times out, always return an error for
unacknowledged IQ stanzas, and always drop presence stanzas. That is,
the "resend_on_timeout" option no longer applies to those stanzas types,
but only to messages.
2015-09-15 22:42:22 +02:00
ab857b1a5e
Improve MSSQL schema
2015-09-14 14:05:07 +03:00
fc7d3a44b8
Simplify MSSQL configuration
2015-09-13 18:34:10 +03:00
25791cfde8
Fix MSSQL support
2015-09-13 18:31:49 +03:00
48c5e73321
ext_mod must be started before ejabberd_config
2015-09-11 15:14:12 +02:00
8c1864eca1
Update German translation (thanks to Nikolaus Polak)
2015-09-11 13:22:52 +02:00
df08253e91
Update Hebrew translation (thanks to Isratine Citizen)
2015-09-10 21:25:12 +02:00
a50f00f9e8
Include ext_mod modules when checking accepted options (ejabberd-contrib#116)
2015-09-10 20:11:02 +02:00
8fd9670da2
typo fix
2015-09-10 12:21:50 +02:00
4d19ef55b6
Update Esperanto and Dutch translations (thanks to Andreas van Cranenburgh)
2015-09-08 21:40:00 +02:00
6b79bcdc97
Merge branch 'master' of github.com:processone/ejabberd
2015-09-07 17:56:09 +02:00
73932fb507
Fix typo
2015-09-07 17:55:54 +02:00
5a9f1b9bba
Update Brazilian Portuguese translation (thanks to Otávio Fernandes)
2015-09-07 17:46:50 +02:00
7b230e7e44
Update Japanese translation (thanks to Tsukasa Hamano)( #729 )
2015-09-07 17:46:05 +02:00
420cf68ecd
Use our own includes + includes from all dependencies
2015-09-07 17:35:58 +02:00
64d1efa6f2
Update Catalan and Spanish translations
2015-09-07 15:06:57 +02:00
9195fc5573
Update Russian PO file
2015-09-07 15:21:42 +03:00
5d59a534a3
Run "make translations" and get updated PO files
2015-09-07 13:37:54 +02:00
096d56235b
Fix German translation (thanks to STPKITT)( #726 )
2015-09-07 13:16:56 +02:00
Paweł Chmielowski