Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #753 from scrogson/add_links15.09 | Mickaël Rémond | 2015-09-29 | 1 | -20/+26 |
|\ | | | | | Add License and Links for display on hex.pm | ||||
| * | clean up whitespace | Sonny Scroggin | 2015-09-29 | 1 | -20/+19 |
| | | |||||
| * | Add additional package information for hex.pm | Sonny Scroggin | 2015-09-29 | 1 | -0/+7 |
| | | |||||
* | | Merge pull request #755 from scrogson/fix_ejabberd_directory_name | Mickaël Rémond | 2015-09-29 | 2 | -0/+0 |
|\ \ | | | | | | | Use lowecase directory name for lib/ejabberd | ||||
| * | | Use lowecase directory name for lib/ejabberd | Sonny Scroggin | 2015-09-29 | 2 | -0/+0 |
|/ / | |||||
* | | Merge pull request #754 from scrogson/gitignore | Evgeny Khramtsov | 2015-09-29 | 1 | -0/+2 |
|\ \ | |/ |/| | Ignore mnesiadb and _build | ||||
| * | Ignore mnesiadb and _build | Sonny Scroggin | 2015-09-29 | 1 | -0/+2 |
|/ | |||||
* | Temporary switch to fork of oauth2 that compiles with r18 | Paweł Chmielowski | 2015-09-29 | 1 | -1/+1 |
| | |||||
* | Set version 15.09 for mix | Christophe Romain | 2015-09-29 | 1 | -1/+1 |
| | |||||
* | Recompile translations | Badlop | 2015-09-29 | 53 | -2152/+2613 |
| | |||||
* | Update several commands for recent ejabberd_commands changes | Alexey Shchepin | 2015-09-28 | 4 | -2/+21 |
| | |||||
* | oauth uses jiffy so fetch it unconditionally | Paweł Chmielowski | 2015-09-28 | 3 | -17/+4 |
| | |||||
* | 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 | 2 | -1/+3 |
| | |||||
* | Enable oauth unconditionally | Paweł Chmielowski | 2015-09-25 | 3 | -19/+6 |
| | |||||
* | Revert "Remove "--enable-json" flag" | Christophe Romain | 2015-09-25 | 4 | -3/+18 |
| | | | | | This reverts commit 5bb137940c11fbd5d0c4da493e3a4560fbfe2d97. This is needed for mod_http_api | ||||
* | Add OAuth support (thanks to Aleksey) | Christophe Romain | 2015-09-25 | 13 | -67/+1207 |
| | |||||
* | Merge pull request #742 from joudinet/master | Christophe Romain | 2015-09-25 | 3 | -4/+4 |
|\ | | | | | Allow root to run join_cluster and leave_cluster | ||||
| * | Allow root to run join_cluster and leave_cluster | Johan Oudinet | 2015-09-22 | 3 | -4/+4 |
| | | | | | | | | | | | | | | Prefix the call to joincluster and leavecluster in ejabberdctl by $EXEC_CMD. Avoid using sh -c in these scripts. Should fix #676. | ||||
* | | Fix calling problem introduced when reducing bashisms (#748) | Badlop | 2015-09-25 | 2 | -2/+2 |
| | | |||||
* | | Merge pull request #748 from joudinet/bashisms | badlop | 2015-09-24 | 2 | -6/+6 |
|\ \ | | | | | | | Remove bashisms in {join,leave}cluster scripts | ||||
| * | | Remove bashisms in {join,leave}cluster scripts | Johan Oudinet | 2015-09-24 | 2 | -6/+6 |
| | | | | | | | | | | | | So they can run in any POSIX shell, not bash only. | ||||
* | | | 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 | 2 | -6/+21 |
|/ | |||||
* | Set disable caching headers in http-bind responses (EJAB-1643) | Paweł Chmielowski | 2015-09-22 | 1 | -1/+4 |
| | |||||
* | 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 | 2 | -4/+10 |
| | |||||
* | Avoid wrong failing cases on make install (#468) | Christophe Romain | 2015-09-21 | 1 | -9/+10 |
| | |||||
* | 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 |
| | | |||||
* | | Make sure that lager is first on our deps list | Paweł Chmielowski | 2015-09-17 | 1 | -1/+7 |
|/ | |||||
* | Merge pull request #736 from quanzhuo/master | Evgeny Khramtsov | 2015-09-16 | 3 | -4/+4 |
|\ | | | | | Comment unused type, unused term | ||||
| * | 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 |
| | |||||
* | Update French translation | Mickael Remond | 2015-09-16 | 1 | -2/+1 |
| | |||||
* | Update French translation | Mickael Remond | 2015-09-16 | 1 | -45/+35 |
| | |||||
* | Update polish translation | Paweł Chmielowski | 2015-09-16 | 1 | -36/+28 |
| | |||||
* | 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. | ||||
* | Improve MSSQL schema | Evgeniy Khramtsov | 2015-09-14 | 1 | -0/+0 |
| | |||||
* | Simplify MSSQL configuration | Evgeniy Khramtsov | 2015-09-13 | 4 | -1/+108 |
| | |||||
* | Fix MSSQL support | Evgeniy Khramtsov | 2015-09-13 | 6 | -5028/+19 |
| | |||||
* | ext_mod must be started before ejabberd_config | Christophe Romain | 2015-09-11 | 1 | -9/+4 |
| | |||||
* | Update German translation (thanks to Nikolaus Polak) | Badlop | 2015-09-11 | 1 | -52/+46 |
| | |||||
* | Update Hebrew translation (thanks to Isratine Citizen) | Badlop | 2015-09-10 | 1 | -2/+2 |
| | |||||
* | Include ext_mod modules when checking accepted options (ejabberd-contrib#116) | Badlop | 2015-09-10 | 2 | -2/+3 |
| |