Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | typo fix | Christophe Romain | 2015-09-10 | 1 | -2/+0 | |
| | ||||||
* | Update Esperanto and Dutch translations (thanks to Andreas van Cranenburgh) | Badlop | 2015-09-08 | 2 | -61/+48 | |
| | ||||||
* | Merge branch 'master' of github.com:processone/ejabberd | Mickael Remond | 2015-09-07 | 2 | -70/+46 | |
|\ | ||||||
| * | Update Brazilian Portuguese translation (thanks to Otávio Fernandes) | Badlop | 2015-09-07 | 1 | -59/+38 | |
| | | ||||||
| * | Update Japanese translation (thanks to Tsukasa Hamano)(#729) | Badlop | 2015-09-07 | 1 | -11/+8 | |
| | | ||||||
* | | Fix typo | Mickael Remond | 2015-09-07 | 1 | -1/+1 | |
|/ | ||||||
* | Use our own includes + includes from all dependencies | Mickael Remond | 2015-09-07 | 1 | -2/+3 | |
| | ||||||
* | Update Catalan and Spanish translations | Badlop | 2015-09-07 | 2 | -37/+30 | |
| | ||||||
* | Update Russian PO file | Evgeniy Khramtsov | 2015-09-07 | 1 | -358/+268 | |
| | ||||||
* | Run "make translations" and get updated PO files | Badlop | 2015-09-07 | 27 | -10605/+11477 | |
| | ||||||
* | Fix German translation (thanks to STPKITT)(#726) | Badlop | 2015-09-07 | 2 | -2/+2 | |
| | ||||||
* | Pass stream management options defined in http listener to http-bind and ↵ | Paweł Chmielowski | 2015-09-04 | 5 | -18/+34 | |
| | | | | websocket | |||||
* | New XEP-0198 option: "max_resume_timeout" | Holger Weiss | 2015-09-03 | 1 | -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.erl | Badlop | 2015-09-03 | 1 | -2/+2 | |
| | ||||||
* | Merge branch 'master' of github.com:processone/ejabberd | Mickael Remond | 2015-09-02 | 3 | -5/+5 | |
|\ | ||||||
| * | Rename idna.erl to ejabberd_idna.erl (#702) | Evgeniy Khramtsov | 2015-09-02 | 3 | -5/+5 | |
| | | ||||||
* | | Better to keep config file in a different config directory | Mickael Remond | 2015-09-02 | 1 | -1/+1 | |
|/ | ||||||
* | Merge pull request #725 from processone/elixir-mix | Mickaël Rémond | 2015-09-02 | 3 | -2/+16 | |
|\ | | | | | Allow building an ejabberd release with mix and elixir release manager | |||||
| * | Allow building ejabberd with Elixir mix and building and ejabberd OTP release | Mickael Remond | 2015-09-02 | 2 | -1/+12 | |
| | | ||||||
| * | ignore ejabberd release result directory | Mickael Remond | 2015-09-02 | 1 | -0/+1 | |
| | | ||||||
| * | Update mix.exs to comply with exrm release system | Mickael Remond | 2015-09-02 | 1 | -1/+3 | |
| | | ||||||
* | | Add verification of hide_sensitive_log_data global option | Badlop | 2015-09-02 | 1 | -1/+3 | |
| | | ||||||
* | | Remove unused function now_to_iso/1 | Evgeniy Khramtsov | 2015-09-02 | 1 | -5/+0 | |
|/ | ||||||
* | Update mix.exs | Mickaël Rémond | 2015-09-02 | 1 | -1/+1 | |
| | | | Fix version number. | |||||
* | Upgrade version number to ejabberd 15.07 | Mickael Remond | 2015-09-02 | 1 | -1/+1 | |
| | | | | We forgot before previous release | |||||
* | Do not forget to set from/to when fetching from MUC history | Evgeniy Khramtsov | 2015-09-01 | 1 | -3/+1 | |
| | ||||||
* | Fix problem with merging same port, different ip listeners in config files | Paweł Chmielowski | 2015-09-01 | 1 | -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 Khramtsov | 2015-09-01 | 1 | -5/+64 | |
| | | | | room configuration | |||||
* | Update MAM tests to always expect RSM in response | Holger Weiss | 2015-08-30 | 1 | -2/+4 | |
| | ||||||
* | Merge pull request #721 from oxpa/muc_admin | Evgeny Khramtsov | 2015-08-28 | 1 | -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 room | oxpa | 2015-08-28 | 1 | -2/+4 | |
| | | ||||||
* | | Remove "--enable-json" flag | Holger Weiss | 2015-08-27 | 4 | -18/+3 | |
|/ | | | | The "--enable-json" flag currently has no effect. | |||||
* | Always include RSM in final message | Evgeniy Khramtsov | 2015-08-24 | 1 | -6/+2 | |
| | ||||||
* | Remove MAM archives on MUC room destroy | Evgeniy Khramtsov | 2015-08-24 | 2 | -3/+23 | |
| | ||||||
* | More eye-candy mod_http_bind help page (thanks to Marek Foss) | Badlop | 2015-08-21 | 1 | -32/+127 | |
| | ||||||
* | Improve S2S certificate checks | Evgeniy Khramtsov | 2015-08-20 | 1 | -1/+3 | |
| | ||||||
* | Fix case clause during S2S certificate checks | Evgeniy Khramtsov | 2015-08-19 | 1 | -1/+1 | |
| | ||||||
* | Change namespace from muc#admin to muc#user | Evgeniy Khramtsov | 2015-08-19 | 1 | -1/+1 | |
| | ||||||
* | Don't overwrite listeners for different transports in config merging | Paweł Chmielowski | 2015-08-19 | 1 | -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_http | Paweł Chmielowski | 2015-08-17 | 1 | -2/+10 | |
| | ||||||
* | Let ejabberdctl handle more shell metacharacters | Holger Weiss | 2015-08-15 | 1 | -1/+1 | |
| | | | | Closes #704. | |||||
* | configure.ac: Don't insist on Erlang/OTP >= 17.5 | Holger Weiss | 2015-08-13 | 3 | -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) | Badlop | 2015-08-13 | 1 | -1/+6 | |
| | ||||||
* | Store and retrieve "mam" value in room configuration | Badlop | 2015-08-12 | 1 | -0/+1 | |
| | ||||||
* | Fix and document create_rooms_file and destroy_ | Badlop | 2015-08-12 | 1 | -1/+3 | |
| | ||||||
* | Changed API of some mod_muc_admin command arguments | Badlop | 2015-08-12 | 1 | -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) | Badlop | 2015-08-12 | 1 | -2/+5 | |
| | ||||||
* | Ejabberd now requires erlang R17+ | Paweł Chmielowski | 2015-08-12 | 3 | -3/+2 | |
| | ||||||
* | Add support for MUC MAM | Evgeniy Khramtsov | 2015-08-08 | 7 | -148/+246 | |
| | ||||||
* | Handle merging of append_host_config as is done for host_config | Paweł Chmielowski | 2015-08-06 | 1 | -3/+3 | |
| |