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

265 Commits

Author SHA1 Message Date
Jean-Sébastien Pédron
bc51bd0dbd Merge from trunk (r1752 to r1764). 
Warning: Ejabberd may be broken until the merge is completly finished.

PR:		EJABP-1

SVN Revision: 1826
 2009-01-19 11:16:44 +00:00
Jean-Sébastien Pédron
2cc2039ad8 Merge from trunk (r1734 to r1752). 
Note: this merge doesn't include the following revisions because it was
made by previous commits:
r1737, r1740, r1745, r1747, r1748.

Additionnaly, any deprecated content was removed from jlib.hrl. This
leaves only the new RSM records.

Warning: Ejabberd may be broken until the merge is completly finished.

PR:		EJABP-1

SVN Revision: 1824
 2009-01-19 10:14:04 +00:00
Jean-Sébastien Pédron
69805f36fa Merge from trunk (r1730 to r1734). 
PR:		EJABP-1

SVN Revision: 1735
 2008-12-17 13:52:44 +00:00
Jean-Sébastien Pédron
3bfb2b5cc1 Merge from trunk (r1692 to r1709). 
PR:		EJABP-1

SVN Revision: 1710
 2008-12-08 12:02:27 +00:00
Jean-Sébastien Pédron
9e96043255 Merge from trunk (r1649 to r1692). 
PR:		EJABP-1

SVN Revision: 1695
 2008-12-01 15:53:30 +00:00
Jean-Sébastien Pédron
ab2b70f189 Merge from trunk (r1613 to 1649). 
PR:		EJABP-1

SVN Revision: 1650
 2008-10-13 10:11:19 +00:00
Jean-Sébastien Pédron
67a87af459 Merge from trunk (r1563 to r1613). 
PR:		EJABP-1

SVN Revision: 1614
 2008-10-08 12:02:30 +00:00
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
5fdcb52306 * src/ejabberd.app: The ejabberd version number is defined in the 
OTP application resource file, in the key 'vsn' (EJAB-657)
* src/ejabberd.hrl: The macro VERSION now consults the ejabberd
application key vsn
* src/configure.erl: Load the ejabberd application description
* doc/Makefile: Read ejabberd version from ejabberd.app vsn
* doc/api/Makefile: Likewise

SVN Revision: 1361
 2008-06-18 21:33:48 +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
44e0a17d80 * doc/guide.tex: Title in HTML is shorter. Update several external URIs. 
SVN Revision: 1354
 2008-06-13 15:25:57 +00:00
Badlop
8f7d9de0b6 * doc/guide.tex: Document ldap_local_filter (EJAB-179) 
SVN Revision: 1353
 2008-06-13 10:13:44 +00:00
Badlop
d27f41a9e8 * doc/guide.tex: Table of listener modules converted to 
description. Table of modules overview simplified, and module
names link to their sections.
* doc/guide.html: Regenerated with all the latest changes

SVN Revision: 1352
 2008-06-12 23:52:13 +00:00
Badlop
795263b5d4 * doc/guide.tex: Fix indentation of verbatim text 
SVN Revision: 1351
 2008-06-12 23:01:09 +00:00
Badlop
a8140bca89 * doc/guide.tex: 
Changes in CSS: verbatim text is indented and has grey background;
descriptions are indented; table borders are softer.

SVN Revision: 1350
 2008-06-12 22:00:51 +00:00
Badlop
9507a0001d * doc/guide.tex: Permanent reference URL for sections (EJAB-651) 
SVN Revision: 1349
 2008-06-12 21:54:30 +00:00
Badlop
be8d1902d0 * doc/guide.tex: Small fixes (thanks to Christoph Anton Mitterer) 
* doc/introduction.tex: Likewise
* doc/guide.html: Likewise

SVN Revision: 1347
 2008-06-08 16:52:25 +00:00
Badlop
95462d3f25 * doc/guide.tex: Document ejabberdctl status code (EJAB-633) 
* doc/guide.html: Likewise

SVN Revision: 1346
 2008-06-05 12:04:43 +00:00
Christophe Romain
3c1efb8c4d add release_notes_2.0.1 
SVN Revision: 1338
 2008-05-19 22:35:01 +00:00
Badlop
9bdaa45981 * doc/guide.html: Update 
SVN Revision: 1335
 2008-05-19 09:45:44 +00:00
Badlop
30f54a6bfc * src/configure.ac: R12 support: remove compilation 
warning (EJAB-630)
* src/configure: Likewise
* doc/guide.tex: Likewise

SVN Revision: 1334
 2008-05-19 09:20:35 +00:00
Badlop
b503e02b09 * doc/guide.tex: Describe how to disable registration 
limitation (EJAB-614)

SVN Revision: 1333
 2008-05-19 09:13:19 +00:00
Badlop
e5879f4349 * src/ejabberd.cfg.example: Small improvements in explanations 
* doc/guide.tex: Document MUC room options (EJAB-619)

SVN Revision: 1310
 2008-04-29 16:44:12 +00:00
Badlop
1cbfc60570 * doc/guide.tex: Document the option max_s2s_connections 
SVN Revision: 1307
 2008-04-28 18:07:23 +00:00
Badlop
0b5720906c * doc/guide.tex: Document option registration_timeout (EJAB-614) 
SVN Revision: 1302
 2008-04-25 22:45:45 +00:00
Badlop
c88a4650ba * src/ejabberd_c2s.erl: Added forbidden_session_hook 
* src/acl.erl: New access types: resource, resource_regexp and
resource_glob
* doc/guide.tex: Likewise

SVN Revision: 1301
 2008-04-25 09:25:31 +00:00
Badlop
ee6aae8211 * src/ejabberd_s2s_out.erl: Fix long timeout when reconnecting s2s 
after a remote server crash (EJAB-540)
* src/ejabberd_s2s_in.erl: Likewise
* src/ejabberd_s2s.erl: Likewise
* doc/guide.tex: Likewise

SVN Revision: 1296
 2008-04-18 12:19:45 +00:00
Badlop
981a4a9cd8 * doc/guide.tex: Clarification: PEP is enabled in default config 
SVN Revision: 1295
 2008-04-16 15:44:58 +00:00
Mickaël Rémond
1b13449194 * doc/guide.tex: Documented the IQ discipline {queue, N}. 
* doc/guide.html: Likewise.

SVN Revision: 1278
 2008-04-07 13:18:42 +00:00
Badlop
2498bdaad9 * doc/guide.tex: Fix default_room_opts with default_room_options 
* doc/guide.html: Likewise

SVN Revision: 1277
 2008-04-05 10:53:32 +00:00
Badlop
1649dec58e * src/ejabberd_config.erl: Add support to include additional 
configuration files. Add support for macro definition and
usage. (EJAB-593)
* doc/guide.tex: Likewise
* doc/guide.html: Likewise

SVN Revision: 1273
 2008-04-02 16:31:15 +00:00
Badlop
39b35cf54b * doc/guide.tex: Updated command line parameters, epmd section 
* doc/guide.html: Likewise

SVN Revision: 1267
 2008-04-01 12:00: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
2510d71ae6 * doc/webadmmain.png: Updated to ejabberd 2.0.0 
* doc/webadmmainru.png: Likewise

* doc/disco.png: Removed because not used

* doc/guide.tex: Fix Latex reference to webadmin section. Update
explanation of screenshots. Update xmpp addresses of Mickael
Remond and Sander Devrieze.
* doc/guide.html: Likewise

* doc/Makefile: Remove the Hevea deprecated option -noiso
* doc/guide.html: Likewise
* doc/dev.html: Likewise
* doc/features.html: Likewise

SVN Revision: 1261
 2008-03-31 10:36:41 +00:00
Badlop
e13908c26c * doc/guide.tex: Fix epam location (thanks to Evgeniy Khramtsov) 
* doc/guide.html: Likewise

SVN Revision: 1259
 2008-03-27 00:28:44 +00:00
Badlop
ea510f9d48 * doc/guide.tex: mod_vcard_ldap replace NICK with NICKNAME (thanks 
to Andreas Ntaflos)
* doc/guide.html: Likewise

SVN Revision: 1254
 2008-03-24 18:57:41 +00:00
Badlop
30739179ee * doc/guide.tex: Document service_check_from (EJAB-576) 
* doc/guide.html: Likewise

SVN Revision: 1248
 2008-03-22 00:33:28 +00:00
Badlop
efec28ada7 * doc/guide.tex: Document s2s_default_policy and 
s2s_host (EJAB-575)
* doc/guide.html: Likewise

SVN Revision: 1246
 2008-03-21 16:17:37 +00:00
Badlop
694baba127 * doc/guide.tex: Improve explanation of how to start ejabberd when 
binary installer. Don't recommend R12 in Windows compilation.
Describe what happens if maxrate shaper is exceeded.
* doc/guide.html: Likewise

SVN Revision: 1238
 2008-03-20 19:24:27 +00:00
Badlop
40442b9c99 * doc/guide.tex: Describe option Matches in mod_vcard_ldap (thanks 
to Evgeniy Khramtsov)(EJAB-530).  Fix typo in the description of
ldap_server option.
* doc/guide.html: Likewise

SVN Revision: 1229
 2008-03-13 10:59:57 +00:00
Badlop
735b34e7b7 * doc/guide.tex: Improve documentation of host_config 
add (EJAB-544)
* doc/guide.html: Likewise
* src/ejabberd.cfg.example: Likewise
* src/ejabberd_config.erl: Likewise

SVN Revision: 1219
 2008-03-04 10:36:57 +00:00
Badlop
a65273690d * doc/guide.tex: mod_announce recommends, but doesn't require 
mod_adhoc (thanks to Anastasia Gornostaeva)
* doc/guide.html: Likewise
* src/ejabberd.cfg.example: Likewise

SVN Revision: 1218
 2008-03-04 09:07:43 +00:00
Badlop
2ef35b89ca * doc/release_notes_2.0.0.txt: Small fixes and update date 
SVN Revision: 1207
 2008-02-21 09:54:19 +00:00
Badlop
ac99c7fc7d * doc/release_notes_2.0.0.txt: Updated version number and date 
SVN Revision: 1205
 2008-02-20 16:08:13 +00:00
Badlop
0316caafd3 * doc/guide.tex: Mentioned the problems about Windows service 
* doc/guide.html: Likewise

SVN Revision: 1204
 2008-02-20 16:05:26 +00:00
Badlop
a021731c09 * doc/release_notes_2.0.0.txt: Describe in the Release Notes the 
upgrade instructions (EJAB-522)

SVN Revision: 1195
 2008-02-15 19:18:36 +00:00
Badlop
8ff5599d3a * src/ejabberd.cfg.example: Document options to SQL keep alive 
interval and pool size (EJAB-206)
* doc/guide.tex: Likewise
* doc/guide.html: Likewise

SVN Revision: 1178
 2008-02-08 18:28:36 +00:00