Christophe Romain
f0c745b916
add OSX compatibility note
2012-09-26 09:55:30 +02:00
Badlop
10f10a2fd3
Allow multiple fqdn values in configuration (EJAB-1578)
2012-09-12 19:55:00 +02:00
Badlop
9787416e88
Fix file name of Name Service Switch (thanks to Konstantin Khomoutov)
2012-09-11 19:38:38 +02:00
Badlop
fb39b163df
Explain that 2 LDAP connections are established per vhost
2012-09-11 16:30:22 +02:00
Christophe Romain
011535f0de
binary refactoring
2012-09-11 15:45:59 +02:00
Christophe Romain
7f1e9d3972
merge from 2.1.11 and resolve conflicts
2012-04-27 11:37:11 +02:00
Evgeniy Khramtsov
86435ba9aa
ODBC support for mod_blocking
2012-04-12 14:22:56 +10:00
Evgeniy Khramtsov
41a0eae0bd
ODBC support for mod_shared_roster
2012-04-04 20:37:43 +10:00
Evgeniy Khramtsov
5fab00011e
ODBC support for mod_irc
2012-04-03 20:23:41 +10:00
Evgeniy Khramtsov
ca5f028016
ODBC support for mod_vcard_xupdate
2012-04-02 15:21:54 +10:00
Evgeniy Khramtsov
b43444f674
ODBC support for mod_announce
2012-04-02 14:49:13 +10:00
Evgeniy Khramtsov
585c5afd1a
Add notes about mod_muc_odbc
2012-04-02 10:57:10 +10:00
Badlop
983da9c887
Relax digest-uri handling (thanks to Daniel Willmann)(EJAB-1529)
...
This patch introduces a new config option - fqdn - to set the fully
qualified domain name of the host:
{fqdn, "foo.example.com"}.
This fixes a problem with Pidgin not being able to log in on a server
that used SRV records.
2012-03-16 14:16:17 +01:00
Christophe Romain
7d7c739cb3
Merge remote-tracking branch 'mainline/2.1.x' into 2.2.x
2012-02-23 16:59:22 +01:00
Alexey Shchepin
b1e2538488
Update copyright dates
2012-02-23 17:52:34 +02:00
Badlop
7b9e59d15d
Recommend Erlang/OTP R13B04 and R14B04
2012-02-22 15:42:13 +01:00
Badlop
794d0bbe69
Fix Enlish in the Guide (thanks to Ludovic Bocquet)
2012-02-22 15:40:31 +01:00
Alexey Shchepin
52df4fa024
Merge branch '2.1.x' of git+ssh://git@gitorious.process-one.net/ejabberd/mainline.git into 2.2.x
...
Conflicts:
src/configure
src/ejabberd.app
src/ejabberd_receiver.erl
src/tls/tls_drv.c
src/web/ejabberd_http.erl
2012-02-20 17:29:18 +02:00
Badlop
4900ac31a7
Add thanks to Ludovic Bocquet for past Guide contributions
2012-02-15 18:30:16 +01:00
Badlop
7d623d5eb4
Option default_host for handling HTTP requests with ambiguous Host (EJAB-1261)
2012-02-14 11:35:52 +01:00
Badlop
948318ca19
Fix the documentation about default value of captcha_cmd option
2012-02-01 00:09:51 +01:00
Christophe Romain
e0781d9217
merge from 2.1.10 and resolve conflicts
2011-12-30 11:33:34 +01:00
Badlop
262157c88d
Preliminary support for groupname@vhost in Displayed Groups (EJAB-506)
2011-12-15 17:27:28 +01:00
Badlop
07cfc000ea
Comment section 6.3.1 because it has no content at all
2011-11-15 16:46:00 +01:00
Christophe Romain
adf56dedf3
fix merge conflicts from 2.1.9
2011-09-30 14:28:40 +02:00
Evgeniy Khramtsov
33766a124d
New option support: ldap_deref_aliases (EJAB-639)
2011-09-19 16:58:55 +10:00
Badlop
3eca0259f7
Clarification about system user of ejabberd.init
2011-09-06 13:39:43 +02:00
Badlop
76a174a007
Fix typo in the Guide about user_regexp
2011-09-05 19:24:05 +02:00
Badlop
dd772404c5
Merge branch '2.1.x' into 2.2.x
...
Conflicts:
src/configure
src/ejabberd.app
src/ejabberd_auth_anonymous.erl
src/ejabberd_c2s.erl
src/ejabberd_sm.erl
2011-08-24 18:29:25 +02:00
Badlop
a0f8a2c3a4
New option resource_conflict defines server action (thanks to Lee Boynton)(EJAB-650)
2011-08-17 19:44:39 +02:00
Badlop
1ee6eae684
Fix and improve support for SCRAM auth method (EJAB-1196)
2011-08-16 00:26:49 +02:00
Badlop
1a4722e909
Fix typo in modules overview
2011-07-15 02:53:32 +02:00
Evgeniy Khramtsov
cc0aa707c4
Document ldap_tls_cacertfile and ldap_tls_depth options (EJAB-1299)
2011-07-13 15:57:01 +10:00
Badlop
1e88c3f180
Room option to ignore private messages from visitors (thanks to Maxim Ignatenko)
2011-07-11 17:34:07 +02:00
Badlop
caa84e2731
Fix reference to 'admin' ACL name (thanks to Samuel Wejeus)(EJAB-1476)
2011-07-05 16:33:06 +02:00
Badlop
b9e1bc34da
Clarify in mod_register_web example what host to put in the URL
2011-06-11 16:15:37 +02:00
Badlop
deb5e45bff
Fix some typos in the Guide
2011-05-31 21:12:31 +02:00
Badlop
370093afde
Fix minor English error
2011-05-31 12:27:45 +02:00
Badlop
32d3d1626b
New ERL_EPMD_ADDRESS that works since Erlang/OTP R14B03
2011-05-31 12:26:44 +02:00
Evgeniy Khramtsov
41fad8956b
Merge branch '2.1.x' into 2.2.x
...
Conflicts:
src/ejabberd_c2s.erl
2011-05-30 23:29:41 +10:00
Badlop
bfebcebeb7
Support XEP-0191 Simple Communications Blocking (thanks to Stephan Maka)(EJAB-695)
2011-05-27 11:47:22 +02:00
Evgeniy Khramtsov
dfbf32ecba
Note that ejabberd works with CGP LDAP server
2011-05-07 10:32:52 +10:00
Evgeniy Khramtsov
c98ddeb59f
Merge branch '2.1.x' into 2.2.x
...
Conflicts:
src/ejabberd_captcha.erl
src/expat_erl.c
src/mod_muc/mod_muc_room.erl
2011-05-04 00:04:10 +10:00
Badlop
b807b21a59
Show configuration for HTTPS http_bind
2011-04-28 13:24:18 +02:00
Badlop
4f4c8eb61e
mod_register Access now also controls account unregistrations
2011-04-26 22:55:04 +02:00
Badlop
7d7621c67c
Support more captcha_host value formats (EJAB-1418)
2011-04-11 19:59:26 +02:00
Christophe Romain
33d4126290
merge with latest 2.1.x (pre 2.1.7)
2011-04-11 15:47:04 +02:00
Badlop
dac1f328d7
Clarify {iqdisc, no_queue}
2011-04-07 12:06:31 +02:00
Badlop
a1f20a5bc0
If the port number isn't listener, then specify the protocol (EJAB-1418)
2011-03-03 11:38:00 +01:00
Badlop
e0d14c3b8d
captcha_host must have the port number to get protocol (EJAB-1418)
2011-03-03 00:02:43 +01:00
