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
149f8e2b45
Merge remote branch 'mainline-2.1.x/2.1.x' into 2.2.x
...
Conflicts:
src/ejabberd.app
2010-12-28 21:17:01 +09:00
Badlop
b9f4daca46
Revert branch name back to 2.1.x
2010-12-20 13:10:33 +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
fbcb9bb154
Recompile the Guide
2010-12-13 11:15:19 +01:00
Badlop
aa59d8f1f0
Add release notes for ejabberd 2.1.6
2010-12-13 11:15:14 +01: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
abfb4a2841
Recompile the Guide
2010-11-05 18:21:20 +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
Badlop
eca7588abf
Recompile the guide.html
2010-10-25 18:57:54 +02: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
Badlop
70fe2948b9
Revert "Remove some compiled files"
...
That removal was only intended for ejabberd master,
as it requires also changes in gitignore, Makefile.in and aclocal.m4
This reverts commit 179a0cf255
.
2010-10-18 23:17:12 +02:00
Andreas Köhler
6ff3fda14b
Document new loglevel configuration form.
2010-10-15 13:15:49 +02:00
Badlop
179a0cf255
Remove some compiled files
2010-09-17 00:14:13 +02:00
Christophe Romain
6c7316cbdd
apply flash hack patch
2010-09-08 16:51:06 +02:00
Christophe Romain
76d4ba66b2
merge 2.1.x to 2.2.x
2010-09-08 15:30:52 +02:00
Eric Cestari
86a59fb469
Implemented rough access_model access control.
2010-09-07 17:23:13 +02:00
Eric Cestari
31da259a75
HTTP Delete item
2010-09-07 16:42:12 +02:00
Eric Cestari
363711a370
New features :
...
- edit an item
- edit node configuration
2010-09-07 16:22:57 +02:00
Eric Cestari
bf98fa0c01
Added node creation with configure form
...
Added deletion
Better behavior in case of a crash (returns 500)
2010-09-07 14:35:40 +02:00
Eric Cestari
cd923838c3
Making progress on the Atom interface.
...
- GET items
- POST items
- GET nodes
HTTP error codes now are the ones XMPP returns.
2010-09-07 11:32:14 +02:00
Badlop
4b5ef8f2ce
Add mod_pubsub_odbc to list of ODBC modules (EJAB-1293)
2010-08-21 18:56:01 +02:00
Badlop
071c0a1afe
Go back to the 2.1.x branch name
2010-08-05 20:39:55 +02:00
Badlop
8ab8da82c4
Update ejabberd version number to 2.1.5
2010-08-02 17:38:36 +02:00
Badlop
4b6a42f539
New 2.1.5 release notes
2010-08-02 17:33:16 +02:00
Badlop
550363cd52
Support parallel extauth script (thanks to Jesse Thompson)(EJAB-1280)
2010-07-30 20:33:03 +02:00
Badlop
ac84267b22
Describe what a user gets when he hits the registration_timeout limit
2010-07-19 12:08:02 +02:00
Badlop
0c95cf7e61
Mention missing modules in the overview table
2010-07-11 12:14:23 +02:00
Badlop
c100cbedd1
Document the mod_muc option captcha_protected
2010-07-02 13:08:33 +02:00