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 |
|
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 |
|
Badlop
|
c3c23a04f6
|
Requirement of OpenSSL increased from 0.9.6 to 0.9.8
|
2010-07-01 17:01:13 +02:00 |
|
Badlop
|
baeb3d076e
|
Document the optional --enable-nif
|
2010-07-01 16:57:47 +02:00 |
|
Badlop
|
1b7948f50a
|
OpenSSL is required, not optional
|
2010-06-25 16:56:44 +02:00 |
|
Badlop
|
7d8f8a7e99
|
Explain that 2 LDAP connections are established per vhost
|
2010-06-10 13:58:55 +02:00 |
|
Badlop
|
077626c40a
|
Clarify in the Guide that mssql configuration is similar to odbc
|
2010-06-02 17:10:48 +02:00 |
|
Badlop
|
361400691d
|
Recommend Erlang/OTP R12B-5 and R13B04
|
2010-06-01 15:45:00 +02:00 |
|
Badlop
|
9476d8a2c3
|
Optionally cache extauth users in mnesia (EJAB-641)
|
2010-05-10 16:42:54 +02:00 |
|
Badlop
|
39119192a1
|
New option pam_userinfotype to provide username or JID (EJAB-652)
|
2010-05-10 15:14:49 +02:00 |
|
Evgeniy Khramtsov
|
f58d03c12e
|
new option ldap_tls_verify is added (EJAB-1229)
|
2010-05-10 19:37:37 +10:00 |
|
Badlop
|
650966ce2c
|
Minor fixes in listeners options list
|
2010-04-28 20:06:27 +02:00 |
|
Badlop
|
705c5b4c1c
|
New Access rule webadmin_view for read-only (thanks to Oleg Palij)(EJAB-213)
|
2010-04-27 23:27:44 +02:00 |
|
Badlop
|
1c00a9713d
|
Automatic vcard avatar addition in presence (thanks to Igor Goryachev)(EJAB-208)
|
2010-04-27 12:33:56 +02:00 |
|
Evgeniy Khramtsov
|
4669ae0a81
|
added notes about LDAP password change
|
2010-04-19 23:05:48 +10:00 |
|
Badlop
|
20c2bc54cd
|
Document mod_sic (EJAB-1205)
|
2010-03-08 13:58:22 +01:00 |
|
Evgeniy Khramtsov
|
606860e1cc
|
ldap_dn_filter option is documented; now fetching only needed attributes in LDAP search requests (EJAB-1204)
|
2010-03-08 16:44:14 +09:00 |
|
Badlop
|
41c455fabb
|
Add quotes in documentation of some erl arguments (thanks to Vincent Courcelle)(EJAB-1191)
|
2010-02-25 00:04:48 +01:00 |
|
ekhramtsov
|
e6c23e0413
|
improved explanation of "max_fsm_queue" option; included this option in ejabberd.cfg.example (EJAB-1185)
|
2010-02-18 15:48:11 +09:00 |
|
ekhramtsov
|
35e00ebcf6
|
option "access_from" is now documented (EJAB-1187)
|
2010-02-18 14:57:08 +09:00 |
|
ekhramtsov
|
1a96944929
|
new option "hostname" is added (thanks to Stefan Hepp) (EJAB-838)
|
2010-02-17 23:17:33 +09:00 |
|
Badlop
|
8bd37462cb
|
Remove unnecessary section about Snow Leopard with Erlang R13B
|
2010-02-11 13:20:06 +01:00 |
|
Badlop
|
78f1fe9ba5
|
Replace mention of ejabberd SVN with Git.
|
2010-02-11 13:14:55 +01:00 |
|
Evgeniy Khramtsov
|
4c8beae585
|
ejabberd_c2s option "max_fsm_queue" is now documented
SVN Revision: 2941
|
2010-01-28 13:56:38 +00:00 |
|
Mickaël Rémond
|
ce18cfb41b
|
Fix typo in doc
SVN Revision: 2928
|
2010-01-26 13:16:51 +00:00 |
|
Badlop
|
8068fdf4e3
|
Fix some moved URLs in the Guide
SVN Revision: 2908
|
2010-01-16 14:34:35 +00:00 |
|
Badlop
|
b6aa6d6f09
|
Document the option route_subdomains in the Guide (EJAB-1164)
SVN Revision: 2907
|
2010-01-16 14:34:31 +00:00 |
|
Badlop
|
855d427182
|
Fix explanation of access_max_user_messages.
SVN Revision: 2895
|
2010-01-12 23:57:44 +00:00 |
|
Badlop
|
7b76fdcde7
|
Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159)
SVN Revision: 2891
|
2010-01-12 16:11:32 +00:00 |
|
Badlop
|
6179daaf99
|
For XEP-0227 support, get exmpp 0.9.2; maybe 0.9.1 works too.
SVN Revision: 2889
|
2010-01-12 15:52:46 +00:00 |
|
Badlop
|
0bf9832187
|
An AccessCommand with Access 'all', don't require auth to execute it.
SVN Revision: 2865
|
2010-01-09 00:39:33 +00:00 |
|
Badlop
|
9aa9c34a57
|
Better use install_fallback when importing a Mnesia backup file.
SVN Revision: 2829
|
2009-12-28 12:43:44 +00:00 |
|
Badlop
|
71142e336d
|
Add explanation about global Access precendence over vhost Access (EJAB-803)
SVN Revision: 2824
|
2009-12-23 16:08:34 +00:00 |
|
Badlop
|
4cdf7fba4f
|
Clarify that 'tls' option is still useful in ejabberd_http for HTTPS.
SVN Revision: 2819
|
2009-12-23 09:04:39 +00:00 |
|
Badlop
|
341e47c2a4
|
Remove the old note about LDAP lack of encryption.
SVN Revision: 2817
|
2009-12-21 16:10:51 +00:00 |
|
Badlop
|
88b6849e69
|
Fix erl -setcookie argument in cluster setup (thanks to Jan Koum)
SVN Revision: 2795
|
2009-12-09 10:09:19 +00:00 |
|
Badlop
|
5a006b977d
|
Small relax the limitation in the mod_pubsub_odbc host option.
SVN Revision: 2781
|
2009-12-04 16:08:31 +00:00 |
|
Badlop
|
3658da3ae8
|
Explain limitation in the mod_pubsub_odbc host option.
SVN Revision: 2777
|
2009-12-03 22:53:56 +00:00 |
|
Badlop
|
ea4f379bd5
|
Fix explanation of option content_types. Reorder options.
SVN Revision: 2755
|
2009-11-23 19:11:37 +00:00 |
|
Badlop
|
7fd3d67ff3
|
Change captcha.sh to not depend on bash (thanks to Konstantin Khomoutov)(EJAB-1105)
SVN Revision: 2749
|
2009-11-23 12:43:15 +00:00 |
|
Badlop
|
1716b090f9
|
Option to define custom HTTP headers in mod_http_fileserver (EJAB-612)
SVN Revision: 2747
|
2009-11-23 12:00:46 +00:00 |
|
Badlop
|
e5e777694d
|
Explain that the example captcha.sh requires Bash because uses RANDOM feature.
SVN Revision: 2745
|
2009-11-17 15:49:05 +00:00 |
|
Badlop
|
26c572b7e7
|
The default value of option ldap_filter is: undefined.
SVN Revision: 2741
|
2009-11-13 20:16:41 +00:00 |
|
Badlop
|
24323e8b3b
|
Extend explanation of ldap_encrypt tls (thanks to Konstantin Khomoutov)
SVN Revision: 2723
|
2009-11-04 20:12:54 +00:00 |
|
Badlop
|
f2a37597cf
|
In default config, only local accounts can create rooms and pubsub nodes.
SVN Revision: 2683
|
2009-10-19 17:02:37 +00:00 |
|
Badlop
|
66cd86e726
|
Support ejabberd_listener option 'backlog' to increase TCP backlog (thanks to Janusz Dziemidowicz)(EJAB-1063)
SVN Revision: 2678
|
2009-10-19 13:23:46 +00:00 |
|
Badlop
|
47d86f5ad1
|
Fix word Sensible with Sensitive (thanks to Marcin Owsiany)(EJAB-1071)
SVN Revision: 2675
|
2009-10-19 10:48:55 +00:00 |
|
Badlop
|
4039f4a14f
|
Document new option max_fsm_queue.
SVN Revision: 2648
|
2009-10-08 14:29:42 +00:00 |
|
Mickaël Rémond
|
e780126c9e
|
Describe how to compile ejabberd on Mac OS X Snow Leopard with Erlang R13B-2
SVN Revision: 2636
|
2009-09-27 14:30:01 +00:00 |
|
Christophe Romain
|
330d6f7b6e
|
rename pep_sendlast_offline option to ignore_pep_from_offline (EJAB-1047)
SVN Revision: 2621
|
2009-09-23 21:54:58 +00:00 |
|
Christophe Romain
|
8107b2b7dc
|
fix EJAB-819 thanks to badlop
SVN Revision: 2615
|
2009-09-23 15:56:06 +00:00 |
|
Badlop
|
3c3cd099de
|
Replace several mentions of Jabber to XMPP (thanks to Nicolas Vérité)
SVN Revision: 2613
|
2009-09-23 15:28:53 +00:00 |
|
Badlop
|
d6f63ceec5
|
Document more ejabberd commands in the Guide (EJAB-1041)
SVN Revision: 2608
|
2009-09-21 10:03:37 +00:00 |
|
Badlop
|
fd57ec5872
|
Support zlib compression after STARTTLS (thanks to Aleksey Shchepin)(EJAB-499)
SVN Revision: 2571
|
2009-08-31 16:29:25 +00:00 |
|
Badlop
|
19dead97a3
|
Rename erlang log file sasl.log to erlang.log (EJAB-783)
SVN Revision: 2567
|
2009-08-31 08:41:56 +00:00 |
|
Badlop
|
1b81a2e3d6
|
Write PID file, path is configurable in ejabberdctl.cfg (EJAB-1023)
SVN Revision: 2526
|
2009-08-24 21:21:04 +00:00 |
|
Badlop
|
342ea2753c
|
Document that the admin can install ejabberd.init script (EJAB-755)
SVN Revision: 2522
|
2009-08-24 19:44:21 +00:00 |
|
Badlop
|
4be5c0c90c
|
Show example config to disable account create/delete, and allow password change.
SVN Revision: 2512
|
2009-08-20 21:43:55 +00:00 |
|
Badlop
|
ea06dc92bc
|
Explain how client can specify Pubsub plugin when creating node (thanks to Christophe Romain)
SVN Revision: 2504
|
2009-08-19 16:34:13 +00:00 |
|
Badlop
|
df30831421
|
Update Pubsub's nodetree documentation (thanks to Christophe Romain)
SVN Revision: 2503
|
2009-08-19 15:44:29 +00:00 |
|
Christophe Romain
|
fd16591a2a
|
added mod_pubsub_odbc documentation
SVN Revision: 2498
|
2009-08-18 10:14:49 +00:00 |
|
Badlop
|
695ff58c55
|
Describe the options syntax, not only the name (EJAB-998)
SVN Revision: 2472
|
2009-08-12 14:15:59 +00:00 |
|
Badlop
|
208ec6c076
|
Update URLs of IETF and XMPP protocol documents
SVN Revision: 2455
|
2009-08-11 11:41:15 +00:00 |
|
Badlop
|
3eaf796cca
|
More documentation for STUN server.
* Add stun listener to example config file, disabled.
* Improve enumeration of listeners options
* Mention STUN in release notes
* Mention new STUN listener in release notes
* Mention new network protocol syntax in release notes
SVN Revision: 2454
|
2009-08-11 11:22:57 +00:00 |
|
Evgeniy Khramtsov
|
0c2222745f
|
STUN support is now documented
SVN Revision: 2453
|
2009-08-11 10:13:03 +00:00 |
|
Badlop
|
6b6cb345ba
|
To use import/export XEP-0227 feature, exmpp 0.9.1 or higher is required.
SVN Revision: 2441
|
2009-08-07 10:22:11 +00:00 |
|
Badlop
|
54ff94e3e3
|
ejabberdctl commands use _ instead of -. For backwards compatibility - is still supported.
SVN Revision: 2440
|
2009-08-07 10:22:06 +00:00 |
|
Badlop
|
f9a8b9ff31
|
Add support for XEP-227 import/export, requires exmpp to use it (EJAB-993)
SVN Revision: 2439
|
2009-08-07 09:52:45 +00:00 |
|
Badlop
|
0ad45b1a93
|
Document options for Roster Versioning (EJAB-964)
SVN Revision: 2430
|
2009-08-06 21:06:20 +00:00 |
|
Badlop
|
720fd7605d
|
Document the new option s2s_dns_options, expressed in seconds (EJAB-994)
SVN Revision: 2417
|
2009-08-03 15:03:50 +00:00 |
|
Badlop
|
ea96fe3fd1
|
Document mod_ping in the ejabberd Guide (EJAB-974)(EJAB-173)
SVN Revision: 2403
|
2009-07-30 11:45:54 +00:00 |
|
Badlop
|
5346a7df02
|
Allow content types to be configured in ejabberd.cfg (EJAB-975)(thanks to Brian Cully)
SVN Revision: 2376
|
2009-07-21 17:31:09 +00:00 |
|
Badlop
|
9df5639974
|
Support XEP-0157: Contact Addresses for XMPP Services (EJAB-235)
SVN Revision: 2368
|
2009-07-17 20:45:44 +00:00 |
|
Badlop
|
a7eb5a77eb
|
Add -hidden flag when calling Debug or Ctl
SVN Revision: 2354
|
2009-07-06 14:08:57 +00:00 |
|
Badlop
|
49688feaf2
|
Add XEP82 Date Time, update XEP202 Entity Time and XEP203 Delayed Delivery (EJAB-234)
SVN Revision: 2345
|
2009-06-30 16:51:25 +00:00 |
|
Badlop
|
edb5211f5f
|
Improve explanation about SSL for port 5223 and its option 'tls'.
SVN Revision: 2339
|
2009-06-25 18:02:23 +00:00 |
|
Badlop
|
2159829168
|
Add note about PAM configuration for pam_winbind (thanks to Jon Bendtsen)
SVN Revision: 2337
|
2009-06-25 17:07:15 +00:00 |
|
Badlop
|
2594c7d687
|
Add permanent section about HTTP Bind module to the Guide. Example config.
SVN Revision: 2260
|
2009-06-16 17:48:38 +00:00 |
|
Badlop
|
c34999cc96
|
Add permanent section about mod_http_fileserver to the Guide. Example config.
SVN Revision: 2182
|
2009-06-16 13:46:03 +00:00 |
|