aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix c2s connection close on demandEvgeniy Khramtsov2017-04-043-1/+21
| | | | Fixes #1652
* Improve redis related codeEvgeniy Khramtsov2017-04-025-149/+265
|
* Use ejabberd_sql:abort/1 instead of exit/1Evgeniy Khramtsov2017-03-311-4/+4
|
* Merge branch 'master' of github.com:processone/ejabberdEvgeniy Khramtsov2017-03-311-0/+8
|\
| * Add ejabberd_sql:abort/1 and ejabberd_sql:restart/1Alexey Shchepin2017-03-311-0/+8
| |
* | Add Redis as mod_proxy65 RAM backendEvgeniy Khramtsov2017-03-312-0/+313
|/
* Add SQL as mod_proxy65 RAM backendEvgeniy Khramtsov2017-03-314-0/+178
|
* Raise bad_node instead of node_down for consistency reasonEvgeniy Khramtsov2017-03-305-9/+9
|
* Do not duplicate enc_pid/dec_pid functionsEvgeniy Khramtsov2017-03-305-119/+39
|
* Add missing jlib->aux convertionChristophe Romain2017-03-301-1/+1
|
* Refactor pubsub's get_last_itemsChristophe Romain2017-03-3017-98/+123
|
* Deprecate jlib.erl in favor of aux.erlEvgeniy Khramtsov2017-03-3055-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-headersChristophe Romain2017-03-303-17/+37
|\ | | | | Add custom_headers option for ejabberd_http listeners
| * mod_http_upload: Don't add "Server" header lineHolger Weiss2017-03-281-4/+2
| | | | | | | | | | Administrators can add the "Server" header line using the new listener option "custom_headers", if desired.
| * ejabberd_http: Expand @VERSION@ in custom headersHolger Weiss2017-03-273-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" optionHolger Weiss2017-03-271-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 backendEvgeniy Khramtsov2017-03-302-1/+113
| |
* | Add SQL as mod_carboncopy RAM backendEvgeniy Khramtsov2017-03-308-13/+157
| |
* | oauth_list_tokens and oauth_revoke_token work only in Mnesia (#1644)Badlop2017-03-291-3/+5
| |
* | Fix a typoEvgeniy Khramtsov2017-03-291-1/+1
| |
* | Add SQL as mod_muc RAM backendEvgeniy Khramtsov2017-03-2910-78/+316
| |
* | Add Redis as mod_bosh RAM backendEvgeniy Khramtsov2017-03-281-0/+76
| |
* | Add SQL as mod_bosh RAM backendEvgeniy Khramtsov2017-03-285-0/+132
| |
* | Add Redis as router RAM backendEvgeniy Khramtsov2017-03-285-4/+185
| |
* | Mix needs include path to p1_utilsChristophe Romain2017-03-281-1/+1
| |
* | Add SQL as router RAM backendEvgeniy Khramtsov2017-03-288-8/+247
|/
* Fix PEP issues (#1636)Christophe Romain2017-03-272-26/+15
|
* Merge branch 'new_queue'Evgeniy Khramtsov2017-03-2417-310/+360
|\ | | | | | | | | | | Conflicts: rebar.config src/mod_muc_admin.erl
| * Improve overloaded S2S queue processingEvgeniy Khramtsov2017-03-102-11/+17
| |
| * Add support for file-based queuesEvgeniy Khramtsov2017-03-1017-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.03Evgeniy Khramtsov2017-03-241-13/+57
| | | | | | | | Fixes #1470
* | Add inets in included_application for mixChristophe Romain2017-03-231-1/+1
| |
* | Expand ejabberd.yml.example by enabling mod_http_api with couple commandsPaweł Chmielowski2017-03-221-24/+39
| |
* | Update mix dependenciesChristophe Romain2017-03-222-14/+13
| |
* | Update dependenciesChristophe Romain2017-03-221-6/+6
| |
* | Update docker files from latest Rafael's changesChristophe Romain2017-03-2128-451/+599
| |
* | prosody2ejabberd: Fix offline message record typeHolger Weiss2017-03-211-10/+15
| | | | | | | | mod_offline now expects a #message{} rather than an #xmlel{} record.
* | prosody2ejabberd: Fix message attribute removalHolger Weiss2017-03-211-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 listsPaweł Chmielowski2017-03-211-1/+1
| |
* | Don't block contacts with subscription=to in mod_block_strangers (#1609)Alexey Shchepin2017-03-211-3/+9
| |
* | Use item creation date in rsm order (#1516)Christophe Romain2017-03-211-8/+8
| |
* | Merge pull request #1626 from weiss/fix-scram-importEvgeny Khramtsov2017-03-212-3/+21
|\ \ | | | | | | prosody2ejabberd: Fix SCRAM hash conversion
| * | prosody2ejabberd: Fix SCRAM hash conversionHolger Weiss2017-03-162-3/+21
| | | | | | | | | | | | Closes #1549.
* | | Replace mod_http_bind by mod_bosh in config exampleChristophe Romain2017-03-211-1/+1
| | |
* | | Remove misleading sentence about s2s dialbackEvgeniy Khramtsov2017-03-201-1/+1
| | |
* | | Resolve vars.config relative to to rebar.config.scriptPaweł Chmielowski2017-03-201-1/+1
| | | | | | | | | | | | This fixes problem with missing deps in make rel - issue #1615
* | | Fix compilation with mix (#1588)Christophe Romain2017-03-202-6/+7
| | |
* | | Update mix depsChristophe Romain2017-03-202-6/+8
| | |
* | | Update xmpp and fast_tls versionsChristophe Romain2017-03-201-2/+2
| | |
* | | Revert "Bump OTP version to 19.3 in Travis config"Evgeniy Khramtsov2017-03-201-1/+1
| | | | | | | | | | | | This reverts commit 7113f2b8ba73f4f565dd1ce6c482c9f03d2b0858.