Badlop
db0962804d
Tweak pg2_backport.erl to work with Erlang older than R13A (EJAB-1349)
2011-02-22 23:44:45 +01:00
Badlop
677d8b1a29
Add support for '@online@' Shared Roster Group (thanks to Martin Langhoff)(EJAB-1391)
...
New version of the @online@ patch originally by Collabora.
Notes:
- the presence push is mediated via the group rather than
per user - this may reduce memory footprint... _if_ ejabberd
has some smart optimisation in that codepath
- it assumes that any group with membership @online@ _displays_
online as well -- this is a simplification and breaks the
decoupling that ejabberd has in this regard.
2011-02-21 22:34:15 +01:00
Badlop
850218c2df
Forward old messages to newly spawned extauth process (thanks to Mika Seppänen)(EJAB-1385)
2011-02-21 16:13:41 +01:00
Badlop
1c89914382
New route_iq/5 accepting Timeout (thanks to Edwin Fine)(EJAB-1398)
...
Also new register_iq_response_handler/5
2011-02-21 13:44:39 +01:00
Eric Cestari
307e57a105
Merge branch '2.2.x' of gitorious.process-one.net:+ejabberd-developers/ejabberd/maincustomers into 2.2.x
2011-02-17 12:25:15 +01:00
Badlop
fe40a9c5f6
New DIST_USE_INTERFACE to restrict IP where erlang connections are listened (EJAB-1404)
2011-02-16 23:53:29 +01:00
Badlop
bc0ae5a017
New Indonesian translation (thanks to Irfan Mahfudz Guntur)(EJAB-1407)
2011-02-16 13:46:20 +01:00
Christophe Romain
8e68e89816
Merge remote branch 'mainline/2.1.x' into 2.2.x
2011-02-15 10:48:27 +01:00
Christophe Romain
91ab7e029b
fix empty pubsub payload check on odbc version
2011-02-14 16:45:49 +01:00
Christophe Romain
c3a88c713b
fix empty pubsub payload check
2011-02-14 16:41:32 +01:00
Eric Cestari
1564060c6c
Closing properly the XMPP websocket process
2011-02-14 14:48:02 +01:00
Christophe Romain
f39ccd73c5
Merge remote branch 'mainline/2.1.x' into 2.2.x
2011-02-14 13:54:06 +01:00
Christophe Romain
fd52f2cb7d
update copyright up to 2011
2011-02-14 13:50:55 +01:00
Badlop
f91eb52890
Provide HTTPS URL in CAPTCHA form when listener has 'tls' option (EJAB-1406)
2011-02-14 13:11:21 +01:00
Badlop
ca59a7f027
Fix typo in French translation
2011-02-11 20:19:59 +01:00
Evgeniy Khramtsov
01689bc6b9
Ack support (TECH-1261)
2011-02-11 13:42:55 +09:00
Badlop
6dea2d2307
Escape output from ctlexec() to erl script (thanks to Dan Scott)(EJAB-1399)
2011-02-09 16:38:54 +01:00
Christophe Romain
024a80d41f
port previous pubsub changes to _odbc
2011-02-08 18:29:52 +01:00
Christophe Romain
f485109c39
refactor pubsub broadcast to allow big optimization
2011-02-08 17:14:19 +01:00
Eric Cestari
bde46896d6
Merge branch '2.2.x' of gitorious.process-one.net:+ejabberd-developers/ejabberd/maincustomers into 2.2.x
2011-02-08 16:39:38 +01:00
Eric Cestari
0c30b012f7
Websocket: corrects bug of ejabberd dropping connection under message rate.
2011-02-08 16:39:13 +01:00
Badlop
650b2802b5
Remove erroneous comment (EJAB-645)
2011-02-03 17:23:09 +01:00
Badlop
6ddc66db9f
Handle Tigase's unexpected version=1.0 when ejabberd doesn't announce it (EJAB-1379)
2011-01-31 19:43:28 +01:00
Badlop
14b39a0ee4
Merge remote branch 'origin/2.1.x' into 2.2.x
...
Conflicts:
src/web/ejabberd_http_bind.erl
2011-01-31 18:57:13 +01:00
Badlop
792512459d
mod_pres_counter prevents subscription flood (thanks to Ahmed Omar and Alexey Shchepin)(EJAB-1388)
2011-01-31 18:52:07 +01:00
Badlop
0359e345b0
Add to example config file access_from comment
2011-01-28 17:13:44 +01:00
Badlop
a09c319357
Update exmpp version to 0.9.6
2011-01-28 12:46:09 +01:00
Badlop
36166aa40e
Comment unused code
2011-01-28 12:11:34 +01:00
Badlop
a25c9c5df3
Don't let presence-in privacy rule block a presence subscription using ODBC (EJAB-255)
2011-01-19 20:58:57 +01:00
Badlop
6e3a9ac4fd
Fix delayed response of a timeout call was reused for next login (EJAB-1385)
2011-01-19 19:06:46 +01:00
Eric Cestari
e380eee223
WebSocket support update
...
- added JSON encoding
- fix problem where session was not closed
- origin can now be decided by a custom module
2011-01-19 14:54:20 +01:00
Eric Cestari
1959546ff9
Merge branch '2.2.x' of gitorious.process-one.net:+ejabberd-developers/ejabberd/maincustomers into 2.2.x
2011-01-19 14:49:45 +01:00
Christophe Romain
92f5509b35
improve check_start only matching node process
2011-01-18 13:36:46 +01:00
Badlop
f4c74c147b
Clarify more the expected content of welcome_message mod_register option
2011-01-17 23:46:08 +01:00
Badlop
0edda6150b
Clarify error message when BOSH query is sent to non-running module
2011-01-12 21:22:43 +01:00
Christophe Romain
1a2e6b02ab
sync with latest 2.1.6 befor tagging
2011-01-12 12:11:04 +01:00
Eric Cestari
56bf156b6f
logging works on non-configured hosts.
...
In the log file, information should be logged under the default hostname.
2011-01-11 12:55:03 +01:00
Eric Cestari
5632901820
Fixed 2.1.6 compile error
2011-01-07 16:00:10 +01:00
Eric Cestari
92b6c12420
Merge branch '2.2.x' of gitorious.process-one.net:+ejabberd-developers/ejabberd/maincustomers into 2.2.x
2011-01-07 15:54:00 +01:00
Eric Cestari
062d58026a
mod_http_fileserver.erl will only conditionally gzip content by checking Accept-Encoding.
2011-01-07 15:28:26 +01:00
Eric Cestari
7ef85dddea
Refactoring of ejabberd_http_fileserver.erl
...
- not a gen_server anymore. Should be way faster now (no more message passing between processes)
- configuration stored in mochiglobal
- support for etag
- support for gzip compression:
- static (if a foo.gz is in the same dir as requested foo, it will be served)
- always (will always gzip, will use static is available)
- false, don't gzip
- logfile is now in another module.
2011-01-07 15:12:51 +01:00
Mickaël Rémond
4a9e7f0a3a
Use route instead of send_element to go through standard workflow Offline messages should thus be tracked for ack if needed (TEXTO-226).
...
Signed-off-by: Evgeniy Khramtsov <ekhramtsov@process-one.net>
2011-01-05 14:36:21 +01:00
Mickaël Rémond
bd43505db9
Use route instead of send_element to go through standard workflow Offline messages should thus be tracked for ack if needed (TEXTO-226).
...
Signed-off-by: Evgeniy Khramtsov <ekhramtsov@process-one.net>
2011-01-04 15:21:10 +01:00
Christophe Romain
cffe224d4a
log and drop messages only from autofilter
2011-01-03 15:26:44 +01:00
Christophe Romain
15c27c9ddd
fix bad jid issue
2011-01-03 09:52:12 +01:00
Badlop
a2e1d2030a
Keep the order of stanzas when BOSH sends several (EJAB-1374)
2010-12-30 13:42:53 +01:00
Evgeniy Khramtsov
149f8e2b45
Merge remote branch 'mainline-2.1.x/2.1.x' into 2.2.x
...
Conflicts:
src/ejabberd.app
2010-12-28 21:17:01 +09:00
Evgeniy Khramtsov
4c8b034874
Change c2s state before offline messages resending
2010-12-28 21:09:15 +09:00
Eric Cestari
2ab31cb613
Merge branch '2.2.x-applepush' into 2.2.x
...
Without applepush
Conflicts:
src/ejabberd_c2s.erl
src/ejabberd_c2s.hrl
2010-12-23 15:30:14 +01:00
Alexey Shchepin
b47c50145d
Make jlib:ip_to_list safe to use
2010-12-20 19:29:05 +02:00