aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #753 from scrogson/add_links15.09Mickaël Rémond2015-09-291-20/+26
|\ | | | | Add License and Links for display on hex.pm
| * clean up whitespaceSonny Scroggin2015-09-291-20/+19
| |
| * Add additional package information for hex.pmSonny Scroggin2015-09-291-0/+7
| |
* | Merge pull request #755 from scrogson/fix_ejabberd_directory_nameMickaël Rémond2015-09-292-0/+0
|\ \ | | | | | | Use lowecase directory name for lib/ejabberd
| * | Use lowecase directory name for lib/ejabberdSonny Scroggin2015-09-292-0/+0
|/ /
* | Merge pull request #754 from scrogson/gitignoreEvgeny Khramtsov2015-09-291-0/+2
|\ \ | |/ |/| Ignore mnesiadb and _build
| * Ignore mnesiadb and _buildSonny Scroggin2015-09-291-0/+2
|/
* Temporary switch to fork of oauth2 that compiles with r18Paweł Chmielowski2015-09-291-1/+1
|
* Set version 15.09 for mixChristophe Romain2015-09-291-1/+1
|
* Recompile translationsBadlop2015-09-2953-2152/+2613
|
* Update several commands for recent ejabberd_commands changesAlexey Shchepin2015-09-284-2/+21
|
* oauth uses jiffy so fetch it unconditionallyPaweł Chmielowski2015-09-283-17/+4
|
* Add oauth_access optionAlexey Shchepin2015-09-251-5/+22
|
* Strip Nick element in message stanzas sent to a room (#686)Badlop2015-09-252-1/+3
|
* Enable oauth unconditionallyPaweł Chmielowski2015-09-253-19/+6
|
* Revert "Remove "--enable-json" flag"Christophe Romain2015-09-254-3/+18
| | | | | This reverts commit 5bb137940c11fbd5d0c4da493e3a4560fbfe2d97. This is needed for mod_http_api
* Add OAuth support (thanks to Aleksey)Christophe Romain2015-09-2513-67/+1207
|
* Merge pull request #742 from joudinet/masterChristophe Romain2015-09-253-4/+4
|\ | | | | Allow root to run join_cluster and leave_cluster
| * Allow root to run join_cluster and leave_clusterJohan Oudinet2015-09-223-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)Badlop2015-09-252-2/+2
| |
* | Merge pull request #748 from joudinet/bashismsbadlop2015-09-242-6/+6
|\ \ | | | | | | Remove bashisms in {join,leave}cluster scripts
| * | Remove bashisms in {join,leave}cluster scriptsJohan Oudinet2015-09-242-6/+6
| | | | | | | | | | | | So they can run in any POSIX shell, not bash only.
* | | Fix regression introduced when code was binarized (EJAB-641)Badlop2015-09-241-1/+3
|/ /
* | Log TLS errors as [debug] messages onlyHolger Weiss2015-09-241-1/+1
| | | | | | | | Closes #652 and closes #679.
* | Add <stanza-id/> (XEP-0359) to archived messagesEvgeniy Khramtsov2015-09-222-6/+21
|/
* Set disable caching headers in http-bind responses (EJAB-1643)Paweł Chmielowski2015-09-221-1/+4
|
* Nameprep host name passed to http-bind before using in (EJAB-1658)Paweł Chmielowski2015-09-221-2/+3
|
* Improve external module configuration management (EJAB-1746)Christophe Romain2015-09-222-3/+10
|
* Add MAM (XEP-0313) v0.4 supportEvgeniy Khramtsov2015-09-222-4/+10
|
* Avoid wrong failing cases on make install (#468)Christophe Romain2015-09-211-9/+10
|
* Add set_loglevel command (EJABS-2524)Jerome Sautret2015-09-212-2/+17
|
* Merge branch 'master' of github.com:processone/ejabberdChristophe Romain2015-09-183-3/+15
|\
| * Guard against passing undefined C2SPid to xml parser before ↵Paweł Chmielowski2015-09-171-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 Weiss2015-09-172-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 apiChristophe Romain2015-09-172-29/+16
| |
* | Make sure that lager is first on our deps listPaweł Chmielowski2015-09-171-1/+7
|/
* Merge pull request #736 from quanzhuo/masterEvgeny Khramtsov2015-09-163-4/+4
|\ | | | | Comment unused type, unused term
| * Comment unused type, unused termQuan Zhuo2015-09-163-4/+4
|/
* Properly handle define_macros in merged config filesPaweł Chmielowski2015-09-161-8/+8
|
* Update French translationMickael Remond2015-09-161-2/+1
|
* Update French translationMickael Remond2015-09-161-45/+35
|
* Update polish translationPaweł Chmielowski2015-09-161-36/+28
|
* XEP-0198: Improve handling of non-message stanzasHolger Weiss2015-09-151-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 schemaEvgeniy Khramtsov2015-09-141-0/+0
|
* Simplify MSSQL configurationEvgeniy Khramtsov2015-09-134-1/+108
|
* Fix MSSQL supportEvgeniy Khramtsov2015-09-136-5028/+19
|
* ext_mod must be started before ejabberd_configChristophe Romain2015-09-111-9/+4
|
* Update German translation (thanks to Nikolaus Polak)Badlop2015-09-111-52/+46
|
* Update Hebrew translation (thanks to Isratine Citizen)Badlop2015-09-101-2/+2
|
* Include ext_mod modules when checking accepted options (ejabberd-contrib#116)Badlop2015-09-102-2/+3
|