Evgeniy Khramtsov
|
54acf9bde4
|
Do not send <success/> twice when SCRAM-SHA-1 is used.
This is a merge bug actually
|
2011-09-15 19:24:41 +10:00 |
|
Evgeniy Khramtsov
|
2494e39c9e
|
Fix dialyzer warnings
|
2011-09-15 16:59:45 +10:00 |
|
Evgeniy Khramtsov
|
8f27a697c0
|
Only use hash route-balancing when MUC is broadcasted
|
2011-09-15 08:52:22 +10:00 |
|
Badlop
|
07fdd089a0
|
No need to explicitly skip old useless tables, simply fix keep_tables
|
2011-09-14 12:15:53 +02:00 |
|
Evgeniy Khramtsov
|
c9a712a16a
|
Implement MUC rooms load distribution (TECH-1351).
Configuration example:
{domain_balancing, "conference.domain.com", broadcast}.
NOTE: both ejabberd_router and mod_muc use the option.
|
2011-09-14 17:43:07 +10:00 |
|
Evgeniy Khramtsov
|
d6e81ac06b
|
Add new domain_balancing criteria: broadcast
|
2011-09-14 17:40:06 +10:00 |
|
Evgeniy Khramtsov
|
228a587fc5
|
Fix previous commit
|
2011-09-09 12:40:07 +10:00 |
|
Evgeniy Khramtsov
|
e432ff58f9
|
Avoid crash when performing admin action
|
2011-09-09 12:34:06 +10:00 |
|
Badlop
|
b8969f68e0
|
Fixed support for multi-resource occupants (EJAB-305)
|
2011-09-08 16:10:38 +02:00 |
|
Badlop
|
dbb2d1c229
|
Fix room config change logging, due to allow_private_messages_from_visitors
|
2011-09-08 12:34:25 +02:00 |
|
Badlop
|
609b7ed5c5
|
Support to import XML files without password-format attribute
|
2011-09-08 11:41:45 +02:00 |
|
Badlop
|
3eca0259f7
|
Clarification about system user of ejabberd.init
|
2011-09-06 13:39:43 +02:00 |
|
Badlop
|
20f3fc96c3
|
Fix SCRAM to support attributes which value has only one character
|
2011-09-05 23:21:38 +02:00 |
|
Badlop
|
76a174a007
|
Fix typo in the Guide about user_regexp
|
2011-09-05 19:24:05 +02:00 |
|
Evgeniy Khramtsov
|
0fde148a9f
|
Fix dialyzer warnings
|
2011-09-05 22:00:50 +10:00 |
|
Evgeniy Khramtsov
|
6b0eb1f09d
|
Reorganize the code to shut up the dialyzer
|
2011-09-05 21:27:31 +10:00 |
|
Evgeniy Khramtsov
|
f3c90ee266
|
Get rid of useless check
|
2011-09-05 21:06:18 +10:00 |
|
Evgeniy Khramtsov
|
2482c9c5ed
|
Merge set_affiliation/3 and set_affiliation_and_reason/4 into set_affiliation/4
|
2011-09-05 20:53:01 +10:00 |
|
Badlop
|
da555fb908
|
Fix SCRAM auth of uppercase passwords (EJAB-1196)
|
2011-09-05 12:50:24 +02:00 |
|
Evgeniy Khramtsov
|
7ae7d6315f
|
Remove useless clauses
|
2011-09-05 18:07:50 +10:00 |
|
Evgeniy Khramtsov
|
eccb499346
|
Add some magic in order to shut up the dialyzer (because I do not want to replace the macro with a function)
|
2011-09-05 17:33:51 +10:00 |
|
Evgeniy Khramtsov
|
0c1796ea40
|
Fix potential case-clause crash
|
2011-09-05 17:27:15 +10:00 |
|
Evgeniy Khramtsov
|
826fab9999
|
Remove useless case clause
|
2011-09-05 17:12:45 +10:00 |
|
Evgeniy Khramtsov
|
3b95108a3a
|
Replace VVALUEL macro with function in order to shut up the dialyzer
|
2011-09-05 17:09:36 +10:00 |
|
Evgeniy Khramtsov
|
ab2a298ebf
|
Merge branch '2.1.x' of git+ssh://gitorious.process-one.net/ejabberd/mainline into 2.1.x
|
2011-09-05 16:53:10 +10:00 |
|
Evgeniy Khramtsov
|
8b5fa88b6f
|
Export do_client_version/3 in order to shut up the dialyzer
|
2011-09-05 16:52:36 +10:00 |
|
Evgeniy Khramtsov
|
de712e5ccb
|
Remove useless case clauses
|
2011-09-05 16:48:04 +10:00 |
|
Evgeniy Khramtsov
|
ffdf5cb206
|
Remove useless case clause
|
2011-09-05 16:47:18 +10:00 |
|
Evgeniy Khramtsov
|
f1a91108ef
|
Correct some function clauses and value types
|
2011-09-05 16:31:58 +10:00 |
|
Evgeniy Khramtsov
|
ffe063a0e9
|
Get rid of useless code
|
2011-09-05 15:59:30 +10:00 |
|
Evgeniy Khramtsov
|
d74f02e367
|
ejabberd_auth:remove_user/2 always returns ok
|
2011-09-05 15:39:55 +10:00 |
|
Evgeniy Khramtsov
|
0da2107974
|
Fix some case clauses
|
2011-09-05 15:35:46 +10:00 |
|
Evgeniy Khramtsov
|
1994c8a174
|
Change argument of open_port/2 to string in order to shut up the dialyzer
|
2011-09-05 15:28:14 +10:00 |
|
Evgeniy Khramtsov
|
2434be4803
|
Get rid of useless function clause
|
2011-09-05 15:13:54 +10:00 |
|
Evgeniy Khramtsov
|
b0b371d23a
|
Get rid of useless function clause
|
2011-09-05 15:06:43 +10:00 |
|
Badlop
|
d6fcee4faa
|
Replace calls of OTP's Binary, since they would require R14
|
2011-09-04 14:56:56 +02:00 |
|
Badlop
|
41d028d101
|
First check occupant existence, later check the message
|
2011-09-04 13:28:32 +02:00 |
|
Christophe Romain
|
75fc431fb8
|
enable pubsub#deliver_notification checking (thanks to Karim Gemayel)(EJAB-1453)
|
2011-08-31 16:11:01 +02:00 |
|
Badlop
|
917d1be994
|
Explicitly skip useless ejabberd 2.0* mnesia tables when restoring backup
Reference:
http://www.ejabberd.im/node/4867
|
2011-08-29 12:36:49 +02:00 |
|
Christophe Romain
|
900b013658
|
typo fix (thanks to Artem Sh)(EJAB-1424)
|
2011-08-25 17:22:48 +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
|
84486dcb2c
|
Support multiple sessions per nick in muc_online_users, relevant for max_user_conferences (EJAB-305)
|
2011-08-23 21:53:41 +02:00 |
|
Badlop
|
9a190f3bc4
|
Send private messages to all the sessions with same nick (EJAB-305)
|
2011-08-23 21:53:30 +02:00 |
|
Badlop
|
c76bbdf16f
|
Don't send unavailable presence when leaving occupant has other nicks in the room (EJAB-305)
|
2011-08-23 21:53:19 +02:00 |
|
Badlop
|
24c5063b99
|
Allow multiple entry with same nick to MUC rooms (thanks to Magnus Henoch)(EJAB-305)
|
2011-08-23 21:52:20 +02:00 |
|
Pablo Polvorin
|
bed5e80ef9
|
Merge commit '78f50c5' into 2.2.x
|
2011-08-17 15:23:16 -03: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
|
3edea6c806
|
Fix bug in scram is_alpha
|
2011-08-17 19:33:58 +02:00 |
|
Christophe Romain
|
9ccdb5d78b
|
fix set_configure with odbc backend (thanks to Karim Gemayel)
|
2011-08-17 16:18:32 +02:00 |
|
Badlop
|
abebabc487
|
Fix ODBC account counting (thanks to Artem Sh)(EJAB-1491)
|
2011-08-16 19:33:22 +02:00 |
|