Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update several commands for recent ejabberd_commands changes | Alexey Shchepin | 2015-09-28 | 4 | -2/+21 |
| | |||||
* | Add oauth_access option | Alexey Shchepin | 2015-09-25 | 1 | -5/+22 |
| | |||||
* | Strip Nick element in message stanzas sent to a room (#686) | Badlop | 2015-09-25 | 1 | -1/+2 |
| | |||||
* | Add OAuth support (thanks to Aleksey) | Christophe Romain | 2015-09-25 | 9 | -64/+1188 |
| | |||||
* | Fix regression introduced when code was binarized (EJAB-641) | Badlop | 2015-09-24 | 1 | -1/+3 |
| | |||||
* | Log TLS errors as [debug] messages only | Holger Weiss | 2015-09-24 | 1 | -1/+1 |
| | | | | Closes #652 and closes #679. | ||||
* | Add <stanza-id/> (XEP-0359) to archived messages | Evgeniy Khramtsov | 2015-09-22 | 1 | -6/+20 |
| | |||||
* | Nameprep host name passed to http-bind before using in (EJAB-1658) | Paweł Chmielowski | 2015-09-22 | 1 | -2/+3 |
| | |||||
* | Improve external module configuration management (EJAB-1746) | Christophe Romain | 2015-09-22 | 2 | -3/+10 |
| | |||||
* | Add MAM (XEP-0313) v0.4 support | Evgeniy Khramtsov | 2015-09-22 | 1 | -4/+9 |
| | |||||
* | Add set_loglevel command (EJABS-2524) | Jerome Sautret | 2015-09-21 | 2 | -2/+17 |
| | |||||
* | Merge branch 'master' of github.com:processone/ejabberd | Christophe Romain | 2015-09-18 | 3 | -3/+15 |
|\ | |||||
| * | Guard against passing undefined C2SPid to xml parser before ↵ | Paweł Chmielowski | 2015-09-17 | 1 | -3/+13 |
| | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Let BOSH/WebSocket support "max_resume_timeout" | Holger Weiss | 2015-09-17 | 2 | -0/+2 |
| | | | | | | | | | | Allow for specifying the "max_resume_timeout" option in an ejabberd_http listener for ejabberd_http_bind and/or ejabberd_http_ws. | ||||
* | | Remove unused functions from old get_items api | Christophe Romain | 2015-09-17 | 2 | -29/+16 |
|/ | |||||
* | Comment unused type, unused term | Quan Zhuo | 2015-09-16 | 3 | -4/+4 |
| | |||||
* | Properly handle define_macros in merged config files | Paweł Chmielowski | 2015-09-16 | 1 | -8/+8 |
| | |||||
* | XEP-0198: Improve handling of non-message stanzas | Holger Weiss | 2015-09-15 | 1 | -2/+8 |
| | | | | | | | 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. | ||||
* | Simplify MSSQL configuration | Evgeniy Khramtsov | 2015-09-13 | 4 | -1/+108 |
| | |||||
* | Fix MSSQL support | Evgeniy Khramtsov | 2015-09-13 | 2 | -349/+19 |
| | |||||
* | ext_mod must be started before ejabberd_config | Christophe Romain | 2015-09-11 | 1 | -9/+4 |
| | |||||
* | Include ext_mod modules when checking accepted options (ejabberd-contrib#116) | Badlop | 2015-09-10 | 2 | -2/+3 |
| | |||||
* | Pass stream management options defined in http listener to http-bind and ↵ | Paweł Chmielowski | 2015-09-04 | 4 | -17/+32 |
| | | | | 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 |
| | |||||
* | Rename idna.erl to ejabberd_idna.erl (#702) | Evgeniy Khramtsov | 2015-09-02 | 3 | -5/+5 |
| | |||||
* | 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 |
| | |||||
* | 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 | ||||
* | get_room_options will not crash in case of query for a non-existent room | oxpa | 2015-08-28 | 1 | -2/+4 |
| | |||||
* | 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 |
| | |||||
* | 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 |
| | |||||
* | Add support for MUC MAM | Evgeniy Khramtsov | 2015-08-08 | 3 | -147/+238 |
| | |||||
* | Handle merging of append_host_config as is done for host_config | Paweł Chmielowski | 2015-08-06 | 1 | -3/+3 |
| | |||||
* | Add ability to override main config file options with data from included files | Paweł Chmielowski | 2015-08-06 | 1 | -19/+41 |
| | |||||
* | Remove obsolete pubsub migration command | Christophe Romain | 2015-08-06 | 1 | -5/+0 |
| | |||||
* | typo | Matthias Rieber | 2015-08-06 | 1 | -1/+1 |
| |