]> granicus.if.org Git - ejabberd/log
ejabberd
9 years agoInitial import from ejabberd-modules SVN
Badlop [Mon, 15 Apr 2013 10:03:14 +0000 (12:03 +0200)]
Initial import from ejabberd-modules SVN

9 years agoMake sure that we send each time <close> before closing websocket connection
Paweł Chmielowski [Wed, 25 Mar 2015 16:08:43 +0000 (17:08 +0100)]
Make sure that we send each time <close> before closing websocket connection

9 years agoIf command crashes, return restuple with error and explanation (ejabberd-contrib...
Badlop [Wed, 25 Mar 2015 12:56:42 +0000 (13:56 +0100)]
If command crashes, return restuple with error and explanation (ejabberd-contrib #21)

9 years agoReturn error when incoming message is blocked
Holger Weiss [Tue, 24 Mar 2015 22:10:47 +0000 (23:10 +0100)]
Return error when incoming message is blocked

As per XEP-0016 and XEP-0191, return a service-unavailable error when an
incoming message was blocked by a privacy list.  This lets the user
appear offline to the contact.

9 years agoFix "IP address not available" error message
Holger Weiss [Tue, 24 Mar 2015 16:32:57 +0000 (17:32 +0100)]
Fix "IP address not available" error message

9 years agoAdd support for ciphers and protocol_options in ejabberd_http
Alexey Shchepin [Tue, 24 Mar 2015 15:13:55 +0000 (18:13 +0300)]
Add support for ciphers and protocol_options in ejabberd_http

9 years agoexport CONTRIB_MODULES_PATH (thanks to sezuan)(#489)
Christophe Romain [Tue, 24 Mar 2015 15:00:56 +0000 (16:00 +0100)]
export CONTRIB_MODULES_PATH (thanks to sezuan)(#489)

9 years agoMake R16B03-1 the minimal reguired otp version
Christophe Romain [Mon, 23 Mar 2015 13:54:29 +0000 (14:54 +0100)]
Make R16B03-1 the minimal reguired otp version

9 years agoAvoid crypto:hmac/3 call for R15B compatibility
Holger Weiss [Sat, 21 Mar 2015 21:56:23 +0000 (22:56 +0100)]
Avoid crypto:hmac/3 call for R15B compatibility

9 years agoFix compilation on Erlang R15B
Holger Weiss [Sat, 21 Mar 2015 21:06:38 +0000 (22:06 +0100)]
Fix compilation on Erlang R15B

9 years agoRemove duplicate CREATE INDEX in mysql.sql
Alexey Shchepin [Sat, 21 Mar 2015 20:41:27 +0000 (23:41 +0300)]
Remove duplicate CREATE INDEX in mysql.sql

9 years agoStart ext_mod before module as it's setup contrib path
Christophe Romain [Fri, 20 Mar 2015 14:06:02 +0000 (15:06 +0100)]
Start ext_mod before module as it's setup contrib path

9 years agoRemoved deprecated calls to crypto:sha_mac in scram.erl
Alexey Shchepin [Fri, 20 Mar 2015 10:57:27 +0000 (13:57 +0300)]
Removed deprecated calls to crypto:sha_mac in scram.erl

9 years agoAdd ejabberd_auth_odbc:convert_to_scram/1 15.03
Alexey Shchepin [Mon, 9 Mar 2015 13:38:16 +0000 (16:38 +0300)]
Add ejabberd_auth_odbc:convert_to_scram/1

9 years agoAdd SCRAM support to ejabberd_auth_odbc
Alexey Shchepin [Tue, 17 Feb 2015 20:26:31 +0000 (23:26 +0300)]
Add SCRAM support to ejabberd_auth_odbc

9 years agoAdd a missed SQL index on privacy_list_data table
Alexey Shchepin [Wed, 18 Mar 2015 15:46:46 +0000 (18:46 +0300)]
Add a missed SQL index on privacy_list_data table

9 years agoAdded MySQL support for delete_old_messages (offline) command.
Jerome Sautret [Fri, 13 Mar 2015 17:29:57 +0000 (18:29 +0100)]
Added MySQL support for delete_old_messages (offline) command.

9 years agoFix mod_offline termination
Evgeniy Khramtsov [Thu, 12 Mar 2015 09:12:22 +0000 (12:12 +0300)]
Fix mod_offline termination

9 years agoExplicitly set standard_conforming_strings to off with PostreSQL
Alexey Shchepin [Mon, 9 Mar 2015 13:37:35 +0000 (16:37 +0300)]
Explicitly set standard_conforming_strings to off with PostreSQL

9 years agoReport TLS errors
Evgeniy Khramtsov [Tue, 3 Mar 2015 10:32:04 +0000 (13:32 +0300)]
Report TLS errors

9 years agoFix epmd not in PATH (#484)
Christophe Romain [Wed, 18 Mar 2015 21:26:06 +0000 (22:26 +0100)]
Fix epmd not in PATH (#484)

9 years agoUpdate 'rsm_in' record element types
Holger Weiss [Tue, 17 Mar 2015 23:28:10 +0000 (00:28 +0100)]
Update 'rsm_in' record element types

The jlib:rsm_decode/1 function sets the 'max' and/or 'index' elements of
the returned 'rsm_in' record to 'error' if the parsed strings cannot be
converted to integer values.

9 years agoAdd missing list_to_binary call
Christophe Romain [Fri, 13 Mar 2015 16:59:19 +0000 (17:59 +0100)]
Add missing list_to_binary call

9 years agoAdd contributed modules code path on start
Christophe Romain [Fri, 13 Mar 2015 11:20:25 +0000 (12:20 +0100)]
Add contributed modules code path on start

9 years agoRename module function to keep them grouped on help
Christophe Romain [Fri, 13 Mar 2015 10:54:32 +0000 (11:54 +0100)]
Rename module function to keep them grouped on help

9 years agoMerge pull request #473 from weiss/escape-space-in-options
Christophe Romain [Fri, 13 Mar 2015 10:41:26 +0000 (11:41 +0100)]
Merge pull request #473 from weiss/escape-space-in-options

ejabberdctl: Escape whitespace in ERL_OPTIONS

9 years agoejabberdctl: Escape whitespace in ERL_OPTIONS
Holger Weiss [Fri, 13 Mar 2015 10:40:23 +0000 (11:40 +0100)]
ejabberdctl: Escape whitespace in ERL_OPTIONS

If ERL_OPTIONS="-opt arg" is specified, make sure the space character
between "-opt" and "arg" is retained.

Fixes #143.

9 years agoImprove module structure
Evgeniy Khramtsov [Fri, 13 Mar 2015 10:05:16 +0000 (13:05 +0300)]
Improve module structure

9 years agoDo not fail on badly formed SQL results
Evgeniy Khramtsov [Sat, 9 Nov 2013 14:56:28 +0000 (00:56 +1000)]
Do not fail on badly formed SQL results

9 years agoFix unblock all when Riak is used as a backend
Evgeniy Khramtsov [Fri, 13 Mar 2015 09:47:08 +0000 (12:47 +0300)]
Fix unblock all when Riak is used as a backend

9 years agoExtra arguments to cluster scripts are not mandatory
Christophe Romain [Fri, 13 Mar 2015 08:56:51 +0000 (09:56 +0100)]
Extra arguments to cluster scripts are not mandatory

9 years agoRemove trailing space to get correct arguments
Christophe Romain [Fri, 13 Mar 2015 08:47:12 +0000 (09:47 +0100)]
Remove trailing space to get correct arguments

This allows to remove any argument to joincluster/leavecluster scripts
when no parameters has been added after the ctl command.

9 years agoejabberdctl: Escape whitespace in ERL_OPTIONS
Holger Weiss [Fri, 13 Mar 2015 08:27:55 +0000 (09:27 +0100)]
ejabberdctl: Escape whitespace in ERL_OPTIONS

If ERL_OPTIONS="-opt arg" is specified, make sure the space character
between "-opt" and "arg" is retained.

Fixes #143.

9 years agoReplace bashism in ejabberdctl
Holger Weiss [Thu, 12 Mar 2015 18:29:41 +0000 (19:29 +0100)]
Replace bashism in ejabberdctl

9 years agoUpdate sockmod() type after adding websocket support
Paweł Chmielowski [Thu, 12 Mar 2015 12:14:30 +0000 (13:14 +0100)]
Update sockmod() type after adding websocket support

9 years agoRemove unused clause
Christophe Romain [Thu, 12 Mar 2015 12:15:07 +0000 (13:15 +0100)]
Remove unused clause

9 years agoUpdate types to fix dialyzer warnings
Paweł Chmielowski [Thu, 12 Mar 2015 09:34:23 +0000 (10:34 +0100)]
Update types to fix dialyzer warnings

9 years agomod_offline: Remove a few superfluous newlines
Holger Weiss [Wed, 11 Mar 2015 19:38:22 +0000 (20:38 +0100)]
mod_offline: Remove a few superfluous newlines

9 years agoDon't crash in mod_offline:export/1
Holger Weiss [Wed, 11 Mar 2015 19:35:08 +0000 (20:35 +0100)]
Don't crash in mod_offline:export/1

(Thanks to Christophe Romain.)

9 years agostart ext_mod in later stage at init
Christophe Romain [Wed, 11 Mar 2015 16:39:07 +0000 (17:39 +0100)]
start ext_mod in later stage at init

9 years agoRemove unused code
Christophe Romain [Wed, 11 Mar 2015 16:15:42 +0000 (17:15 +0100)]
Remove unused code

9 years agoCompile contributed module with lager if enabled in ejabberd
Christophe Romain [Wed, 11 Mar 2015 13:35:01 +0000 (14:35 +0100)]
Compile contributed module with lager if enabled in ejabberd

9 years agoAdd packaging support for contributed modules
Christophe Romain [Wed, 11 Mar 2015 13:14:28 +0000 (14:14 +0100)]
Add packaging support for contributed modules

This is a preliminary version that is tested to work with the packaging
branch of ejabberd-modules repository

This version lacks automatic configuration include at runtime

9 years agoAdd Redis backend for SM
Evgeniy Khramtsov [Wed, 11 Mar 2015 11:46:57 +0000 (14:46 +0300)]
Add Redis backend for SM

9 years agoAlways specify room JID for MUC <delay/> elements
Holger Weiss [Mon, 9 Mar 2015 23:02:32 +0000 (00:02 +0100)]
Always specify room JID for MUC <delay/> elements

As per version 1.25 of XEP-0045, use the room JID as the 'from' address
for <delay/> elements also when the room is non-anonymous, and specify
the original JID of the sender as an XEP-0033-style tag instead.

Closes #465.

9 years agoMerge pull request #467 from hamano/mod_offline_restart
badlop [Mon, 9 Mar 2015 18:26:19 +0000 (19:26 +0100)]
Merge pull request #467 from hamano/mod_offline_restart

change mod_offline restart type

9 years agoFix R15B compilation
Evgeniy Khramtsov [Mon, 9 Mar 2015 14:50:14 +0000 (17:50 +0300)]
Fix R15B compilation

9 years agoMake it possible to use SQL as an SM backend
Evgeniy Khramtsov [Mon, 9 Mar 2015 13:41:13 +0000 (16:41 +0300)]
Make it possible to use SQL as an SM backend

9 years agoAdd forgotten header file
Evgeniy Khramtsov [Mon, 9 Mar 2015 13:39:29 +0000 (16:39 +0300)]
Add forgotten header file

9 years agoSeparate db backend from the SM
Evgeniy Khramtsov [Mon, 9 Mar 2015 11:57:33 +0000 (14:57 +0300)]
Separate db backend from the SM

9 years agochange mod_offline restart type
HAMANO Tsukasa [Mon, 9 Mar 2015 11:28:55 +0000 (20:28 +0900)]
change mod_offline restart type

9 years agoMerge pull request #466 from mremond/hooks_refactor
Mickaël Rémond [Mon, 9 Mar 2015 08:34:54 +0000 (09:34 +0100)]
Merge pull request #466 from mremond/hooks_refactor

Hooks module refactor

9 years agoReorganize / clean ejabberd_hooks header
Mickaël Rémond [Sun, 8 Mar 2015 18:03:02 +0000 (19:03 +0100)]
Reorganize / clean ejabberd_hooks header

9 years agoMore ejabberd_hooks refactor
Mickaël Rémond [Sun, 8 Mar 2015 17:44:43 +0000 (18:44 +0100)]
More ejabberd_hooks refactor

9 years agoejabberd_hooks refactor and better types
Mickaël Rémond [Sun, 8 Mar 2015 17:23:22 +0000 (18:23 +0100)]
ejabberd_hooks refactor and better types

9 years agoSuppress warnings in Elixir test
Mickaël Rémond [Sun, 8 Mar 2015 17:22:14 +0000 (18:22 +0100)]
Suppress warnings in Elixir test

9 years agoAdd Elixir test on ejabberd hooks
Mickaël Rémond [Sun, 8 Mar 2015 16:06:43 +0000 (17:06 +0100)]
Add Elixir test on ejabberd hooks

This is to prepare ejabberd_hooks module refactoring.

I also expanded API to help with testing.

9 years agoMerge pull request #462 from mremond/add-meck-tool-dependancy
Mickaël Rémond [Sat, 7 Mar 2015 11:53:47 +0000 (12:53 +0100)]
Merge pull request #462 from mremond/add-meck-tool-dependancy

Add Meck dependency when building for development

9 years agoAdd Meck dependency when building for development
Mickaël Rémond [Sat, 7 Mar 2015 11:44:17 +0000 (12:44 +0100)]
Add Meck dependency when building for development

This allows writing tests with mock functions.

Fixes #439

9 years agoMerge pull request #461 from mremond/fix-r16-tests
Mickaël Rémond [Sat, 7 Mar 2015 11:41:59 +0000 (12:41 +0100)]
Merge pull request #461 from mremond/fix-r16-tests

Test file can be compiled under R16

9 years agoTest file can be compiled under R16
Mickaël Rémond [Sat, 7 Mar 2015 11:31:11 +0000 (12:31 +0100)]
Test file can be compiled under R16

Fixes test failing under R16 due to elixir_suite build syntax error.

The test will never be run under r16 as Elixir requires r17 and map
anyway.

9 years agoMerge pull request #460 from mremond/run-elixir-test
Mickaël Rémond [Sat, 7 Mar 2015 10:59:44 +0000 (11:59 +0100)]
Merge pull request #460 from mremond/run-elixir-test

Fix Elixir tests failure detection

9 years agoFix Elixir tests failure detection
Mickaël Rémond [Sat, 7 Mar 2015 10:49:37 +0000 (11:49 +0100)]
Fix Elixir tests failure detection

We now make sure we have no failure.
Solves #438

9 years agoadd mnesia cluster helper scripts
Christophe Romain [Fri, 6 Mar 2015 14:40:09 +0000 (15:40 +0100)]
add mnesia cluster helper scripts

9 years agoFix: default_host is forgotten between consecutive HTTP requests (#416)
Badlop [Fri, 6 Mar 2015 11:40:48 +0000 (12:40 +0100)]
Fix: default_host is forgotten between consecutive HTTP requests (#416)

9 years agoAccess list editing broken in web_admin (#252)
Badlop [Thu, 5 Mar 2015 10:34:25 +0000 (11:34 +0100)]
Access list editing broken in web_admin (#252)

9 years agoAccept configuration file with .yaml extension (#290)
Badlop [Wed, 4 Mar 2015 16:18:57 +0000 (17:18 +0100)]
Accept configuration file with .yaml extension (#290)

9 years agoMerge branch 'master' of github.com:processone/ejabberd
Mickaël Rémond [Tue, 3 Mar 2015 21:20:08 +0000 (22:20 +0100)]
Merge branch 'master' of github.com:processone/ejabberd

9 years agoFix typo on state reuse
Mickaël Rémond [Tue, 3 Mar 2015 21:19:51 +0000 (22:19 +0100)]
Fix typo on state reuse

It should help with the crash on #453

9 years agoMerge pull request #441 from mremond/test/#438/run-elixir-tests
Mickaël Rémond [Tue, 3 Mar 2015 21:15:24 +0000 (22:15 +0100)]
Merge pull request #441 from mremond/test/#438/run-elixir-tests

Support for running Elixir ExUnit tests from Common Test

9 years agoFix IPv6 loopback address in the guide
Holger Weiss [Tue, 3 Mar 2015 20:23:11 +0000 (21:23 +0100)]
Fix IPv6 loopback address in the guide

Thanks to Erik Huelsmann for spotting this.

9 years agoMerge pull request #448 from hamano/ja
badlop [Mon, 2 Mar 2015 10:09:06 +0000 (11:09 +0100)]
Merge pull request #448 from hamano/ja

update japanese translation.

9 years agoMerge pull request #384 from weiss/fix-last-item-type
Christophe Romain [Fri, 27 Feb 2015 10:40:12 +0000 (11:40 +0100)]
Merge pull request #384 from weiss/fix-last-item-type

Use correct message type when sending last published PEP/PubSub items

9 years agoadditional japanese translation.
HAMANO Tsukasa [Fri, 27 Feb 2015 10:21:47 +0000 (19:21 +0900)]
additional japanese translation.

9 years agoUpdate Spanish translation
Badlop [Thu, 26 Feb 2015 16:57:51 +0000 (17:57 +0100)]
Update Spanish translation

9 years agoRun "make translations" to update PO and MSG files
Badlop [Thu, 26 Feb 2015 16:16:27 +0000 (17:16 +0100)]
Run "make translations" to update PO and MSG files

9 years agoMerge pull request #445 from hamano/ja
badlop [Thu, 26 Feb 2015 16:13:35 +0000 (17:13 +0100)]
Merge pull request #445 from hamano/ja

improve japanese translation

9 years agoimprove japanese translation
HAMANO Tsukasa [Thu, 26 Feb 2015 14:42:52 +0000 (23:42 +0900)]
improve japanese translation

9 years agoUpdate remanining old RFC links (EJAB-1728)(#444)
Badlop [Thu, 26 Feb 2015 11:18:51 +0000 (12:18 +0100)]
Update remanining old RFC links (EJAB-1728)(#444)

9 years agoMerge pull request #443 from mojolingo/feature/muc_admin/affiliation-change-propogate...
badlop [Thu, 26 Feb 2015 10:48:17 +0000 (11:48 +0100)]
Merge pull request #443 from mojolingo/feature/muc_admin/affiliation-change-propogate-xmpp

Permit modifying affiliations via an event

9 years agoset-dep-versions: Cope with branches
Holger Weiss [Wed, 25 Feb 2015 23:02:11 +0000 (00:02 +0100)]
set-dep-versions: Cope with branches

Handle the case where a branch name is specified for a rebar dependency,
as we now do for Elixir.

9 years agoPermit modifying affiliations via an event
Ben Langfeld [Wed, 25 Feb 2015 15:31:27 +0000 (12:31 -0300)]
Permit modifying affiliations via an event

Allows us to implement mod_muc_admin:set_room_addiliation properly

9 years agoUpdate FSF address
Badlop [Wed, 25 Feb 2015 14:19:33 +0000 (15:19 +0100)]
Update FSF address

9 years agoFix processing POST messages after changes from adding websocket handling
Paweł Chmielowski [Wed, 25 Feb 2015 13:36:48 +0000 (14:36 +0100)]
Fix processing POST messages after changes from adding websocket handling

9 years agoTry not to use c2s:send_text, it causes problem with websocket
Paweł Chmielowski [Wed, 25 Feb 2015 09:46:03 +0000 (10:46 +0100)]
Try not to use c2s:send_text, it causes problem with websocket

9 years agoAdd support for websocket connections
Paweł Chmielowski [Wed, 25 Feb 2015 09:42:59 +0000 (10:42 +0100)]
Add support for websocket connections

9 years agoMerge pull request #442 from weiss/use-stable-elixir
Mickaël Rémond [Tue, 24 Feb 2015 11:46:56 +0000 (12:46 +0100)]
Merge pull request #442 from weiss/use-stable-elixir

Use Elixir's 'v1.0' branch

9 years agoUse Elixir's 'v1.0' branch
Holger Weiss [Tue, 24 Feb 2015 11:12:22 +0000 (12:12 +0100)]
Use Elixir's 'v1.0' branch

The stable Elixir releases are currently built from the 'v1.0' branch,
so let's use that.

9 years agoMerge branch 'master' of github.com:processone/ejabberd
Christophe Romain [Mon, 23 Feb 2015 14:52:23 +0000 (15:52 +0100)]
Merge branch 'master' of github.com:processone/ejabberd

9 years agoAdd script for systemd (Guthub #434)
Christophe Romain [Mon, 23 Feb 2015 14:52:18 +0000 (15:52 +0100)]
Add script for systemd (Guthub #434)

9 years agoIncrease common test timeout
Mickaël Rémond [Mon, 23 Feb 2015 10:03:15 +0000 (11:03 +0100)]
Increase common test timeout

This is needed to cope with long launch time on small / slow VM.
Fixes #440

9 years agoAdd compatibility macros for deprecated types (thanks to Alexey)
Christophe Romain [Wed, 11 Feb 2015 11:08:16 +0000 (12:08 +0100)]
Add compatibility macros for deprecated types (thanks to Alexey)

9 years agoImprove comments for running Elixir tests
Mickaël Rémond [Sun, 22 Feb 2015 16:45:25 +0000 (17:45 +0100)]
Improve comments for running Elixir tests

9 years agoSupport for running Elixir ExUnit tests from Common Test
Mickaël Rémond [Sun, 22 Feb 2015 16:41:17 +0000 (17:41 +0100)]
Support for running Elixir ExUnit tests from Common Test

9 years agoUpdate links
Mickaël Rémond [Thu, 19 Feb 2015 11:17:39 +0000 (12:17 +0100)]
Update links

9 years agoDisplay build status
Mickaël Rémond [Thu, 19 Feb 2015 11:10:25 +0000 (12:10 +0100)]
Display build status

9 years agoUpdate mod_vcard_ldap Guide documentation from Erlang to YAML format (Github #274...
Badlop [Tue, 17 Feb 2015 12:40:37 +0000 (13:40 +0100)]
Update mod_vcard_ldap Guide documentation from Erlang to YAML format (Github #274 #394)

9 years agomod_carboncopy: Apply small code simplification 15.02
Holger Weiss [Wed, 11 Feb 2015 23:14:57 +0000 (00:14 +0100)]
mod_carboncopy: Apply small code simplification

9 years agoCheck availability before carbon copying
Holger Weiss [Wed, 11 Feb 2015 15:12:08 +0000 (16:12 +0100)]
Check availability before carbon copying

Before generating a carbon copy for a resource, make sure it's actually
available.  This handles the case where, for some reason, the
'unset_presence_hook' wasn't called during logout of a resource.  Carbon
copies sent to that resource would otherwise be re-routed to another
resource (which might've received a copy of that message already).

9 years agoDon't crash if 'request_path' has unexpected type
Holger Weiss [Wed, 11 Feb 2015 14:38:55 +0000 (15:38 +0100)]
Don't crash if 'request_path' has unexpected type