aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* typo fixChristophe Romain2015-09-101-2/+0
|
* Update Esperanto and Dutch translations (thanks to Andreas van Cranenburgh)Badlop2015-09-082-61/+48
|
* Merge branch 'master' of github.com:processone/ejabberdMickael Remond2015-09-072-70/+46
|\
| * Update Brazilian Portuguese translation (thanks to Otávio Fernandes)Badlop2015-09-071-59/+38
| |
| * Update Japanese translation (thanks to Tsukasa Hamano)(#729)Badlop2015-09-071-11/+8
| |
* | Fix typoMickael Remond2015-09-071-1/+1
|/
* Use our own includes + includes from all dependenciesMickael Remond2015-09-071-2/+3
|
* Update Catalan and Spanish translationsBadlop2015-09-072-37/+30
|
* Update Russian PO fileEvgeniy Khramtsov2015-09-071-358/+268
|
* Run "make translations" and get updated PO filesBadlop2015-09-0727-10605/+11477
|
* Fix German translation (thanks to STPKITT)(#726)Badlop2015-09-072-2/+2
|
* Pass stream management options defined in http listener to http-bind and ↵Paweł Chmielowski2015-09-045-18/+34
| | | | websocket
* New XEP-0198 option: "max_resume_timeout"Holger Weiss2015-09-031-3/+10
| | | | | | | | 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.
* Use hide_sensitive_log_data in eldap.erlBadlop2015-09-031-2/+2
|
* Merge branch 'master' of github.com:processone/ejabberdMickael Remond2015-09-023-5/+5
|\
| * Rename idna.erl to ejabberd_idna.erl (#702)Evgeniy Khramtsov2015-09-023-5/+5
| |
* | Better to keep config file in a different config directoryMickael Remond2015-09-021-1/+1
|/
* Merge pull request #725 from processone/elixir-mixMickaël Rémond2015-09-023-2/+16
|\ | | | | Allow building an ejabberd release with mix and elixir release manager
| * Allow building ejabberd with Elixir mix and building and ejabberd OTP releaseMickael Remond2015-09-022-1/+12
| |
| * ignore ejabberd release result directoryMickael Remond2015-09-021-0/+1
| |
| * Update mix.exs to comply with exrm release systemMickael Remond2015-09-021-1/+3
| |
* | Add verification of hide_sensitive_log_data global optionBadlop2015-09-021-1/+3
| |
* | Remove unused function now_to_iso/1Evgeniy Khramtsov2015-09-021-5/+0
|/
* Update mix.exsMickaël Rémond2015-09-021-1/+1
| | | Fix version number.
* Upgrade version number to ejabberd 15.07Mickael Remond2015-09-021-1/+1
| | | | We forgot before previous release
* Do not forget to set from/to when fetching from MUC historyEvgeniy Khramtsov2015-09-011-3/+1
|
* Fix problem with merging same port, different ip listeners in config filesPaweł Chmielowski2015-09-011-4/+2
| | | | | Also switch to function used by ejabberd_listener to extract that information instead of rolling our own code for that.
* Fetch MUC MAM messages from room history directly if it's not enabled in ↵Evgeniy Khramtsov2015-09-011-5/+64
| | | | room configuration
* Update MAM tests to always expect RSM in responseHolger Weiss2015-08-301-2/+4
|
* Merge pull request #721 from oxpa/muc_adminEvgeny Khramtsov2015-08-281-2/+4
|\ | | | | get_room_options will not crash in case of query for a non-existent room
| * get_room_options will not crash in case of query for a non-existent roomoxpa2015-08-281-2/+4
| |
* | Remove "--enable-json" flagHolger Weiss2015-08-274-18/+3
|/ | | | The "--enable-json" flag currently has no effect.
* Always include RSM in final messageEvgeniy Khramtsov2015-08-241-6/+2
|
* Remove MAM archives on MUC room destroyEvgeniy Khramtsov2015-08-242-3/+23
|
* More eye-candy mod_http_bind help page (thanks to Marek Foss)Badlop2015-08-211-32/+127
|
* Improve S2S certificate checksEvgeniy Khramtsov2015-08-201-1/+3
|
* Fix case clause during S2S certificate checksEvgeniy Khramtsov2015-08-191-1/+1
|
* Change namespace from muc#admin to muc#userEvgeniy Khramtsov2015-08-191-1/+1
|
* Don't overwrite listeners for different transports in config mergingPaweł Chmielowski2015-08-191-1/+4
| | | | | | | 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.
* Catch errors when calling inet:peername in ejabberd_httpPaweł Chmielowski2015-08-171-2/+10
|
* Let ejabberdctl handle more shell metacharactersHolger Weiss2015-08-151-1/+1
| | | | Closes #704.
* configure.ac: Don't insist on Erlang/OTP >= 17.5Holger Weiss2015-08-133-3/+4
| | | | | 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.
* Prettify copyright links (thanks to GreenLunar)(#692)Badlop2015-08-131-1/+6
|
* Store and retrieve "mam" value in room configurationBadlop2015-08-121-0/+1
|
* Fix and document create_rooms_file and destroy_Badlop2015-08-121-1/+3
|
* Changed API of some mod_muc_admin command argumentsBadlop2015-08-121-10/+10
| | | | | | 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
* Room response to disco#info node muc#traffic should be an error (EJAB-741)Badlop2015-08-121-2/+5
|
* Ejabberd now requires erlang R17+Paweł Chmielowski2015-08-123-3/+2
|
* Add support for MUC MAMEvgeniy Khramtsov2015-08-087-148/+246
|
* Handle merging of append_host_config as is done for host_configPaweł Chmielowski2015-08-061-3/+3
|