25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-10-31 15:21:38 +01:00
Commit Graph

31 Commits

Author SHA1 Message Date
Christophe Romain
4a2005f7cc update copyright up to 2011 2011-02-14 13:47:22 +01:00
Pablo Polvorin
ef572c815f Port to latest exmpp changes (attribute names as binary()).
All atributes are now binary() instead of atoms.
2010-11-29 16:44:31 -03:00
Badlop
1bcd481fdc Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159)
SVN Revision: 2892
2010-01-12 16:15:16 +00:00
Jean-Sébastien Pédron
93b26d947c Add documentation stub for some types. This will be filled later.
PR:		EJABP-1

SVN Revision: 1865
2009-02-06 13:34:12 +00:00
Jean-Sébastien Pédron
842ebfcca0 A lot of bug fixes regarding attribute values type:
o  Fix some bugs by getting attributes as list() instead of binary().
o  Instead creating #xmlattr directly, use the new ?XMLATTR macro; it'll
take care of the anything-to-binary() conversion.
o  Fix a bug where recipient and sender were used as binary() instead of
list(), which is required by the rest of the S2S code.
o  Fix a bug where binary_to_list/1 was called on a list().

Now concerning JIDs :
o  Now that #jid{} isn't part of the API of Exmppp anymore, replace
remaining direct usages by calls to exmpp_jid.
o  Replace exmpp_jid:make_bare_jid() by exmpp_jid:make_jid().
o  Replace exmpp_jid:*_to_jid/1 by exmpp_jid:parse_jid/1.

PR:		EJABP-1

SVN Revision: 1841
2009-01-21 13:34:26 +00:00
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
50b1e4c36f Convert to exmpp.
The admin web interface is working but HTTP polling seems broken in the
trunk.

PR:		EJABP-1

SVN Revision: 1654
2008-10-13 15:36:43 +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
Badlop
1e345eb0fc * src/web/ejabberd_web.erl (make_xhtml/2): Allow to include
elements in the HTTP header

SVN Revision: 1344
2008-05-31 18:21:43 +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
d625fc80fc * src/acl.erl and other 64 files: Remove Erlang module attribute
'vsn' because it doesn't provide any worth feature, and it
difficults hot code update (EJAB-440)

SVN Revision: 1044
2007-12-06 22:12:27 +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
00807235c4 * src/web/*: Plugin architecture for HTTP modules (thanks to
Massimiliano Mirra)

SVN Revision: 713
2007-01-25 05:53:58 +00:00
Alexey Shchepin
0cc168a9aa * src/mod_muc/mod_muc_room.erl: Kick non-members when room
reconfigured to be member-only or when membership is revoked in
member-only room, allowed "true" and "false" in x:data forms
(thanks to Sergei Golovan)

* src/mod_configure.erl: Added "Host" parameter to get_form and
set_form functions (thanks to Sergei Golovan)

* src/ejabberd_s2s_out.erl: Bugfix

* src/msgs/es.msg: Updated (thanks to Badlop)

* src/web/ejabberd_web.erl: Bugfix (thanks to Badlop)

* src/mod_irc/mod_irc.erl: Updated copyright dates
* src/mod_muc/mod_muc.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/web/ejabberd_web_admin.erl: Likewise

SVN Revision: 500
2006-02-06 05:12:54 +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
Alexey Shchepin
4098c3ecba * (all): Enhanced virtual hosting support
SVN Revision: 370
2005-06-20 03:18:13 +00:00
tmallard
374446f847 Merged the Process One contributions ( Virtual Hosting )
SVN Revision: 307
2005-04-17 18:08:34 +00:00
Alexey Shchepin
0b4539caa1 * src/web/ejabberd_http.erl: Added options for enabling HTTP
polling and admin interface
* src/web/ejabberd_web.erl: Likewise
* src/ejabberd.cfg.example: Updated

* src/web/ejabberd_web_admin.erl: Updated

* doc/guide.tex: Updated

SVN Revision: 236
2004-05-22 19:48:35 +00:00
Alexey Shchepin
aaccaa5a45 * src/web/ejabberd_web_admin.erl: Better design for administration
interface (not completed) (thanks to Andrey Zamaraev)
* src/web/ejabberd_http.erl: Updated
* src/web/ejabberd_web.erl: Likewise

SVN Revision: 225
2004-04-26 15:38:07 +00:00
Alexey Shchepin
b75fb79677 * (all): Updated win32 stuff (thanks to Sergei Golovan)
* src/web/ejabberd_web.erl: Added interface for access rules
configuration

SVN Revision: 221
2004-03-21 20:27:09 +00:00
Alexey Shchepin
2f47b7edd9 * doc/guide.tex: Updated
* src/web/ejabberd_web.erl: Updated

* src/web/ejabberd_http.erl: Bugfix

SVN Revision: 220
2004-03-20 20:55:58 +00:00
Alexey Shchepin
f9f33a9117 * src/web/ejabberd_web.erl: Minor update
SVN Revision: 217
2004-03-15 20:46:42 +00:00
Alexey Shchepin
60cb9fc959 * src/web/ejabberd_web.erl: Added interface for users listsing and
statistics

SVN Revision: 216
2004-03-14 20:47:15 +00:00
Alexey Shchepin
b4798f76a3 * src/web/ejabberd_web.erl: New interface for ACLs editing
* src/web/ejabberd_http_poll.erl: Fixed "Content-Type" header,
"Set-Cookie" is included only in first response in session, added
missed behaviour definition

* src/web/ejabberd_http.erl: "Content-Type" header now can be
changed

SVN Revision: 215
2004-03-13 20:01:37 +00:00
Alexey Shchepin
a2b2d08ddc * src/web/ejabberd_web.erl: Experiments with web-interface
SVN Revision: 214
2004-03-12 15:15:17 +00:00
Alexey Shchepin
a0ae476619 * src/web/: Support for HTTP Polling (JEP-0025) (almost complete)
SVN Revision: 209
2004-03-06 21:13:16 +00:00
Alexey Shchepin
5696c848a6 * src/web/: Updated
SVN Revision: 208
2004-03-04 20:56:32 +00:00
Alexey Shchepin
0f95685c05 * src/web/: Minor update
SVN Revision: 207
2004-03-03 21:07:27 +00:00
Alexey Shchepin
ec182cbd60 * src/web/: Small HTTP server and admin web-interface to ejabberd
(not completed yet)
* src/ejabberd_sup.erl: Added HTTP processes supervisor

* src/ejabberd_c2s.erl: Added API to ask presence (thanks to
Mickael Remond)

* src/msgs/ru.msg: Updated (thanks to Sergei Golovan)

* src/mod_muc/mod_muc_room.erl: Updated date parser (thanks to
Sergei Golovan)

* src/mod_muc/mod_muc.erl: Added error descriptions (thanks to
Sergei Golovan)
* src/mod_muc/mod_muc_room.erl: Likewise

* src/mod_vcard.erl: Fixed vCard tag (thanks to Sergei Golovan)
* src/mod_irc/mod_irc.erl: Likewise
* src/mod_pubsub/mod_pubsub.erl: Likewise

* src/jlib.hrl: Added macros for errors with <text/> (thanks to
Sergei Golovan)

SVN Revision: 206
2004-03-02 21:16:55 +00:00