Eric Cestari
cb54444f00
Merge branch '2.2.x' into websockets
2010-09-16 14:44:44 +02:00
Eric Cestari
c77e7fbb7d
Merge branch '2.2.x' of gitorious.process-one.net:+ejabberd-developers/ejabberd/maincustomers into 2.2.x
2010-09-16 14:38:52 +02:00
Eric Cestari
40625b29f2
ApplePush : previous merge missed timeout handler in c2s.
2010-09-16 14:37:27 +02:00
Christophe Romain
2624f3ba51
added pubsub helper modules
2010-09-16 14:31:08 +02:00
Eric Cestari
44832e12b3
Merge branch '2.2.x' into websockets
2010-09-16 11:07:12 +02:00
Eric Cestari
caa8d0c411
Merge branch '2.2.x' of git+ssh://gitorious.process-one.net/~ecestari/ejabberd/ecestaris-maincustomers into 2.2.x
2010-09-16 10:54:45 +02:00
Eric Cestari
7e72d18292
Merge branch 'websockets' of git+ssh://gitorious.process-one.net/~ecestari/ejabberd/ecestaris-maincustomers into websockets
2010-09-15 17:21:20 +02:00
Eric Cestari
b0a81778af
[TECH-1511] preliminary XMPP support via websockets
2010-09-15 17:20:54 +02:00
Christophe Romain
652774a83c
remove obsolete files
2010-09-15 13:51:46 +02:00
Alexey Shchepin
2aea503a2a
Don't resend badge if there are no offline messages
2010-09-14 21:27:02 +02:00
Alexey Shchepin
0d8aacb3e7
Do not disable push on send error
2010-09-14 21:26:50 +02:00
Alexey Shchepin
e6be70943f
Added badge resending functions
2010-09-14 21:26:36 +02:00
Christophe Romain
c3c06ccd1c
Merge remote branch 'mainline/2.1.x' into 2.2.x
2010-09-14 16:59:46 +02:00
Eric Cestari
18b569a356
[TECH-1511] preliminary XMPP support via websockets
2010-09-13 17:26:24 +02:00
Eric Cestari
c8567f1de2
[TECH-1511] Calls start() on handler to get a PID
2010-09-13 14:23:42 +02:00
Badlop
8a0ccfc401
Support timezone West of UTC (thanks to Edwin Fine)(EJAB-1301)
2010-09-13 12:06:13 +02:00
Eric Cestari
35a0e27d04
[TECH-1511] clean support for websockets.
...
Added handlers in configuration file
2010-09-13 12:04:52 +02:00
Eric Cestari
c41bdea1f1
[TECH-1511] rough support for websockets
2010-09-10 17:14:58 +02:00
Eric Cestari
cccbf7de12
[TECH-1151] websockets are properly detected.
2010-09-10 15:04:19 +02:00
Eric Cestari
660a2735f0
mod_keepalive added to repos
2010-09-10 14:11:56 +02:00
Eric Cestari
77136bccdf
[TECH-1151] websocket initial code
2010-09-10 14:06:26 +02:00
Eric Cestari
b8b6fc0da5
Merge ApplePush to 2.2.x
2010-09-09 17:00:18 +02:00
Eric Cestari
8ecf8d7e27
A few additions to .gitignore
2010-09-09 16:16:46 +02:00
Eric Cestari
4134edf8de
Merge ApplePush to branch 2.2.x
2010-09-09 16:16:28 +02:00
Eric Cestari
a77d53d738
[TECH-1068] Added missing catch in process function
2010-09-08 17:25:37 +02:00
Eric Cestari
49a3424a26
add *.so to .gitignore
2010-09-08 17:21:49 +02:00
Eric Cestari
92a60ff7fd
flash hack merge fix from BBC
2010-09-08 17:03:49 +02:00
Eric Cestari
33c7d36a95
Merge branch '2.2.x' of git+ssh://git@gitorious.process-one.net/+ejabberd-developers/ejabberd/maincustomers into 2.2.x
2010-09-08 16:54:26 +02:00
Christophe Romain
6c7316cbdd
apply flash hack patch
2010-09-08 16:51:06 +02:00
Eric Cestari
09da9eeb95
Merge branch '2.2.x' of git+ssh://git@gitorious.process-one.net/+ejabberd-developers/ejabberd/maincustomers into 2.2.x
2010-09-08 15:32:21 +02:00
Christophe Romain
76d4ba66b2
merge 2.1.x to 2.2.x
2010-09-08 15:30:52 +02:00
Eric Cestari
f284fc3284
[TECH-1068] Atom feed is good enough.
2010-09-08 15:30:28 +02:00
Evgeniy Khramtsov
c29b2fda99
cache lifetime should be converted in microseconds
2010-09-08 02:33:49 +10:00
Eric Cestari
86a59fb469
Implemented rough access_model access control.
2010-09-07 17:23:13 +02:00
Eric Cestari
31da259a75
HTTP Delete item
2010-09-07 16:42:12 +02:00
Eric Cestari
363711a370
New features :
...
- edit an item
- edit node configuration
2010-09-07 16:22:57 +02:00
Eric Cestari
bf98fa0c01
Added node creation with configure form
...
Added deletion
Better behavior in case of a crash (returns 500)
2010-09-07 14:35:40 +02:00
Eric Cestari
cd923838c3
Making progress on the Atom interface.
...
- GET items
- POST items
- GET nodes
HTTP error codes now are the ones XMPP returns.
2010-09-07 11:32:14 +02:00
Eric Cestari
a22ebd3c49
Added support for GET a single item
...
and GET an atom feed of a node
2010-09-03 15:54:51 +02:00
Eric Cestari
353d16b8ef
Post to pubsub using http POST :
...
{5280, ejabberd_http, [
http_poll,
web_admin,
{request_handlers, [{["pshb"], pshb_http}]} % this should be added
]}
To post to a node the content of the file "sam.atom" on the "foo", on the localhost virtual host, using cstar@localhost
curl -u cstar@localhost:encore -i -X POST http://localhost:5280/pshb/localhost/foo -d @sam.atom
2010-09-02 16:57:21 +02:00
Evgeniy Khramtsov
c75b7b2b12
Implemented dirty (non-atomic) functions; added copyright notice
2010-08-31 18:06:02 +10:00
Badlop
c754c91ad1
Add IPv6 support to mod_irc (thanks to Matthias Schiffer)(EJAB-1298)
2010-08-30 23:25:02 +02:00
Christophe Romain
c03140d4be
fix merge issue
2010-08-30 11:14:57 +02:00
Evgeniy Khramtsov
6952324509
implemented backend-independed key-value cacheing table; applied to mod_caps.erl first
2010-08-30 14:02:47 +10:00
Badlop
4b5ef8f2ce
Add mod_pubsub_odbc to list of ODBC modules (EJAB-1293)
2010-08-21 18:56:01 +02:00
Badlop
d87fff1a4c
Bugfix http-poll for correctly parsing binary (thanks to Peter Lemenkov)
2010-08-19 17:38:38 +02:00
Evgeniy Khramtsov
3024bb0cbf
fixes ampersand escaping (EJAB-1258)
2010-08-19 16:28:31 +10:00
Evgeniy Khramtsov
f8dd973373
fixes typo for table copy
2010-08-10 19:42:22 +10:00
Christophe Romain
23b28ec60f
Merge remote branch 'mainline/2.1.x' into 2.2.x
2010-08-09 10:04:11 +02:00
Badlop
972440c2ca
When user joins non-anonymous room, warn also in presence stanza (EJAB-310)
2010-08-07 20:48:36 +02:00
