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
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
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
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
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
628571f8cf
merge from ekhramtsov-ejabberd, which is latest 2.1.x with consistent hash
2010-07-13 12:04:30 +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
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
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
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
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
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
Badlop
3e45bdcc2d
Don't allow room config to enable password protection with empty password (EJAB-1011)
...
SVN Revision: 2485
2009-08-15 20:09:05 +00:00
Badlop
5ddfccd45e
If room config violates service policy, return not-acceptable instead of bad-request.
...
SVN Revision: 2484
2009-08-15 20:08:51 +00:00
Badlop
7dfdd5d654
HTML room logs: fix formatting of spaces; log config when disabling logging; display occupants (EJAB-986)
...
SVN Revision: 2378
2009-07-21 18:33:56 +00:00
Badlop
29ea2738cc
Include original timestamp on delayed presences (thanks to Mickael Remond)(EJAB-234)
...
SVN Revision: 2348
2009-06-30 17:50:47 +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
29607291ae
Added support for captcha feature disability (EJAB-895)
...
If the option captcha_cmd is set but captcha can't be created:
* show critical error at server start
* hide captcha option in room configuration form
* don't require occupants to fill captcha
SVN Revision: 2101
2009-05-26 11:53:58 +00:00
Badlop
5c00365550
Add label in captcha form. Improve translatable strings in captcha and muc room.
...
SVN Revision: 2100
2009-05-26 11:03:45 +00:00
Badlop
9b370787c2
* src/mod_muc/mod_muc_room.erl: Fix badarg return (EJAB-899)
...
SVN Revision: 2053
2009-05-03 11:26:18 +00:00
Badlop
b59ecb83e8
* src/mod_muc/mod_muc.erl: Limit number of characters in Room ID,
...
Name and Description (EJAB-899)
* src/mod_muc/mod_muc_room.erl: Likewise
* doc/guide.tex: Likewise
* doc/guide.html: Likewise
SVN Revision: 2034
2009-04-22 12:05:10 +00:00
Badlop
f4c88768da
* src/mod_muc/mod_muc.erl: English fixes (thanks to Glenn Sieb)
...
* src/mod_muc/mod_muc_log.erl: Likewise
* src/mod_muc/mod_muc_room.erl: Likewise
* src/mod_register.erl: Likewise
* src/web/ejabberd_web_admin.erl: Likewise
SVN Revision: 2009
2009-04-08 19:04:13 +00:00
Evgeniy Khramtsov
7e924341e4
* src/ejabberd_captcha.erl: XEP-158 (CAPTCHA Forms).
...
* src/ejabberd_config.erl: likewise.
* src/ejabberd_sup.erl: likewise.
* src/jlib.hrl: likewise.
* src/web/ejabberd_http.erl: likewise.
* src/mod_muc/mod_muc_room.erl: CAPTCHA support.
* src/mod_muc/mod_muc_room.hrl: likewise.
SVN Revision: 1991
2009-03-13 16:01:46 +00:00
Badlop
22d87353be
* src/mod_muc/mod_muc_room.erl: Owner of a password protected room
...
must provide the password, like other participants (EJAB-867)
SVN Revision: 1880
2009-02-16 15:57:02 +00:00
Badlop
b3328c08a6
* doc/guide.tex: Fix some English strings: JID -> Jabber ID;
...
jabberd 1.4 -> jabberd14; commited -> committed
* src/*/*.erl: Likewise
* src/msgs/*.msg: Likewise
* src/msgs/*.po: Likewise
SVN Revision: 1810
2009-01-12 18:41:46 +00:00
Badlop
f09509502e
* doc/guide.tex: Update copyright date 2008 to 2009 (EJAB-842)
...
* doc/guide.html: Likewise
* src/*/*.erl: Likewise
* src/*/*.erl: Remove unneeded blankspaces in license text
SVN Revision: 1804
2009-01-12 14:44:42 +00:00
Badlop
8e32cc11cb
Fix default value of default_room_options (thanks to Aleksey Shchepin)
...
SVN Revision: 1702
2008-12-03 15:06:21 +00:00
