Paweł Chmielowski
a1a7beb24d
Make sure that lager is first on our deps list
2015-09-17 17:59:13 +02:00
Paweł Chmielowski
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
Holger Weiss
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
Evgeny Khramtsov
5d11a19087
Merge pull request #736 from quanzhuo/master
...
Comment unused type, unused term
2015-09-16 18:22:19 +03:00
Quan Zhuo
ae51277316
Comment unused type, unused term
2015-09-16 22:52:36 +08:00
Paweł Chmielowski
5593ebbbca
Properly handle define_macros in merged config files
2015-09-16 12:20:07 +02:00
Mickael Remond
a8d6439a4b
Update French translation
2015-09-16 11:33:00 +02:00
Mickael Remond
18d3329f8f
Update French translation
2015-09-16 11:14:20 +02:00
Paweł Chmielowski
e6279123e5
Update polish translation
2015-09-16 11:08:21 +02:00
Holger Weiss
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
Evgeniy Khramtsov
ab857b1a5e
Improve MSSQL schema
2015-09-14 14:05:07 +03:00
Evgeniy Khramtsov
fc7d3a44b8
Simplify MSSQL configuration
2015-09-13 18:34:10 +03:00
Evgeniy Khramtsov
25791cfde8
Fix MSSQL support
2015-09-13 18:31:49 +03:00
Christophe Romain
48c5e73321
ext_mod must be started before ejabberd_config
2015-09-11 15:14:12 +02:00
Badlop
8c1864eca1
Update German translation (thanks to Nikolaus Polak)
2015-09-11 13:22:52 +02:00
Badlop
df08253e91
Update Hebrew translation (thanks to Isratine Citizen)
2015-09-10 21:25:12 +02:00
Badlop
a50f00f9e8
Include ext_mod modules when checking accepted options (ejabberd-contrib#116)
2015-09-10 20:11:02 +02:00
Christophe Romain
8fd9670da2
typo fix
2015-09-10 12:21:50 +02:00
Badlop
4d19ef55b6
Update Esperanto and Dutch translations (thanks to Andreas van Cranenburgh)
2015-09-08 21:40:00 +02:00
Mickael Remond
6b79bcdc97
Merge branch 'master' of github.com:processone/ejabberd
2015-09-07 17:56:09 +02:00
Mickael Remond
73932fb507
Fix typo
2015-09-07 17:55:54 +02:00
Badlop
5a9f1b9bba
Update Brazilian Portuguese translation (thanks to Otávio Fernandes)
2015-09-07 17:46:50 +02:00
Badlop
7b230e7e44
Update Japanese translation (thanks to Tsukasa Hamano)( #729 )
2015-09-07 17:46:05 +02:00
Mickael Remond
420cf68ecd
Use our own includes + includes from all dependencies
2015-09-07 17:35:58 +02:00
Badlop
64d1efa6f2
Update Catalan and Spanish translations
2015-09-07 15:06:57 +02:00
Evgeniy Khramtsov
9195fc5573
Update Russian PO file
2015-09-07 15:21:42 +03:00
Badlop
5d59a534a3
Run "make translations" and get updated PO files
2015-09-07 13:37:54 +02:00
Badlop
096d56235b
Fix German translation (thanks to STPKITT)( #726 )
2015-09-07 13:16:56 +02:00
Paweł Chmielowski
f56a9e400d
Pass stream management options defined in http listener to http-bind and websocket
2015-09-04 12:42:53 +02:00
Holger Weiss
5095fdb6b0
New XEP-0198 option: "max_resume_timeout"
...
In the past, the "resume_timeout" option defined both the default resume
timeout and the maximum resume timeout clients are permitted to request.
Admins might want to allow clients to request a timeout value that's
larger than the default, though. This can now be done by specifying the
"max_resume_timeout" option.
2015-09-03 21:20:15 +02:00
Badlop
8d1ea87e02
Use hide_sensitive_log_data in eldap.erl
2015-09-03 16:28:21 +02:00
Mickael Remond
a85a8dff45
Merge branch 'master' of github.com:processone/ejabberd
2015-09-02 17:02:20 +02:00
Mickael Remond
06193d18b8
Better to keep config file in a different config directory
2015-09-02 17:02:09 +02:00
Evgeniy Khramtsov
6740b1f0e1
Rename idna.erl to ejabberd_idna.erl ( #702 )
2015-09-02 16:02:46 +03:00
Mickaël Rémond
608661d8c0
Merge pull request #725 from processone/elixir-mix
...
Allow building an ejabberd release with mix and elixir release manager
2015-09-02 14:25:43 +02:00
Badlop
1bc2c8cbb1
Add verification of hide_sensitive_log_data global option
2015-09-02 13:46:03 +02:00
Evgeniy Khramtsov
eebd4bbd8f
Remove unused function now_to_iso/1
2015-09-02 14:13:23 +03:00
Mickael Remond
4ae7c81cfa
Allow building ejabberd with Elixir mix and building and ejabberd OTP release
2015-09-02 12:49:19 +02:00
Mickael Remond
e179727a0e
ignore ejabberd release result directory
2015-09-02 12:48:19 +02:00
Mickael Remond
79d3b77de1
Update mix.exs to comply with exrm release system
2015-09-02 11:38:16 +02:00
Mickaël Rémond
87f39c8750
Update mix.exs
...
Fix version number.
2015-09-02 10:54:24 +02:00
Mickael Remond
b6bf1eba42
Upgrade version number to ejabberd 15.07
...
We forgot before previous release
2015-09-02 09:11:06 +02:00
Evgeniy Khramtsov
14ddbce3a9
Do not forget to set from/to when fetching from MUC history
2015-09-01 12:35:51 +03:00
Paweł Chmielowski
e24bfe7b62
Fix problem with merging same port, different ip listeners in config files
...
Also switch to function used by ejabberd_listener to extract that
information instead of rolling our own code for that.
2015-09-01 10:57:48 +02:00
Evgeniy Khramtsov
190f76c676
Fetch MUC MAM messages from room history directly if it's not enabled in room configuration
2015-09-01 11:52:08 +03:00
Holger Weiss
9f62426343
Update MAM tests to always expect RSM in response
2015-08-30 23:26:37 +02:00
Evgeny Khramtsov
3ed75890cb
Merge pull request #721 from oxpa/muc_admin
...
get_room_options will not crash in case of query for a non-existent room
2015-08-28 15:23:00 +03:00
oxpa
3d5d1ecbe4
get_room_options will not crash in case of query for a non-existent room
2015-08-28 03:34:51 -08:00
Holger Weiss
5bb137940c
Remove "--enable-json" flag
...
The "--enable-json" flag currently has no effect.
2015-08-27 22:16:11 +02:00
Evgeniy Khramtsov
832f6d39f9
Always include RSM in final message
2015-08-24 13:29:15 +03:00
