Badlop
8782597c1a
* src/mod_muc/mod_muc_log.erl: Linkify also xmpp:..., as it was
...
done previously (thanks to Konstantin Khomoutov)(EJAB-850)
SVN Revision: 2020
2009-04-14 18:25:58 +00:00
Christophe Romain
ab4750ec1e
after check, last commit was useless
...
SVN Revision: 2019
2009-04-14 12:46:55 +00:00
Christophe Romain
b519fdd3cb
back to original caps patch which may be safer
...
SVN Revision: 2018
2009-04-14 10:13:05 +00:00
Christophe Romain
08cbaf8ccf
Better handling of presence hook and caps clean
...
SVN Revision: 2015
2009-04-10 13:21:37 +00:00
Badlop
6b2a838e24
* src/msgs/pl.po: Fix some translations (thanks to Andrzej Smyk)
...
SVN Revision: 2011
2009-04-09 11:18:06 +00:00
Badlop
854b448536
* src/mod_pubsub/mod_pubsub.erl: Announce PubSub features in the
...
server JID only if PEP is enabled (EJAB-905)
SVN Revision: 2010
2009-04-08 19:30:24 +00:00
Badlop
2195e433dc
* src/mod_muc/mod_muc.erl: English fixes (thanks to Glenn Sieb)
...
* src/mod_muc/mod_muc_log.erl: Likewise
* src/mod_muc/mod_muc_room.erl: Likewise
* src/mod_register.erl: Likewise
* src/web/ejabberd_web_admin.erl: Likewise
SVN Revision: 2009
2009-04-08 19:04:13 +00:00
Badlop
d13be09524
* src/mod_pubsub/mod_pubsub.erl: Quickfix compilation errors.
...
SVN Revision: 2008
2009-04-08 18:58:11 +00:00
Badlop
e34d6e3678
* src/mod_irc/mod_irc_connection.erl: Fix compilation warnings.
...
SVN Revision: 2006
2009-04-08 18:52:52 +00:00
Badlop
79247dad41
* doc/release_notes_2.0.5.txt: Added file for new release
...
SVN Revision: 2002
2009-04-01 10:37:18 +00:00
Badlop
61691ac47d
Merge 1998 from trunk.
...
* src/ejabberd_sm.erl: Partially retract SVN r1976
EJAB-300 (EJAB-890). Check default privacy list when account, not
a specific session, receives a presence subscription
stanza (EJAB-300).
* src/ejabberd_c2s.erl: Likewise
SVN Revision: 1999
2009-03-24 18:02:13 +00:00
Christophe Romain
3e756f5d1c
implement roster acces model (EJAB-780)
...
SVN Revision: 1997
2009-03-20 00:08:38 +00:00
Christophe Romain
026c4a2711
Allow more environment variable overrides in ejabberdctl (EJAB-891)
...
SVN Revision: 1996
2009-03-19 21:30:10 +00:00
Badlop
cd3556f195
Fix mistake when calling win32_dns.
...
SVN Revision: 1990
2009-03-11 18:36:27 +00:00
Badlop
d0a6ae7855
* doc/release_notes_2.0.4.txt: Added file for new release
...
SVN Revision: 1987
2009-03-10 16:25:20 +00:00
Badlop
b245d68568
* src/tls/tls_drv.c: Fix encryption problem for ejabberd_http
...
after timeout (thanks to Alexey Shchepin)(EJAB-880)
SVN Revision: 1986
2009-03-10 15:21:36 +00:00
Christophe Romain
2c4effe6ce
typo fix on roster access_model
...
SVN Revision: 1985
2009-03-10 12:09:31 +00:00
Christophe Romain
5ed381fc58
Fix PEP with other domains and s2s (EJAB-825)
...
SVN Revision: 1982
2009-03-10 11:13:46 +00:00
Badlop
4c08e65fab
* src/tls/tls_drv.c: Fix to support OpenSSL older than
...
0.9.8f (EJAB-877)(thanks to Jonathan Schleifer)
* doc/guide.tex: It is again supported OpenSSL older than 0.9.8f
* doc/guide.html: Likewise
SVN Revision: 1979
2009-03-09 19:17:53 +00:00
Badlop
4dde341c9d
Merge 1925 from trunk.
...
* src/mod_proxy65/mod_proxy65_service.erl: if an ip option is not
defined, the module takes an IP address of a local
hostname (thanks to Evgeniy Khramtsov)
SVN Revision: 1978
2009-03-09 14:44:46 +00:00
Badlop
ed3cae6f11
* src/Makefile.in: In SunOS, use different C flags (thanks to
...
Thomas)(EJAB-438)
* src/ejabberd_zlib/Makefile.in: Likewise
* src/mod_irc/Makefile.in: Likewise
* src/stringprep/Makefile.in: Likewise
* src/tls/Makefile.in: Likewise
SVN Revision: 1977
2009-03-07 09:52:26 +00:00
Badlop
56c33e994d
* src/ejabberd_c2s.erl: Enforce privacy rules also for
...
subscription requests (EJAB-300)
* src/ejabberd_sm.erl: Likewise
SVN Revision: 1976
2009-03-07 08:59:26 +00:00
Badlop
d6820f2c2d
* src/mod_privacy.erl: Temporary workaround to inconsistency
...
* src/mod_privacy_odbc.erl: Likewise
SVN Revision: 1975
2009-03-07 08:53:34 +00:00
Badlop
cf4b7b36ee
Merge 1856 from trunk.
...
* src/eldap/eldap.erl: moves waiting for response queries to
pending queue on an LDAP connection failure (thanks to Evgeniy
Khramtsov)
SVN Revision: 1974
2009-03-06 11:50:23 +00:00
Badlop
d23ebd354b
Merge 1855 from trunk.
...
* src/eldap/eldap.erl: implemented queue for pending
queries (thanks to Evgeniy Khramtsov)
SVN Revision: 1973
2009-03-06 11:42:56 +00:00
Badlop
66c60c4e6d
Merge 1851 from trunk.
...
* src/eldap/eldap.erl: Close a connection on tcp_error (thanks to
Evgeniy Khramtsov)
SVN Revision: 1972
2009-03-06 11:39:12 +00:00
Badlop
19b803bb03
* src/ejabberd_app.erl: In a Windows machine, explicitly add the
...
nameservers, as it seems Erlang does not do itself (EJAB-860)
* src/win32_dns.erl: Get name servers from Windows registy (thanks
to Geoff Cant)
SVN Revision: 1968
2009-03-05 20:03:18 +00:00
Badlop
982f61774d
* doc/guide.tex: Require OpenSSL 0.9.8f or higher (EJAB-877)
...
* doc/guide.html: Likewise
SVN Revision: 1967
2009-03-05 19:48:24 +00:00
Badlop
7982492f50
* src/ejabberd_auth.erl: If anonymous auth is enabled, when
...
checking if the account already exists in other auth methods, take
into account if the auth method failed (EJAB-882)
* src/ejabberd_auth_anonymous.erl: Likewise
* src/ejabberd_auth_external.erl: Likewise
* src/ejabberd_auth_internal.erl: Likewise
* src/ejabberd_auth_ldap.erl: Likewise
* src/ejabberd_auth_odbc.erl: Likewise
* src/ejabberd_auth_pam.erl: Likewise
SVN Revision: 1966
2009-03-04 18:34:02 +00:00
Badlop
7af7afc30e
* src/mod_caps.erl: Fix two small compilation errors
...
SVN Revision: 1965
2009-03-04 09:55:20 +00:00
Christophe Romain
ab2dc5877f
Allow node creation without configure item
...
SVN Revision: 1964
2009-03-04 01:14:13 +00:00
Christophe Romain
592c98fd7a
update pubsub version
...
SVN Revision: 1961
2009-03-04 01:04:51 +00:00
Christophe Romain
facf17e689
Add roster subscriptions handling and make PEP events sent to all resources
...
SVN Revision: 1958
2009-03-03 23:26:07 +00:00
Badlop
1db9642e4c
Merge 1916 from trunk.
...
* src/ejabberd_listener.erl: Fix report message of 'undef' error
SVN Revision: 1955
2009-03-03 19:48:20 +00:00
Badlop
4df4527e77
Merge 1907 from trunk.
...
* src/ejabberd_listener.erl: Fix a minor compilation warning and
add EDoc comment
SVN Revision: 1954
2009-03-03 19:46:08 +00:00
Badlop
dbf0bb209d
Merge 1891 from trunk.
...
* src/ejabberd_listener.erl: When stopping a listener, don't stop
the listener supervisor (EJAB-874)
SVN Revision: 1953
2009-03-03 19:43:55 +00:00
Badlop
9a7c6b8be1
Merge 1884 from trunk.
...
* src/ejabberd_listener.erl: More error detections
SVN Revision: 1952
2009-03-03 19:40:55 +00:00
Badlop
36fc43c364
Merge 1883 from trunk.
...
* src/ejabberd_listener.erl: More error detections
SVN Revision: 1951
2009-03-03 19:39:36 +00:00
Badlop
f80758f0de
Merge 1882 from trunk.
...
* src/ejabberd_config.erl: Check certfiles are readable on server
start and listener start (EJAB-753)
* src/ejabberd_listener.erl: Likewise
SVN Revision: 1950
2009-03-03 19:38:13 +00:00
Badlop
25ef60a2c1
Merge 1875 from trunk.
...
* src/ejabberd_listener.erl: Report error at startup if a listener
module isn't available or is not an ejabberd listener (EJAB-868)
SVN Revision: 1949
2009-03-03 19:35:32 +00:00
Badlop
5bfdb71b4c
Merge 1881 from trunk.
...
* src/mod_privacy.erl: Privacy List: deny presence-out all + send
presence to: presence is sent (EJAB-255)
* src/ejabberd_c2s.erl: Likewise
SVN Revision: 1948
2009-03-03 19:32:48 +00:00
Badlop
890b1c4f60
Merge 1834 from trunk.
...
* src/mod_privacy.erl: Only run roster_get_jid_info if privacy
list has subscription or group (thanks to George Hazan)(EJAB-851).
Sort items in privacy list by order before storing (EJAB-848)
* src/mod_privacy.hrl: Likewise
* src/mod_privacy_odbc.erl: Likewise
SVN Revision: 1947
2009-03-03 19:26:24 +00:00
Badlop
4046ecc99e
Merge 1880 from trunk.
...
* src/mod_muc/mod_muc_room.erl: Owner of a password protected room
must provide the password, like other participants (EJAB-867)
SVN Revision: 1946
2009-03-03 19:07:24 +00:00
Badlop
fe297e1dea
Merge 1879 from trunk.
...
* src/mod_muc/mod_muc_log.erl: Prevent XSS in MUC logs by
linkifying only a few known protocols (EJAB-850)
SVN Revision: 1945
2009-03-03 19:03:56 +00:00
Badlop
f0c0b2230a
Merge 1878 from trunk.
...
* src/mod_muc/mod_muc.erl: Export function to create MUC
room (thanks to Eric Cestari) (EJAB-729)
SVN Revision: 1944
2009-03-03 19:01:24 +00:00
Badlop
23ec55975e
Merge 1877 from trunk.
...
* src/mod_roster.erl: When account is deleted, cancel presence
subscription for all roster items (EJAB-790)
* src/mod_roster_odbc.erl: Likewise
SVN Revision: 1943
2009-03-03 18:57:47 +00:00
Badlop
54da31e805
Merge 1874 from trunk.
...
* src/mod_shared_roster.erl: Fix bug: a pending subscription
request, and later the requester added to the roster due to a
shared roster group, that request could neither be accepted or
rejected (thanks to Brian Cully)(EJAB-869)
SVN Revision: 1942
2009-03-03 18:53:28 +00:00
Badlop
b0f29b20db
Merge 1876 from trunk.
...
* src/web/ejabberd_http_poll.erl: Allow configuration of session
timeout, using new global option http_poll_timeout (EJAB-135)
* doc/guide.tex: Document new option
* doc/guide.html: Likewise
SVN Revision: 1941
2009-03-03 18:49:02 +00:00
Badlop
c13ed8c625
Merge 1872 from trunk.
...
* src/ejabberd_system_monitor.erl: Allow parametrizable watchdog
threshold: option watchdog_large_heap or chatting with the
watchdog bot (EJAB-545)
* src/ejabberd_config.erl: Likewise
* doc/guide.tex: Likewise
* doc/guide.html: Likewise
SVN Revision: 1940
2009-03-03 18:45:26 +00:00
Badlop
79463d7f7d
Merge 1873 from trunk.
...
* src/web/ejabberd_web_admin.erl: Show big integers with comma
separators for easy reading
SVN Revision: 1939
2009-03-03 18:29:53 +00:00