Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-10-03 14:45:16 +02:00
Code Releases Activity
3,010 Commits 7 Branches 108 Tags 65 MiB
cfe396e155
Commit Graph

85 Commits

Author SHA1 Message Date
Christophe Romain
011535f0de binary refactoring 2012-09-11 15:45:59 +02:00
Evgeniy Khramtsov
75d3152a0f Merge branch '2.1.x' into 2.2.x 
Conflicts:
	src/mod_muc/mod_muc.erl
	src/mod_muc/mod_muc_room.erl
	src/mod_offline.erl
	src/mod_offline_odbc.erl
	src/mod_shared_roster.erl
	src/web/ejabberd_http_bind.erl
 2012-05-04 14:19:52 +10:00
Evgeniy Khramtsov
db8bd0126b Remove CRLFs introduced in the previous merge 2012-05-03 18:34:53 +10:00
Evgeniy Khramtsov
437f68a9f3 Merge SQL and Mnesia code into one module (EJAB-1560) 2012-04-27 19:52:05 +10:00
Christophe Romain
7f1e9d3972 merge from 2.1.11 and resolve conflicts 2012-04-27 11:37:11 +02:00
Evgeniy Khramtsov
6ec5c7c4d8 Use proper module name 2012-03-31 22:56:51 +10:00
Evgeniy Khramtsov
6b3875814c ODBC support for mod_muc 2012-03-31 21:41:54 +10:00
Christophe Romain
7d7c739cb3 Merge remote-tracking branch 'mainline/2.1.x' into 2.2.x 2012-02-23 16:59:22 +01:00
Alexey Shchepin
b1e2538488 Update copyright dates 2012-02-23 17:52:34 +02:00
Pablo Polvorin
31f6a9e66e Add command to persist recent MUC messages (EJABS-1785) 
Example:
$ejabberdctl persist_recent_messages
Host 'localhost' , 4 messages persisted in 12 rooms
 2011-11-10 12:54:11 -03:00
Pablo Polvorin
a04131c6d7 Bugfix: room history and NO_TRANSIENT_SUPERVISORS option 
Fix bug that prevent ejabberd to Save room history to DB
when using the NO_TRANSIENT_SUPERVISORS compiler option.
 2011-10-14 11:30:34 +02:00
Pablo Polvorin
1babae067d Persist muc history on DB on server shutdown (EJABS-1733). 
Ejabberd can be configured to store recent history of MUCs
to DB before shutdown. On restart, those messages are
retrieved from storage.

To enable it, set {persist_history, true} in mod_muc configuration,
ej:
  {mod_muc,      [
                  %%{host, "conference.@HOST@"},
                  {access, muc},
                  {access_create, muc_create},
                  {access_persistent, muc_create},
                  {access_admin, muc_admin},
                  {persist_history, true}
                 ]},

Messages are only stored on server shutdown, not on the fly.

$ejabberdctl stop
or
init:stop()
inside a debug console works.

Note: Only rooms configured as "persistent" will save messages
      (as other rooms doesn't survive server restart anyway).

Limitations: There is no option to store messages on mnesia, you *must*
     use a ODBC database.  Only tested with mysql.

Check odbc/mysql.sql  for the definition of the table "room_history",
the one needed for this.
 2011-09-24 18:39:03 -03:00
Pablo Polvorin
3ae4797848 Command to moderate short term muc history (part of EJABS-1733) 
ejabberdctl moderate_room_history test@conference.domain.com nick

removes from short term storage all messages on
room test@conference.domain.com from nick "nick", so new user
joining the room don't get these ones.

Return the number of messages removed.
 2011-09-19 15:43:20 -03:00
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
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
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
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
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
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
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
Evgeniy Khramtsov
e569087d83 now using mnesia:async_dirty when cleaning table from failed node 2010-02-19 16:38:18 +09: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
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
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
Badlop
1262b0e353 Fix error when nick registration stanza doesn't contain Value. 
SVN Revision: 2394
 2009-07-27 09:36:49 +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
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
Badlop
2bd54854ec * src/mod_muc/mod_muc.erl: Export function to create MUC 
room (thanks to Eric Cestari) (EJAB-729)

SVN Revision: 1878
 2009-02-16 15:24:40 +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
35b1e2885e * src/jlib.erl: Implementation of XEP-0059 Result Set 
Management (thanks to Eric Cestari)(EJAB-807)
* src/jlib.hrl: Likewise
* src/mod_muc/mod_muc.erl: Likewise

SVN Revision: 1750
 2008-12-23 13:04:42 +00:00
Badlop
340562e452 * src/mod_irc/mod_irc.erl: Announce disco#info (thanks to Spike) 
* src/mod_muc/mod_muc.erl: Announce disco#info disco#items
* src/mod_proxy65/mod_proxy65_service.erl: No announce disco#items
* src/mod_pubsub/mod_pubsub.erl: Announce disco#info disco#items
* src/mod_vcard.erl: Announce disco#info

SVN Revision: 1686
 2008-11-26 16:04:27 +00:00
Badlop
c3bda4aaee * doc/guide.tex: Update Process-one name to ProcessOne (EJAB-708) 
* doc/guide.html: Likewise
* doc/api/overview.edoc: Likewise
* src/*/*.erl: Likewise
* src/*/*.hrl: Likewise
* src/*/*.c: Likewise
* src/odbc/*.sql: Likewise

SVN Revision: 1499
 2008-07-31 11:18:49 +00:00
Badlop
22a5bce9de * src/ejabberd_app.erl (prep_stop): Stop modules when stopping 
ejabberd (EJAB-536)
* src/mod_caps.erl (stop): Probably not needed to stop supervisor
child (EJAB-536)
* src/mod_muc/mod_muc.erl (room_destroyed): Catch message
sending (EJAB-536)
* src/mod_muc/mod_muc_room.erl (init): Ensure rooms are called
when the process dies due to a linked die (EJAB-536)

SVN Revision: 1212
 2008-02-28 00:30:23 +00:00
Badlop
2d2fcc8210 * doc/guide.tex: Updated copyright dates to 2008 
* src/*: Likewise

SVN Revision: 1153
 2008-01-15 17:02:57 +00:00
Mickaël Rémond
22f928122f * Applied copyright patch 3. 
SVN Revision: 1113
 2007-12-24 13:57:53 +00:00
Badlop
090fceebc2 * src/mod_irc/mod_irc.erl: No need to translate copyright notice 
* src/mod_muc/mod_muc.erl: Likewise
* src/mod_proxy65/mod_proxy65_service.erl: Likewise
* src/mod_pubsub/mod_pubsub.erl: Likewise
* src/mod_vcard.erl: Likewise
* src/mod_vcard_ldap.erl: Likewise
* src/mod_vcard_odbc.erl: Likewise
* src/msgs/*.msg: Likewise

* contrib/extract_translations/prepare-translation.sh: Bugfix

SVN Revision: 1071
 2007-12-15 12:02:00 +00:00
Badlop
fc8c92a233 * src/mod_muc/mod_muc.erl: Catch creation of table 
muc_online_users: it may be already created by other mod_muc
instance

SVN Revision: 1036
 2007-12-06 15:40:21 +00:00
Mickaël Rémond
abdbf55c87 * Temporary commit. 
SVN Revision: 1015
 2007-12-03 10:47:42 +00:00
Badlop
0996e569a6 * doc/guide.tex: Update URI of ejabberd official home page, URI 
of ejabberd.jabber.ru, and copyright dates (EJAB-366)
* doc/introduction.tex: 
* src/ejabberd.hrl: 
* src/ejabberd_admin.erl: 
* src/mod_irc/mod_irc.erl: 
* src/mod_irc/mod_irc_connection.erl: 
* src/mod_muc/mod_muc.erl: 
* src/mod_muc/mod_muc_log.erl: 
* src/mod_proxy65/mod_proxy65_service.erl: 
* src/mod_pubsub/mod_pubsub.erl: 
* src/mod_vcard.erl: 
* src/mod_vcard_ldap.erl: 
* src/mod_vcard_odbc.erl: 
* src/msgs/*.msg: 
* src/web/ejabberd_web_admin.erl:

SVN Revision: 997
 2007-11-27 23:35:26 +00:00
Alexey Shchepin
722563ed94 * src/mod_muc/mod_muc_room.erl: Added user_message_shaper and 
room_shaper options
* src/mod_muc/mod_muc.erl: Likewise

SVN Revision: 906
 2007-09-01 21:05:04 +00:00
Alexey Shchepin
5dfa6edda3 * src/gen_mod.erl: Substitute @HOST@ with hostname in the 'host' 
option (thanks to Badlop)
* src/mod_vcard.erl: Likewise
* src/mod_vcard_ldap.erl: Likewise
* src/mod_vcard_odbc.erl: Likewise
* src/mod_muc/mod_muc.erl: Likewise
* src/mod_irc/mod_irc.erl: Likewise
* src/mod_echo.erl: Likewise
* src/mod_pubsub/mod_pubsub.erl: Likewise
* src/mod_proxy65/mod_proxy65_service.erl: Likewise

SVN Revision: 888
 2007-08-25 17:24:00 +00:00
Alexey Shchepin
7c24a9a400 * src/mod_muc/mod_muc.erl: Added default_room_options option 
(thanks to Etan Reisner and Badlop)
* src/mod_muc/mod_muc_room.erl: Likewise
* doc/guide.tex: Updated

SVN Revision: 856
 2007-08-02 02:30:25 +00:00