25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-10-31 15:21:38 +01:00
Commit Graph

4167 Commits

Author SHA1 Message Date
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
Evgeniy Khramtsov
94444c87e8 Remove MAM archives on MUC room destroy 2015-08-24 13:28:58 +03:00
Badlop
247bd9eae5 More eye-candy mod_http_bind help page (thanks to Marek Foss) 2015-08-21 15:23:15 +02:00
Evgeniy Khramtsov
6177ae3ffb Improve S2S certificate checks 2015-08-20 01:04:56 +03:00
Evgeniy Khramtsov
b570070834 Fix case clause during S2S certificate checks 2015-08-19 23:47:45 +03:00
Evgeniy Khramtsov
775cf2d459 Change namespace from muc#admin to muc#user 2015-08-19 15:31:35 +03:00
Paweł Chmielowski
6f0ee83317 Don't overwrite listeners for different transports in config merging
Before this having listeners on same port for both tcp and udp would after
config merging step left only one of them.

Many thanks to Holger Weiß for noticing this.
2015-08-19 10:14:39 +02:00
Paweł Chmielowski
f89db30d77 Catch errors when calling inet:peername in ejabberd_http 2015-08-17 15:50:35 +02:00
Holger Weiss
6d16029716 Let ejabberdctl handle more shell metacharacters
Closes #704.
2015-08-15 17:01:47 +02:00
Holger Weiss
3efd0ebc5a configure.ac: Don't insist on Erlang/OTP >= 17.5
The current ejabberd code works on Erlang/OTP 17.1 or newer.  We now
also let Travis CI test this version in addition to 17.5.
2015-08-13 13:06:05 +02:00
Badlop
ac6b436dcf Prettify copyright links (thanks to GreenLunar)(#692) 2015-08-13 12:22:14 +02:00
Badlop
994602c97d Store and retrieve "mam" value in room configuration 2015-08-12 20:28:23 +02:00
Badlop
279d4b00ac Fix and document create_rooms_file and destroy_ 2015-08-12 17:18:41 +02:00
Badlop
8c9c556f1f Changed API of some mod_muc_admin command arguments
With this commit, arguments change in two commands:
* destroy_room: does not require Host argument
* send_direct_invitation: instead of Room, now requires Name and Service
2015-08-12 13:26:24 +02:00
Badlop
ab0f488dda Room response to disco#info node muc#traffic should be an error (EJAB-741) 2015-08-12 12:40:51 +02:00
Paweł Chmielowski
2392f09e99 Ejabberd now requires erlang R17+ 2015-08-12 11:53:54 +02:00
Evgeniy Khramtsov
40feed723d Add support for MUC MAM 2015-08-08 22:15:36 +03:00
Paweł Chmielowski
c71d57a05d Handle merging of append_host_config as is done for host_config 2015-08-06 17:53:18 +02:00
Paweł Chmielowski
5a1ac4faf1 Add ability to override main config file options with data from included files 2015-08-06 17:12:15 +02:00