Christophe Romain
33d4126290
merge with latest 2.1.x (pre 2.1.7)
2011-04-11 15:47:04 +02:00
Badlop
449e56ed52
Send jid attribute when occupant is banned (EJAB-1432)
2011-04-07 12:54:39 +02:00
Badlop
aded966370
mod_ping uses iqdisc no_queue by default (thanks to Chris Moos)(EJAB-1435)
2011-04-07 12:08:31 +02:00
Badlop
dac1f328d7
Clarify {iqdisc, no_queue}
2011-04-07 12:06:31 +02:00
Badlop
90ea752046
Updated Japanese translation (thanks to Mako N)
2011-03-30 19:18:26 +02:00
Alexey Shchepin
494add4fd0
Updated rebind from the latest 2.2.x-applepush branch
2011-03-21 19:11:05 +02:00
Christophe Romain
3b7458bbc2
fir state initialization
2011-03-18 18:59:44 +01:00
Christophe Romain
f05a4d1638
typo fix
2011-03-18 17:41:56 +01:00
Christophe Romain
75d2cbcb14
add nodeidx as index on pubsub_state and pubsub_item
2011-03-18 17:36:08 +01:00
Christophe Romain
f9fa168d84
prevent from creating empty pubsub_subscription record
2011-03-18 15:17:13 +01:00
Badlop
e4b3bd5005
Fix typo (thanks to Krzee)
2011-03-17 12:15:31 +01:00
Christophe Romain
5ad1d08b89
SSL sockets don't compute length of data (EJABS-1460)
2011-03-15 13:53:38 +01:00
Christophe Romain
dcb068c7ad
Correctly handle ssl requests split into multiple ip (EJABS-1460)
2011-03-15 13:52:35 +01:00
Christophe Romain
2d32d2f25e
Enable workarounds for broken clients in tls layer (EJABS-1460)
2011-03-15 13:51:49 +01:00
Badlop
abcbcd1f2c
Update the changed string in the PO translation files
2011-03-13 18:34:55 +01:00
Badlop
18fd67b311
Change string in WebAdmin to reuse an existing one
2011-03-13 18:34:50 +01:00
Badlop
b116957982
Fix bashism and make some lines similar to master branch (EJAB-1404)
2011-03-09 16:25:05 +01:00
Badlop
a1f20a5bc0
If the port number isn't listener, then specify the protocol (EJAB-1418)
2011-03-03 11:38:00 +01:00
Badlop
e0d14c3b8d
captcha_host must have the port number to get protocol (EJAB-1418)
2011-03-03 00:02:43 +01:00
Badlop
1548a18b5e
mod_irc must send presence unavailable to the departing occupant (EJAB-1417)
2011-03-01 22:33:11 +01:00
Badlop
339fa6e41b
ejabberdctl needs space between INET_DIST_INTERFACE (thanks to Dale Chase)(EJAB-1416)
2011-02-28 18:40:45 +01:00
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
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
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
