Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-24 16:23:40 +01:00
Code Releases Activity
1,324 Commits 7 Branches 109 Tags 66 MiB
f5f3c85112
Commit Graph

132 Commits

Author SHA1 Message Date
Jean-Sébastien Pédron
4eaa8e19c9 Merge from trunk (r1457 to r1563). 
SVN Revision: 1564
 2008-09-16 14:39:57 +00:00
Jean-Sébastien Pédron
07b1210b50 Merge revisions from 1444 to revision 1457 from trunk. 
SVN Revision: 1458
 2008-07-17 15:33:50 +00:00
Jean-Sébastien Pédron
574dbbfd08 Merge revisions from 1434 to revision 1444 from trunk. 
SVN Revision: 1445
 2008-07-15 08:45:05 +00:00
Jean-Sébastien Pédron
332fb55e3a MFC: 
Merge revisions from 1362 to revision 1434 from trunk.

SVN Revision: 1435
 2008-07-11 12:48:27 +00:00
Badlop
cbf63d06a8 * src/mod_muc/mod_muc_room.erl: Allow admins to send messages to 
rooms even if not joined (EJAB-645)
* doc/guide.tex: Likewise
* doc/guide.html: Likewise

SVN Revision: 1356
 2008-06-13 18:55:26 +00:00
Badlop
c892a60da5 * src/mod_muc/mod_muc_room.erl: Allow change_state of a room 
SVN Revision: 1329
 2008-05-16 18:05:03 +00:00
Badlop
da56452fba * src/mod_muc/mod_muc_room.erl: Return Forbidden error message 
when user sends private message in a room that disallows
it (EJAB-595)

SVN Revision: 1323
 2008-05-12 20:35:43 +00:00
Alexey Shchepin
85d3b27d71 * src/mod_muc/mod_muc_room.erl: Fixed room shaper processing 
SVN Revision: 1305
 2008-04-27 19:06:34 +00:00
Badlop
5fd627b85b * doc/api/Makefile: Report the correct ejabberd version. When 
cleaning, remove also erlang.png

* src/mod_muc/mod_muc_room.erl: Update source code to prevent
warning messages from EDoc
* src/mod_pubsub/mod_pubsub.erl: Likewise
* src/mod_pubsub/node_default.erl: Likewise
* src/mod_pubsub/nodetree_default.erl: Likewise
* src/mod_pubsub/nodetree_virtual.erl: Likewise
* src/mod_pubsub/pubsub.hrl: Likewise

SVN Revision: 1265
 2008-04-01 10:11:39 +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
def7b0ff90 * src/mod_muc/mod_muc_room.erl: Allow unmoderated rooms (EJAB-437) 
* src/msgs/*: Recover old translations to several languages from
ejabberd 1.1.4

SVN Revision: 1191
 2008-02-14 11:25:39 +00:00
Badlop
8104eac23a * src/mod_muc/mod_muc_room.erl: Bugfix: local message stanza may 
not have an attribute From (EJAB-515)

SVN Revision: 1180
 2008-02-11 12:15:34 +00:00
Badlop
116966ce44 * src/mod_muc/mod_muc_room.erl: Include the error condition in the 
presence status when kicking a participant due to an error
stanza (EJAB-496)

SVN Revision: 1179
 2008-02-09 10:38:47 +00:00
Badlop
0beb1c8116 * src/mod_muc/mod_muc_room.erl: Support for decline of invitation 
to MUC room (EJAB-515)

SVN Revision: 1175
 2008-02-06 20:30:58 +00:00
Alexey Shchepin
24a7d86577 * src/mod_muc/mod_muc_room.erl: Append "(n/a)" to disco room 
descriptions when a number of occupants is not available

SVN Revision: 1171
 2008-02-03 23:17:39 +00:00
Badlop
45b01994e2 * src/mod_muc/mod_muc_room.erl: MUC kicks a participant if sends a 
private message with type=error (EJAB-496). Updated.

SVN Revision: 1164
 2008-01-29 18:37:45 +00:00
Badlop
cdc1698c8b * src/mod_muc/mod_muc_room.erl: MUC kicks a participant if sends a 
private message with type=error (EJAB-496)

SVN Revision: 1163
 2008-01-29 14:49:08 +00:00
Badlop
f361633f36 * doc/guide.tex: Updated the names of log files. 
* doc/guide.html: Likewise

* src/mod_muc/mod_muc_room.erl: Added log messages for room
destroy

* src/mod_caps.erl: Small beautify of log error messages

SVN Revision: 1155
 2008-01-16 10:08:17 +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
Badlop
7672515e76 * src/mod_muc/mod_muc_room.erl: MUC kicks a participant if sends a 
private message with type=error (EJAB-496)

SVN Revision: 1142
 2008-01-09 16:01:16 +00:00
Badlop
c2e12d716b * src/mod_muc/mod_muc_room.erl: Resend 'continue' elements in muc 
room invitations (EJAB-490)

SVN Revision: 1135
 2008-01-01 17:06:26 +00:00
Mickaël Rémond
22f928122f * Applied copyright patch 3. 
SVN Revision: 1113
 2007-12-24 13:57:53 +00:00
Badlop
afdc9b9527 * src/mod_muc/mod_muc_room.erl: Log room creation and 
destruction. Ensure JID of owners of MUC room are user, not
server (EJAB-435)

SVN Revision: 1104
 2007-12-23 12:28:44 +00:00
Badlop
b07b2fe159 * src/mod_muc/mod_muc_log.erl: Add handling of kicks 321, 322, 332 
SVN Revision: 1080
 2007-12-18 19:19:24 +00:00
Badlop
80b7abd8c8 * src/ejabberd_zlib/Makefile.win32: Compile 
all erl files found in the directory, so it isn't needed to provide
an explicit list of target files
* src/eldap/Makefile.win32: Likewise
* src/mod_irc/Makefile.win32: Likewise
* src/mod_muc/Makefile.win32: Likewise
* src/mod_proxy65/Makefile.win32: Likewise
* src/mod_pubsub/Makefile.win32: Likewise
* src/odbc/Makefile.win32: Likewise
* src/stringprep/Makefile.win32: Likewise
* src/tls/Makefile.win32: Likewise
* src/web/Makefile.win32: Likewise

SVN Revision: 1076
 2007-12-17 22:23:56 +00:00
Badlop
60f8b0772e * src/ejabberd_zlib/Makefile.in: Compile all erl files found in 
the directory, so it isn't needed to provide an explicit list of
target files
* src/eldap/Makefile.in: Likewise
* src/mod_irc/Makefile.in: Likewise
* src/mod_muc/Makefile.in: Likewise
* src/mod_proxy65/Makefile.in: Likewise
* src/mod_pubsub/Makefile.in: Likewise
* src/odbc/Makefile.in: Likewise
* src/pam/Makefile.in: Likewise
* src/stringprep/Makefile.in: Likewise
* src/tls/Makefile.in: Likewise
* src/web/Makefile.in: Likewise

SVN Revision: 1075
 2007-12-17 18:59:51 +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
Badlop
536a120c9d * src/mod_muc/mod_muc_room.erl: Rephrase the invitation sentence 
to make more natural

SVN Revision: 1025
 2007-12-05 09:09:09 +00:00
Mickaël Rémond
abdbf55c87 * Temporary commit. 
SVN Revision: 1015
 2007-12-03 10:47:42 +00:00
Badlop
44d65ff303 * src/configure.ac: Don't hardcode gcc and options (EJAB-436) 
* src/Makefile.in: 
* src/ejabberd_zlib/Makefile.in: 
* src/eldap/Makefile.in: 
* src/mod_irc/Makefile.in: 
* src/mod_muc/Makefile.in: 
* src/mod_proxy65/Makefile.in: 
* src/mod_pubsub/Makefile.in: 
* src/odbc/Makefile.in: 
* src/pam/Makefile.in: 
* src/stringprep/Makefile.in: 
* src/tls/Makefile.in: 
* src/web/Makefile.in:

SVN Revision: 1000
 2007-11-29 16:59:35 +00:00
Badlop
4257f0c790 * src/mod_muc/mod_muc_room.erl: Hide the option 'Make room 
moderated' because it isn't implemented, and set the default value
of 'moderated' to true because that is the behaviour
implemented (EJAB-419)

SVN Revision: 999
 2007-11-29 16:16:10 +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
Badlop
e7136065fc * src/mod_muc/mod_muc_room.erl: Don't show the room name as the room description (EJAB-382). 
SVN Revision: 989
 2007-11-27 08:09:47 +00:00
Mickaël Rémond
afec054544 * src/ejabberd_c2s.erl: Option to prevent the use of Erlang OTP supervisor for transient processes (EJAB-354). 
* src/ejabberd_s2s_in.erl: Likewise.
* src/ejabberd_s2s_out.erl: Likewise.
* src/mod_muc/mod_muc_room.erl: Likewise.
* src/configure.ac: Likewise.
* src/configure: Likewise.
* src/Makefile.in: Likewise.
* src/mod_muc/Makefile.in: Likewise.

SVN Revision: 931
 2007-09-14 14:16:36 +00:00
Alexey Shchepin
978b7aea12 * src/mod_muc/mod_muc_room.erl: Added logging of MUC admin/owner 
queries

SVN Revision: 907
 2007-09-01 21:15:40 +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
4a26e75992 * src/mod_muc/mod_muc_room.erl: The mod_muc option max_users now 
limits max number of users in rooms and max_users_admin_threshold
sets a number of admin or owner accounts allowd to join after
max_users occupants

SVN Revision: 900
 2007-08-29 17:54:45 +00:00
Alexey Shchepin
90ff184472 * src/mod_muc/mod_muc_log.erl: Added missed HTMLization in a 
nickname change logging (thanks to Badlop)

SVN Revision: 896
 2007-08-29 13:17:03 +00:00
Mickaël Rémond
52c10089aa * src/mod_muc/mod_muc_room.erl: Changed default max number of user 
in a room to 200 (EJAB-248)

SVN Revision: 895
 2007-08-28 15:05:52 +00:00
Mickaël Rémond
a78037fc3c * src/mod_muc/mod_muc_room.erl: Implements muc max users option 
from XEP-0045 (Thanks to Jerome Sautret) (EJAB-248).

SVN Revision: 892
 2007-08-28 14:35:50 +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
24ff98d50d Fixed conflict 
SVN Revision: 887
 2007-08-24 16:18:46 +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
Mickaël Rémond
0b0c889bca * src/mod_muc/mod_muc_log.erl: Recognise more URI schemes in logged HTML (EJAB-279) (Thanks to qu1j0t3). 
SVN Revision: 815
 2007-07-17 07:55:26 +00:00
Alexey Shchepin
ef7e43b2dc * src/mod_muc/mod_muc_room.erl: Include <body/> in MUC invitations 
for older clients (thanks to Michael Scherer)

SVN Revision: 796
 2007-06-26 18:00:36 +00:00
Mickaël Rémond
20da906311 * src/mod_muc/mod_muc_room.erl: New anti-abuse options: min_presence_interval and min_message_interval (EJAB-227) 
* doc/guide.tex: Likewise

SVN Revision: 794
 2007-06-25 16:43:42 +00:00
Mickaël Rémond
81117800e8 * src/mod_muc/mod_muc_room.erl: It is now possible to limit who is allowed to create persistent MUC rooms (Thanks to Badlop) (EJAB-257) 
* src/mod_muc/mod_muc.erl: Likewise
* doc/guide.tex: Likewise
* src/ejabberd.cfg.example: Likewise

SVN Revision: 786
 2007-06-20 11:25:19 +00:00
Mickaël Rémond
c228e7aeb3 * src/Makefile.in: Added Dialyzer target (EJAB-189 - Thanks to Geoff Cant) 
* src/Makefile.in: Build XmppAddr.beam in a single pass
* src/mod_muc/Makefile.in: +debug_info directive support
* src/stringprep/Makefile.in: Likewise
* src/mod_irc/Makefile.in: Likewise
* src/web/Makefile.in: Likewise
* src/eldap/Makefile.in: Likewise
* src/mod_pubsub/Makefile.in: Likewise
* src/ejabberd_zlib/Makefile.in: Likewise
* src/mod_proxy65/Makefile.in: Likewise
* src/tls/Makefile.in: Likewise
* src/odbc/Makefile.in: Likewise

SVN Revision: 775
 2007-05-29 14:31:12 +00:00
Mickaël Rémond
03740c8bca * src/mod_vcard.erl: Make services description translatable in discovery (EJAB-236 - thanks to Badlop) 
* src/mod_muc/mod_muc.erl: Likewise
* src/mod_irc/mod_irc.erl: Likewise
* src/mod_pubsub/mod_pubsub.erl: Likewise
* src/mod_proxy65/mod_proxy65_service.erl: Likewise
* src/msgs/fr.msg: Added service description translation

SVN Revision: 774
 2007-05-29 13:14:09 +00:00