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
Badlop
677d8b1a29
Add support for '@online@' Shared Roster Group (thanks to Martin Langhoff)(EJAB-1391)
...
New version of the @online@ patch originally by Collabora.
Notes:
- the presence push is mediated via the group rather than
per user - this may reduce memory footprint... _if_ ejabberd
has some smart optimisation in that codepath
- it assumes that any group with membership @online@ _displays_
online as well -- this is a simplification and breaks the
decoupling that ejabberd has in this regard.
2011-02-21 22:34:15 +01:00
Badlop
fe40a9c5f6
New DIST_USE_INTERFACE to restrict IP where erlang connections are listened (EJAB-1404)
2011-02-16 23:53:29 +01:00
Badlop
14b39a0ee4
Merge remote branch 'origin/2.1.x' into 2.2.x
...
Conflicts:
src/web/ejabberd_http_bind.erl
2011-01-31 18:57:13 +01:00
Badlop
792512459d
mod_pres_counter prevents subscription flood (thanks to Ahmed Omar and Alexey Shchepin)(EJAB-1388)
2011-01-31 18:52:07 +01:00
Badlop
a09c319357
Update exmpp version to 0.9.6
2011-01-28 12:46:09 +01:00
Badlop
f4c74c147b
Clarify more the expected content of welcome_message mod_register option
2011-01-17 23:46:08 +01:00
Evgeniy Khramtsov
02cfb11a6d
Merge branch '2.1.x' into mergefix
...
Conflicts:
.gitignore
src/ejabberd.app
src/ejabberd_c2s.erl
src/ejabberd_captcha.erl
src/ejabberd_node_groups.erl
src/mod_caps.erl
src/web/ejabberd_http.erl
src/web/ejabberd_http_bind.erl
2010-12-14 23:10:08 +09:00
Badlop
b9bbe19d4c
Option to reject S2S connection if untrusted certificate (EJAB-464)
2010-12-11 02:29:53 +01:00
Badlop
eb884c80d0
Add option to require encryption in S2S connections (EJAB-495)
2010-12-11 02:29:48 +01:00
Badlop
b83dd9f954
Support for X-Forwarded-For HTTP header (EJAB-1356)
2010-12-07 16:47:55 +01:00
Badlop
baf9363bdf
Disapprove the use of R14A and R14B due to the rwlock bug.
2010-11-19 15:33:48 +01:00
Evgeniy Khramtsov
1ab223568d
Document mod_shared_roster_ldap (thanks to Marcin Owsiany)
2010-11-18 16:59:35 +09:00
Badlop
7f3a5066c6
New ip_access option restricts which IPs can register (thanks to Alexey Shchepin)(EJAB-915)
2010-11-05 19:33:52 +01:00
Badlop
f672fd0824
Added mod_register_web: web page for account registration (EJAB-471)
2010-11-05 18:19:52 +01:00
Badlop
dccaff0544
Correct in the Guide the default mod_irc encoding
...
The default option value was last changed in EJAB-302,
but the Guide was not properly updated yet.
2010-11-02 22:47:28 +01:00
Evgeniy Khramtsov
641dc7d695
Add password entropy check (EJAB-1326)
2010-10-24 17:17:30 +10:00
Evgeniy Khramtsov
0a1b0498a6
* Rename option captcha to captcha_protected for consistency.
...
* Document captcha_protected option
2010-10-24 15:45:42 +10:00
Badlop
75298b4c27
Improve example of outoging_s2s_options
2010-10-22 23:14:24 +02:00
Andreas Köhler
6ff3fda14b
Document new loglevel configuration form.
2010-10-15 13:15:49 +02:00
Christophe Romain
6c7316cbdd
apply flash hack patch
2010-09-08 16:51:06 +02:00
Badlop
4b5ef8f2ce
Add mod_pubsub_odbc to list of ODBC modules (EJAB-1293)
2010-08-21 18:56:01 +02:00
