]> granicus.if.org Git - ejabberd/log
ejabberd
9 years agoFix MSSQL support
Evgeniy Khramtsov [Sun, 13 Sep 2015 11:20:31 +0000 (14:20 +0300)]
Fix MSSQL support

9 years agoext_mod must be started before ejabberd_config
Christophe Romain [Fri, 11 Sep 2015 12:32:58 +0000 (14:32 +0200)]
ext_mod must be started before ejabberd_config

9 years agoUpdate German translation (thanks to Nikolaus Polak)
Badlop [Fri, 11 Sep 2015 11:22:52 +0000 (13:22 +0200)]
Update German translation (thanks to Nikolaus Polak)

9 years agoUpdate Hebrew translation (thanks to Isratine Citizen)
Badlop [Thu, 10 Sep 2015 19:25:12 +0000 (21:25 +0200)]
Update Hebrew translation (thanks to Isratine Citizen)

9 years agoInclude ext_mod modules when checking accepted options (ejabberd-contrib#116)
Badlop [Thu, 10 Sep 2015 18:11:02 +0000 (20:11 +0200)]
Include ext_mod modules when checking accepted options (ejabberd-contrib#116)

9 years agotypo fix
Christophe Romain [Thu, 10 Sep 2015 10:21:50 +0000 (12:21 +0200)]
typo fix

9 years agoUpdate Esperanto and Dutch translations (thanks to Andreas van Cranenburgh)
Badlop [Tue, 8 Sep 2015 19:38:23 +0000 (21:38 +0200)]
Update Esperanto and Dutch translations (thanks to Andreas van Cranenburgh)

9 years agoMerge branch 'master' of github.com:processone/ejabberd
Mickael Remond [Mon, 7 Sep 2015 15:56:09 +0000 (17:56 +0200)]
Merge branch 'master' of github.com:processone/ejabberd

9 years agoFix typo
Mickael Remond [Mon, 7 Sep 2015 15:55:54 +0000 (17:55 +0200)]
Fix typo

9 years agoUpdate Brazilian Portuguese translation (thanks to Otávio Fernandes)
Badlop [Mon, 7 Sep 2015 15:46:50 +0000 (17:46 +0200)]
Update Brazilian Portuguese translation (thanks to Otávio Fernandes)

9 years agoUpdate Japanese translation (thanks to Tsukasa Hamano)(#729)
Badlop [Mon, 7 Sep 2015 15:46:05 +0000 (17:46 +0200)]
Update Japanese translation (thanks to Tsukasa Hamano)(#729)

9 years agoUse our own includes + includes from all dependencies
Mickael Remond [Mon, 7 Sep 2015 15:35:58 +0000 (17:35 +0200)]
Use our own includes + includes from all dependencies

9 years agoUpdate Catalan and Spanish translations
Badlop [Mon, 7 Sep 2015 13:06:57 +0000 (15:06 +0200)]
Update Catalan and Spanish translations

9 years agoUpdate Russian PO file
Evgeniy Khramtsov [Mon, 7 Sep 2015 12:21:42 +0000 (15:21 +0300)]
Update Russian PO file

9 years agoRun "make translations" and get updated PO files
Badlop [Mon, 7 Sep 2015 11:37:54 +0000 (13:37 +0200)]
Run "make translations" and get updated PO files

9 years agoFix German translation (thanks to STPKITT)(#726)
Badlop [Mon, 7 Sep 2015 11:16:56 +0000 (13:16 +0200)]
Fix German translation (thanks to STPKITT)(#726)

9 years agoPass stream management options defined in http listener to http-bind and websocket
Paweł Chmielowski [Fri, 4 Sep 2015 10:42:53 +0000 (12:42 +0200)]
Pass stream management options defined in http listener to http-bind and websocket

9 years agoNew XEP-0198 option: "max_resume_timeout"
Holger Weiss [Thu, 3 Sep 2015 19:20:15 +0000 (21:20 +0200)]
New XEP-0198 option: "max_resume_timeout"

In the past, the "resume_timeout" option defined both the default resume
timeout and the maximum resume timeout clients are permitted to request.
Admins might want to allow clients to request a timeout value that's
larger than the default, though.  This can now be done by specifying the
"max_resume_timeout" option.

9 years agoUse hide_sensitive_log_data in eldap.erl
Badlop [Thu, 3 Sep 2015 14:27:42 +0000 (16:27 +0200)]
Use hide_sensitive_log_data in eldap.erl

9 years agoMerge branch 'master' of github.com:processone/ejabberd
Mickael Remond [Wed, 2 Sep 2015 15:02:20 +0000 (17:02 +0200)]
Merge branch 'master' of github.com:processone/ejabberd

9 years agoBetter to keep config file in a different config directory
Mickael Remond [Wed, 2 Sep 2015 15:02:09 +0000 (17:02 +0200)]
Better to keep config file in a different config directory

9 years agoRename idna.erl to ejabberd_idna.erl (#702)
Evgeniy Khramtsov [Wed, 2 Sep 2015 13:02:46 +0000 (16:02 +0300)]
Rename idna.erl to ejabberd_idna.erl (#702)

9 years agoMerge pull request #725 from processone/elixir-mix
Mickaël Rémond [Wed, 2 Sep 2015 12:25:43 +0000 (14:25 +0200)]
Merge pull request #725 from processone/elixir-mix

Allow building an ejabberd release with mix and elixir release manager

9 years agoAdd verification of hide_sensitive_log_data global option
Badlop [Wed, 2 Sep 2015 11:46:03 +0000 (13:46 +0200)]
Add verification of hide_sensitive_log_data global option

9 years agoRemove unused function now_to_iso/1
Evgeniy Khramtsov [Wed, 2 Sep 2015 11:13:23 +0000 (14:13 +0300)]
Remove unused function now_to_iso/1

9 years agoAllow building ejabberd with Elixir mix and building and ejabberd OTP release
Mickael Remond [Wed, 2 Sep 2015 10:49:19 +0000 (12:49 +0200)]
Allow building ejabberd with Elixir mix and building and ejabberd OTP release

9 years agoignore ejabberd release result directory
Mickael Remond [Wed, 2 Sep 2015 10:48:19 +0000 (12:48 +0200)]
ignore ejabberd release result directory

9 years agoUpdate mix.exs to comply with exrm release system
Mickael Remond [Wed, 2 Sep 2015 09:38:16 +0000 (11:38 +0200)]
Update mix.exs to comply with exrm release system

9 years agoUpdate mix.exs
Mickaël Rémond [Wed, 2 Sep 2015 08:54:24 +0000 (10:54 +0200)]
Update mix.exs

Fix version number.

9 years agoUpgrade version number to ejabberd 15.07
Mickael Remond [Wed, 2 Sep 2015 07:11:06 +0000 (09:11 +0200)]
Upgrade version number to ejabberd 15.07

We forgot before previous release

9 years agoDo not forget to set from/to when fetching from MUC history
Evgeniy Khramtsov [Tue, 1 Sep 2015 09:35:08 +0000 (12:35 +0300)]
Do not forget to set from/to when fetching from MUC history

9 years agoFix problem with merging same port, different ip listeners in config files
Paweł Chmielowski [Tue, 1 Sep 2015 08:56:43 +0000 (10:56 +0200)]
Fix problem with merging same port, different ip listeners in config files

Also switch to function used by ejabberd_listener to extract that
information instead of rolling our own code for that.

9 years agoFetch MUC MAM messages from room history directly if it's not enabled in room configu...
Evgeniy Khramtsov [Tue, 1 Sep 2015 08:37:07 +0000 (11:37 +0300)]
Fetch MUC MAM messages from room history directly if it's not enabled in room configuration

9 years agoUpdate MAM tests to always expect RSM in response
Holger Weiss [Sun, 30 Aug 2015 21:26:37 +0000 (23:26 +0200)]
Update MAM tests to always expect RSM in response

9 years agoMerge pull request #721 from oxpa/muc_admin
Evgeny Khramtsov [Fri, 28 Aug 2015 12:23:00 +0000 (15:23 +0300)]
Merge pull request #721 from oxpa/muc_admin

get_room_options will not crash in case of query for a non-existent room

9 years agoget_room_options will not crash in case of query for a non-existent room
oxpa [Fri, 28 Aug 2015 11:34:51 +0000 (03:34 -0800)]
get_room_options will not crash in case of query for a non-existent room

9 years agoRemove "--enable-json" flag
Holger Weiss [Thu, 27 Aug 2015 20:16:11 +0000 (22:16 +0200)]
Remove "--enable-json" flag

The "--enable-json" flag currently has no effect.

9 years agoAlways include RSM in final message
Evgeniy Khramtsov [Mon, 24 Aug 2015 10:22:18 +0000 (13:22 +0300)]
Always include RSM in final message

9 years agoRemove MAM archives on MUC room destroy
Evgeniy Khramtsov [Wed, 19 Aug 2015 13:15:02 +0000 (16:15 +0300)]
Remove MAM archives on MUC room destroy

9 years agoMore eye-candy mod_http_bind help page (thanks to Marek Foss)
Badlop [Fri, 21 Aug 2015 13:23:03 +0000 (15:23 +0200)]
More eye-candy mod_http_bind help page (thanks to Marek Foss)

9 years agoImprove S2S certificate checks
Evgeniy Khramtsov [Wed, 19 Aug 2015 22:04:56 +0000 (01:04 +0300)]
Improve S2S certificate checks

9 years agoFix case clause during S2S certificate checks
Evgeniy Khramtsov [Wed, 19 Aug 2015 20:47:45 +0000 (23:47 +0300)]
Fix case clause during S2S certificate checks

9 years agoChange namespace from muc#admin to muc#user
Evgeniy Khramtsov [Fri, 14 Aug 2015 13:42:10 +0000 (16:42 +0300)]
Change namespace from muc#admin to muc#user

9 years agoDon't overwrite listeners for different transports in config merging
Paweł Chmielowski [Wed, 19 Aug 2015 08:14:09 +0000 (10:14 +0200)]
Don't overwrite listeners for different transports in config merging

Before this having listeners on same port for both tcp and udp would after
config merging step left only one of them.

Many thanks to Holger Weiß for noticing this.

9 years agoCatch errors when calling inet:peername in ejabberd_http
Paweł Chmielowski [Mon, 17 Aug 2015 13:50:02 +0000 (15:50 +0200)]
Catch errors when calling inet:peername in ejabberd_http

9 years agoLet ejabberdctl handle more shell metacharacters
Holger Weiss [Sat, 15 Aug 2015 15:01:47 +0000 (17:01 +0200)]
Let ejabberdctl handle more shell metacharacters

Closes #704.

9 years agoconfigure.ac: Don't insist on Erlang/OTP >= 17.5
Holger Weiss [Thu, 13 Aug 2015 11:06:05 +0000 (13:06 +0200)]
configure.ac: Don't insist on Erlang/OTP >= 17.5

The current ejabberd code works on Erlang/OTP 17.1 or newer.  We now
also let Travis CI test this version in addition to 17.5.

9 years agoPrettify copyright links (thanks to GreenLunar)(#692)
Badlop [Thu, 13 Aug 2015 10:22:03 +0000 (12:22 +0200)]
Prettify copyright links (thanks to GreenLunar)(#692)

9 years agoStore and retrieve "mam" value in room configuration
Badlop [Wed, 12 Aug 2015 18:23:28 +0000 (20:23 +0200)]
Store and retrieve "mam" value in room configuration

9 years agoFix and document create_rooms_file and destroy_
Badlop [Wed, 12 Aug 2015 15:18:41 +0000 (17:18 +0200)]
Fix and document create_rooms_file and destroy_

9 years agoChanged API of some mod_muc_admin command arguments
Badlop [Wed, 12 Aug 2015 11:26:24 +0000 (13:26 +0200)]
Changed API of some mod_muc_admin command arguments

With this commit, arguments change in two commands:
* destroy_room: does not require Host argument
* send_direct_invitation: instead of Room, now requires Name and Service

9 years agoRoom response to disco#info node muc#traffic should be an error (EJAB-741)
Badlop [Wed, 12 Aug 2015 10:40:37 +0000 (12:40 +0200)]
Room response to disco#info node muc#traffic should be an error (EJAB-741)

9 years agoEjabberd now requires erlang R17+
Paweł Chmielowski [Wed, 12 Aug 2015 09:53:54 +0000 (11:53 +0200)]
Ejabberd now requires erlang R17+

9 years agoAdd support for MUC MAM
Evgeniy Khramtsov [Thu, 6 Aug 2015 10:33:39 +0000 (13:33 +0300)]
Add support for MUC MAM

9 years agoHandle merging of append_host_config as is done for host_config
Paweł Chmielowski [Thu, 6 Aug 2015 15:45:19 +0000 (17:45 +0200)]
Handle merging of append_host_config as is done for host_config

9 years agoAdd ability to override main config file options with data from included files
Paweł Chmielowski [Thu, 6 Aug 2015 15:12:15 +0000 (17:12 +0200)]
Add ability to override main config file options with data from included files

9 years agoRemove obsolete pubsub migration command
Christophe Romain [Thu, 6 Aug 2015 14:57:04 +0000 (16:57 +0200)]
Remove obsolete pubsub migration command

9 years agoMerge branch 'typo' of https://github.com/sezuan/ejabberd
Holger Weiss [Thu, 6 Aug 2015 06:57:10 +0000 (08:57 +0200)]
Merge branch 'typo' of https://github.com/sezuan/ejabberd

9 years agotypo
Matthias Rieber [Thu, 6 Aug 2015 06:44:15 +0000 (08:44 +0200)]
typo

9 years agomod_multicast changes:
Alexey Shchepin [Wed, 5 Aug 2015 16:17:58 +0000 (19:17 +0300)]
mod_multicast changes:
- catch exceptions
- do ets:give_away for multicastp table on init
- don't send multicasts to itself
- don't check user@server for multicast support
- handle empty disco items
- ignore cdata in <addresses/>
- properly check for subdomains

9 years agoUse websocket pings also on old style connections
Paweł Chmielowski [Wed, 5 Aug 2015 14:08:06 +0000 (16:08 +0200)]
Use websocket pings also on old style connections

9 years agoUpdate FSF address
Christophe Romain [Wed, 5 Aug 2015 07:52:54 +0000 (09:52 +0200)]
Update FSF address

9 years agomod_client_state: Throttle stanzas by default
Holger Weiss [Tue, 4 Aug 2015 22:05:11 +0000 (00:05 +0200)]
mod_client_state: Throttle stanzas by default

Enable the mod_client_state options "drop_chat_states" and
"queue_presence" by default.  These features are now well-tested in
practice.

9 years agoRename muc_filter_packet to muc_filter_message
Holger Weiss [Tue, 4 Aug 2015 19:16:45 +0000 (21:16 +0200)]
Rename muc_filter_packet to muc_filter_message

The hook is just triggered on groupchat messages, not on other types of
stanzas.

9 years agoMerge pull request #696 from weiss/muc-presence-hook
Evgeny Khramtsov [Tue, 4 Aug 2015 19:14:18 +0000 (22:14 +0300)]
Merge pull request #696 from weiss/muc-presence-hook

New hook: muc_filter_presence

9 years agoNew hook: muc_filter_presence
Holger Weiss [Tue, 4 Aug 2015 18:13:00 +0000 (20:13 +0200)]
New hook: muc_filter_presence

Add a hook that allows for modifying or dropping presence stanzas sent
to MUC rooms.

9 years agoAdd split_jid/1
Mickael Remond [Tue, 4 Aug 2015 07:48:59 +0000 (09:48 +0200)]
Add split_jid/1

This is a convenience reverse of make_jid/1. It allows extracting the jid parts
without relying on using the jid record structure, to abstract details.

9 years agoDo not crash SIP authentication on SCRAMed passwords
Evgeniy Khramtsov [Sun, 2 Aug 2015 11:47:06 +0000 (14:47 +0300)]
Do not crash SIP authentication on SCRAMed passwords

9 years agoUpdate crypto calls
Alexey Shchepin [Thu, 30 Jul 2015 15:47:15 +0000 (18:47 +0300)]
Update crypto calls

9 years agoMerge pull request #682 from weiss/no-mam-carbons
Evgeny Khramtsov [Thu, 30 Jul 2015 14:11:56 +0000 (17:11 +0300)]
Merge pull request #682 from weiss/no-mam-carbons

Don't carbon-copy messages of type "normal" without body

9 years agoDon't copy messages of type "normal" without body
Holger Weiss [Tue, 28 Jul 2015 19:34:02 +0000 (21:34 +0200)]
Don't copy messages of type "normal" without body

Don't carbon-copy messages of type "normal" that don't have a body
element as an immediate subtag.  Those messages are usually generated by
clients or servers (as opposed to messages written by humans).  This
includes MAM messages, for example.

9 years agoAlso check for <no-storage/> hint
Holger Weiss [Tue, 28 Jul 2015 19:08:33 +0000 (21:08 +0200)]
Also check for <no-storage/> hint

Check for the <no-storage/> and <no-permanent-storage/> hints in
addition to <no-store/> and <no-permanent-store/>.  XEP-0334 (0.1)
mentions both variants, and unfortunately, both of them are in use.

9 years agoXEP-0198: Don't add <delay/> tags to IQ stanzas
Holger Weiss [Tue, 28 Jul 2015 19:00:12 +0000 (21:00 +0200)]
XEP-0198: Don't add <delay/> tags to IQ stanzas

9 years agoRecompile translations 15.07
Badlop [Mon, 27 Jul 2015 09:45:04 +0000 (11:45 +0200)]
Recompile translations

9 years agoUpdated Spanish translation
Badlop [Mon, 27 Jul 2015 09:43:31 +0000 (11:43 +0200)]
Updated Spanish translation

9 years agoUpdated Hebrew translation (thanks to Isratine Citizen)
Badlop [Mon, 27 Jul 2015 09:41:38 +0000 (11:41 +0200)]
Updated Hebrew translation (thanks to Isratine Citizen)

9 years agoReuse some strings in WebAdmin's Listening Ports
Badlop [Mon, 27 Jul 2015 09:23:51 +0000 (11:23 +0200)]
Reuse some strings in WebAdmin's Listening Ports

9 years agoFix problem with merging values from multiple config files
Paweł Chmielowski [Fri, 24 Jul 2015 13:45:29 +0000 (15:45 +0200)]
Fix problem with merging values from multiple config files

9 years agoEnsure config snippet is loaded at module installation (EJAB-1741)
Christophe Romain [Fri, 24 Jul 2015 13:09:57 +0000 (15:09 +0200)]
Ensure config snippet is loaded at module installation (EJAB-1741)

9 years agoAllow contribution to include .yml or .yaml config file
Christophe Romain [Fri, 24 Jul 2015 12:30:31 +0000 (14:30 +0200)]
Allow contribution to include .yml or .yaml config file

9 years agoAllow migration of old pubsub items with xmlelement in body (#479)
Christophe Romain [Fri, 24 Jul 2015 11:44:01 +0000 (13:44 +0200)]
Allow migration of old pubsub items with xmlelement in body (#479)

9 years agoMerge pull request #642 from weiss/pep-on-caps-update
Christophe Romain [Fri, 24 Jul 2015 10:07:22 +0000 (12:07 +0200)]
Merge pull request #642 from weiss/pep-on-caps-update

Also send PEP notifications when local contact updates CAPS

9 years agoProvide command for ODBC's convert_to_scram
Badlop [Thu, 23 Jul 2015 11:16:15 +0000 (13:16 +0200)]
Provide command for ODBC's convert_to_scram

9 years agoDon't crash web admin when displaying info about websocket using users
Paweł Chmielowski [Wed, 22 Jul 2015 09:54:11 +0000 (11:54 +0200)]
Don't crash web admin when displaying info about websocket using users

9 years agoLet nodetree call default flat plugin now
Christophe Romain [Wed, 22 Jul 2015 09:20:06 +0000 (11:20 +0200)]
Let nodetree call default flat plugin now

this fix mistake from previous commit 311fedaa

9 years agoAllow include of simple dependencies (EJAB-1737)(#391)
Christophe Romain [Wed, 22 Jul 2015 08:48:44 +0000 (10:48 +0200)]
Allow include of simple dependencies (EJAB-1737)(#391)

Either contributed module include dependencies this way
  deps/
    dep1/
      src/
      include/
    dep1/
      src/
      include/

Or includes rebar.config or rebar.config.script:
In this case, only git is supported (if git command available)
and ext_mod checkout code in deps directory.

In both case, only basic built procedure is supported. ext_mod
does not do more than bare compilation like this:
erlc -I include src/*erl

9 years agoLet flat be default plugin (#609)
Christophe Romain [Wed, 22 Jul 2015 08:37:26 +0000 (10:37 +0200)]
Let flat be default plugin (#609)

9 years agoDo not init nodes from mod_pubsub (#609)
Christophe Romain [Wed, 22 Jul 2015 06:03:27 +0000 (08:03 +0200)]
Do not init nodes from mod_pubsub (#609)

Let each plugin do its own initialisation in init_plugins
init_nodes was an old function to be removed.

9 years agoMerge pull request #608 from weiss/bare-jid-subscription
Christophe Romain [Wed, 22 Jul 2015 05:58:34 +0000 (07:58 +0200)]
Merge pull request #608 from weiss/bare-jid-subscription

PubSub: Check for node subscription of bare JID

9 years agoMerge pull request #632 from weiss/increase-max-ack-queue
Evgeny Khramtsov [Tue, 21 Jul 2015 09:36:01 +0000 (12:36 +0300)]
Merge pull request #632 from weiss/increase-max-ack-queue

XEP-0198: Increase default value of "max_ack_queue" option

9 years agoMerge pull request #618 from weiss/muc-message-hook
Evgeny Khramtsov [Tue, 21 Jul 2015 09:35:27 +0000 (12:35 +0300)]
Merge pull request #618 from weiss/muc-message-hook

New hook: muc_filter_packet

9 years agoPrint content types more gracefully
Evgeniy Khramtsov [Fri, 17 Jul 2015 11:27:31 +0000 (14:27 +0300)]
Print content types more gracefully

9 years agoGet rid of 'db_type' for mod_blocking in test suite
Evgeniy Khramtsov [Thu, 16 Jul 2015 10:30:14 +0000 (13:30 +0300)]
Get rid of 'db_type' for mod_blocking in test suite

9 years agoSet direction of resource and connection (#650)
Badlop [Wed, 15 Jul 2015 19:36:36 +0000 (21:36 +0200)]
Set direction of resource and connection (#650)

9 years agoIf local guide.html file not found, redirect to the online guide
Badlop [Wed, 15 Jul 2015 18:45:55 +0000 (20:45 +0200)]
If local guide.html file not found, redirect to the online guide

9 years agoUpdate links to Guide in WebAdmin
Badlop [Wed, 15 Jul 2015 18:40:13 +0000 (20:40 +0200)]
Update links to Guide in WebAdmin

9 years agoSupport RTL page direction in WebAdmin for Hebrew (#650)
Badlop [Wed, 15 Jul 2015 17:01:32 +0000 (19:01 +0200)]
Support RTL page direction in WebAdmin for Hebrew (#650)

9 years agoSet LTR direction to Raw links (#650)
Badlop [Wed, 15 Jul 2015 16:51:17 +0000 (18:51 +0200)]
Set LTR direction to Raw links (#650)

9 years agoAdd links in WebAdmin to ejabberd and ProcessOne (#661)
Badlop [Wed, 15 Jul 2015 11:09:58 +0000 (13:09 +0200)]
Add links in WebAdmin to ejabberd and ProcessOne (#661)

9 years agoSupport more mod_muc_admin translation strings (#659)
Badlop [Wed, 15 Jul 2015 09:54:35 +0000 (11:54 +0200)]
Support more mod_muc_admin translation strings (#659)