Jean-Sébastien Pédron
ff500d8297
Merge from trunk (r1787 to r1804).
...
Included are fixes to src/mod_configure.erl and src/mod_caps.erl.
Note: this merge doesn't include the following revisions because it was
made by previous commits:
r1766, r1768, r1781, r1783, r1794, r1797, r1799, r1802.
Warning: Ejabberd may be broken until the merge is completly finished.
PR: EJABP-1
SVN Revision: 1829
2009-01-19 14:47:33 +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
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
Jérôme Sautret
2e00142b38
Cancel revision 798
...
SVN Revision: 799
2007-06-27 11:05:14 +00:00
Jérôme Sautret
9cd3a6db07
Unsafe working version of http file transfer
...
SVN Revision: 798
2007-06-27 10:01:39 +00:00
Alexey Shchepin
32613987a8
* src/web/ejabberd_http.hrl: Added "ip" field in the "request"
...
record
* src/web/ejabberd_http.erl: Likewise
SVN Revision: 762
2007-05-07 15:47:33 +00:00
Alexey Shchepin
dc57e75e8f
* src/web/ejabberd_http.erl: Authentication check moved to
...
ejabberd_web.erl
* src/web/ejabberd_web.erl: Likewise
* src/web/Makefile.in: Added ejabberd_http.hrl dependency
* src/web/ejabberd_http_poll.erl: Updated to use {active, once}
socket mode
* src/mod_irc/mod_irc.erl: Updated to use gen_server behaviour and
ejabberd supervision tree
* src/mod_irc/mod_irc_connection.erl: Likewise
SVN Revision: 498
2006-02-03 03:28:15 +00:00
tmallard
374446f847
Merged the Process One contributions ( Virtual Hosting )
...
SVN Revision: 307
2005-04-17 18:08:34 +00:00
Alexey Shchepin
5696c848a6
* src/web/: Updated
...
SVN Revision: 208
2004-03-04 20:56:32 +00:00
