Evgeniy Khramtsov
8f27a697c0
Only use hash route-balancing when MUC is broadcasted
2011-09-15 08:52:22 +10: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
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
Evgeniy Khramtsov
5bef1a8f77
Now it is possible to migrate C2S/BOSH/MUC sessions.
...
Example usage:
$ ejabberdctl stop_migrate 30
This will migrate c2s/bosh/muc processes smoothly within 30 seconds and stop ejabberd.
The commit also resolves EJABS-1661
2011-08-13 19:05:21 +10:00
Badlop
83014fb77b
Include status 110 in presence to new occupant (EJAB-740)
2011-07-16 19:35:59 +02:00
Badlop
1e88c3f180
Room option to ignore private messages from visitors (thanks to Maxim Ignatenko)
2011-07-11 17:34:07 +02: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
Evgeniy Khramtsov
2f16a160c0
Shadow unused variable
2011-04-27 15:07:18 +10:00
Evgeniy Khramtsov
4a2f62062e
New migration procedure
2011-04-27 15:07:10 +10:00
jabber
897b46c31d
Do not decrease MUC admin's role/affiliation
2011-04-18 21:06:05 +10:00
Evgeniy Khramtsov
07cf6f09b8
Implement CAPTCHA limit
2011-04-18 16:06:36 +10:00
Evgeniy Khramtsov
252ee6228b
Fix syntax error
2011-04-18 15:50:24 +10:00
Evgeniy Khramtsov
cf6264f507
CAPTCHA whitelist support
2011-04-18 15:47:06 +10:00
Christophe Romain
33d4126290
merge with latest 2.1.x (pre 2.1.7)
2011-04-11 15:47:04 +02:00
Badlop
449e56ed52
Send jid attribute when occupant is banned (EJAB-1432)
2011-04-07 12:54:39 +02:00
Christophe Romain
f39ccd73c5
Merge remote branch 'mainline/2.1.x' into 2.2.x
2011-02-14 13:54:06 +01:00
Christophe Romain
fd52f2cb7d
update copyright up to 2011
2011-02-14 13:50:55 +01:00
Badlop
650b2802b5
Remove erroneous comment (EJAB-645)
2011-02-03 17:23:09 +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
9b88fd6646
Fix some English strings
2010-11-19 13:44:30 +01:00
Badlop
6eeef62ce4
Provide new, not old, affiliation in kick/ban presence with codes 321 and 301
2010-11-16 00:03:09 +01:00
Evgeniy Khramtsov
0ccff15599
Strip status when needed in presence-unavailable as well
2010-11-15 13:47:31 +09:00
Christophe Romain
23b28ec60f
Merge remote branch 'mainline/2.1.x' into 2.2.x
2010-08-09 10:04:11 +02:00
Badlop
972440c2ca
When user joins non-anonymous room, warn also in presence stanza (EJAB-310)
2010-08-07 20:48:36 +02:00
Christophe Romain
d0b7cd599b
Make chat room destroy and create being sync_dirty to limit mnesia overload. (thanks to Mickael Remond)
2010-07-13 21:48:36 +02:00
Christophe Romain
628571f8cf
merge from ekhramtsov-ejabberd, which is latest 2.1.x with consistent hash
2010-07-13 12:04:30 +02:00
Badlop
e19ac27803
Show some more room options in the log file
2010-07-02 15:19:54 +02:00
Evgeniy Khramtsov
715cc5ea3b
New configure option: --enable-nif
2010-07-01 20:54:01 +10:00
Evgeniy Khramtsov
21d2f4efab
now admins are able to see private rooms in disco (EJAB-1269)
2010-06-23 17:44:35 +10:00
Evgeniy Khramtsov
4646a5dbb8
fixes wrong SQL escaping when --enable-full-xml is set
2010-06-04 13:31:34 +10:00
Badlop
2a99af8cce
Rename some JEP references to XEP
2010-04-28 20:06:27 +02:00
Badlop
2ff291899d
Don't send error stanza as reply to error stanza (EJAB-930)
2010-04-20 20:31:42 +02:00
Badlop
44b282474a
Fix indentation (EJAB-1038)
2010-03-29 20:51:24 +02:00
Badlop
70cfcb1008
Fix crash in number of occupants; other minor changes (EJAB-1038)
2010-03-29 20:51:04 +02:00
Badlop
fa28c8baf6
Refactor code to reduce calls to get_affiliation and get_role (thanks to Steam)(EJAB-1038)
2010-03-29 20:49:52 +02:00
Evgeniy Khramtsov
e569087d83
now using mnesia:async_dirty when cleaning table from failed node
2010-02-19 16:38:18 +09:00
Evgeniy Khramtsov
46c667c567
changed Reason to shutdown when stopping destroyed MUC room
...
SVN Revision: 2952
2010-02-02 11:49:49 +00:00
Badlop
db3f8487fc
Fix bug handling Reason in gen_fsm:terminate
...
SVN Revision: 2950
2010-02-02 11:14:48 +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
8d218dd2b9
Command to stop ejabberd informing users, with grace period, and kindly (EJAB-1112)
...
SVN Revision: 2853
2010-01-03 00:38:00 +00:00
Badlop
d9a1eecdca
Kick occupants with reason when room is stopped due to MUC shutdown (EJAB-1149)
...
SVN Revision: 2848
2009-12-30 01:25:35 +00:00
Badlop
50137aa98d
Add +export_all to EFLAGS if: make debug=true (thanks to Marcin Owsiany)(EJAB-1134)
...
SVN Revision: 2842
2009-12-29 19:10:52 +00:00
Badlop
9bee86178f
Write in room log when a room is created, destroyed, started, stopped (EJAB-1144)
...
SVN Revision: 2836
2009-12-29 14:43:24 +00:00
Badlop
79be929d96
Add support for serving a Unique Room Name (thanks to Pablo Polvorin)(EJAB-1121)
...
SVN Revision: 2802
2009-12-11 12:30:41 +00:00
Badlop
575e07a986
Forward IQ vCard queries of room occupants to bare JID, not full (EJAB-1045)
...
SVN Revision: 2767
2009-12-01 20:00:15 +00:00
Evgeniy Khramtsov
2c735c91d6
check if a room is not persistent before starting a new one with the same name (EJAB-1026)
...
SVN Revision: 2539
2009-08-26 04:14:54 +00:00
