Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix c2s connection close on demand | Evgeniy Khramtsov | 2017-04-04 | 3 | -1/+21 |
| | | | | Fixes #1652 | ||||
* | Improve redis related code | Evgeniy Khramtsov | 2017-04-02 | 5 | -149/+265 |
| | |||||
* | Use ejabberd_sql:abort/1 instead of exit/1 | Evgeniy Khramtsov | 2017-03-31 | 1 | -4/+4 |
| | |||||
* | Merge branch 'master' of github.com:processone/ejabberd | Evgeniy Khramtsov | 2017-03-31 | 1 | -0/+8 |
|\ | |||||
| * | Add ejabberd_sql:abort/1 and ejabberd_sql:restart/1 | Alexey Shchepin | 2017-03-31 | 1 | -0/+8 |
| | | |||||
* | | Add Redis as mod_proxy65 RAM backend | Evgeniy Khramtsov | 2017-03-31 | 2 | -0/+313 |
|/ | |||||
* | Add SQL as mod_proxy65 RAM backend | Evgeniy Khramtsov | 2017-03-31 | 4 | -0/+178 |
| | |||||
* | Raise bad_node instead of node_down for consistency reason | Evgeniy Khramtsov | 2017-03-30 | 5 | -9/+9 |
| | |||||
* | Do not duplicate enc_pid/dec_pid functions | Evgeniy Khramtsov | 2017-03-30 | 5 | -119/+39 |
| | |||||
* | Add missing jlib->aux convertion | Christophe Romain | 2017-03-30 | 1 | -1/+1 |
| | |||||
* | Refactor pubsub's get_last_items | Christophe Romain | 2017-03-30 | 17 | -98/+123 |
| | |||||
* | Deprecate jlib.erl in favor of aux.erl | Evgeniy Khramtsov | 2017-03-30 | 55 | -205/+422 |
| | | | | | Since the main goal of jlib.erl is lost, all auxiliary functions are now moved to aux.erl, and the whole jlib.erl is now deprecated. | ||||
* | Merge pull request #1646 from weiss/custom-headers | Christophe Romain | 2017-03-30 | 3 | -17/+37 |
|\ | | | | | Add custom_headers option for ejabberd_http listeners | ||||
| * | mod_http_upload: Don't add "Server" header line | Holger Weiss | 2017-03-28 | 1 | -4/+2 |
| | | | | | | | | | | Administrators can add the "Server" header line using the new listener option "custom_headers", if desired. | ||||
| * | ejabberd_http: Expand @VERSION@ in custom headers | Holger Weiss | 2017-03-27 | 3 | -8/+17 |
| | | | | | | | | | | | | | | Let ejabberd_http expand the @VERSION@ keyword to the ejabberd version if specified in the "custom_headers" listener option. Closes #1414. | ||||
| * | ejabberd_http: Add "custom_headers" option | Holger Weiss | 2017-03-27 | 1 | -6/+19 |
| | | | | | | | | | | | | | | If the new listener option "custom_headers" is specified, include those headers with the HTTP(S) response. Closes #517. | ||||
* | | Add Redis as mod_carboncopy RAM backend | Evgeniy Khramtsov | 2017-03-30 | 2 | -1/+113 |
| | | |||||
* | | Add SQL as mod_carboncopy RAM backend | Evgeniy Khramtsov | 2017-03-30 | 8 | -13/+157 |
| | | |||||
* | | oauth_list_tokens and oauth_revoke_token work only in Mnesia (#1644) | Badlop | 2017-03-29 | 1 | -3/+5 |
| | | |||||
* | | Fix a typo | Evgeniy Khramtsov | 2017-03-29 | 1 | -1/+1 |
| | | |||||
* | | Add SQL as mod_muc RAM backend | Evgeniy Khramtsov | 2017-03-29 | 10 | -78/+316 |
| | | |||||
* | | Add Redis as mod_bosh RAM backend | Evgeniy Khramtsov | 2017-03-28 | 1 | -0/+76 |
| | | |||||
* | | Add SQL as mod_bosh RAM backend | Evgeniy Khramtsov | 2017-03-28 | 5 | -0/+132 |
| | | |||||
* | | Add Redis as router RAM backend | Evgeniy Khramtsov | 2017-03-28 | 5 | -4/+185 |
| | | |||||
* | | Mix needs include path to p1_utils | Christophe Romain | 2017-03-28 | 1 | -1/+1 |
| | | |||||
* | | Add SQL as router RAM backend | Evgeniy Khramtsov | 2017-03-28 | 8 | -8/+247 |
|/ | |||||
* | Fix PEP issues (#1636) | Christophe Romain | 2017-03-27 | 2 | -26/+15 |
| | |||||
* | Merge branch 'new_queue' | Evgeniy Khramtsov | 2017-03-24 | 17 | -310/+360 |
|\ | | | | | | | | | | | Conflicts: rebar.config src/mod_muc_admin.erl | ||||
| * | Improve overloaded S2S queue processing | Evgeniy Khramtsov | 2017-03-10 | 2 | -11/+17 |
| | | |||||
| * | Add support for file-based queues | Evgeniy Khramtsov | 2017-03-10 | 17 | -306/+350 |
| | | | | | | | | | | | | | | | | | | | | | | It's now possible to use files as internal packet queues. The following options are introduced: * queue_type: the option can be set to `ram` (default) or `file`. The option can be set per virtual host. * queue_dir: path to the directory where queues will be allocated. The default is 'queue' directory inside Mnesia directory. This is a global option and cannot be set per virtual host. | ||||
* | | Avoid PID collisions17.03 | Evgeniy Khramtsov | 2017-03-24 | 1 | -13/+57 |
| | | | | | | | | Fixes #1470 | ||||
* | | Add inets in included_application for mix | Christophe Romain | 2017-03-23 | 1 | -1/+1 |
| | | |||||
* | | Expand ejabberd.yml.example by enabling mod_http_api with couple commands | Paweł Chmielowski | 2017-03-22 | 1 | -24/+39 |
| | | |||||
* | | Update mix dependencies | Christophe Romain | 2017-03-22 | 2 | -14/+13 |
| | | |||||
* | | Update dependencies | Christophe Romain | 2017-03-22 | 1 | -6/+6 |
| | | |||||
* | | Update docker files from latest Rafael's changes | Christophe Romain | 2017-03-21 | 28 | -451/+599 |
| | | |||||
* | | prosody2ejabberd: Fix offline message record type | Holger Weiss | 2017-03-21 | 1 | -10/+15 |
| | | | | | | | | mod_offline now expects a #message{} rather than an #xmlel{} record. | ||||
* | | prosody2ejabberd: Fix message attribute removal | Holger Weiss | 2017-03-21 | 1 | -2/+2 |
| | | | | | | | | | | Actually remove the 'stamp' and 'stamp_legacy' attributes from imported offline messages as intended. | ||||
* | | Fix crash in mod_muc_admin, we operate on integers here not lists | Paweł Chmielowski | 2017-03-21 | 1 | -1/+1 |
| | | |||||
* | | Don't block contacts with subscription=to in mod_block_strangers (#1609) | Alexey Shchepin | 2017-03-21 | 1 | -3/+9 |
| | | |||||
* | | Use item creation date in rsm order (#1516) | Christophe Romain | 2017-03-21 | 1 | -8/+8 |
| | | |||||
* | | Merge pull request #1626 from weiss/fix-scram-import | Evgeny Khramtsov | 2017-03-21 | 2 | -3/+21 |
|\ \ | | | | | | | prosody2ejabberd: Fix SCRAM hash conversion | ||||
| * | | prosody2ejabberd: Fix SCRAM hash conversion | Holger Weiss | 2017-03-16 | 2 | -3/+21 |
| | | | | | | | | | | | | Closes #1549. | ||||
* | | | Replace mod_http_bind by mod_bosh in config example | Christophe Romain | 2017-03-21 | 1 | -1/+1 |
| | | | |||||
* | | | Remove misleading sentence about s2s dialback | Evgeniy Khramtsov | 2017-03-20 | 1 | -1/+1 |
| | | | |||||
* | | | Resolve vars.config relative to to rebar.config.script | Paweł Chmielowski | 2017-03-20 | 1 | -1/+1 |
| | | | | | | | | | | | | This fixes problem with missing deps in make rel - issue #1615 | ||||
* | | | Fix compilation with mix (#1588) | Christophe Romain | 2017-03-20 | 2 | -6/+7 |
| | | | |||||
* | | | Update mix deps | Christophe Romain | 2017-03-20 | 2 | -6/+8 |
| | | | |||||
* | | | Update xmpp and fast_tls versions | Christophe Romain | 2017-03-20 | 1 | -2/+2 |
| | | | |||||
* | | | Revert "Bump OTP version to 19.3 in Travis config" | Evgeniy Khramtsov | 2017-03-20 | 1 | -1/+1 |
| | | | | | | | | | | | | This reverts commit 7113f2b8ba73f4f565dd1ce6c482c9f03d2b0858. |