Christophe Romain
|
7f1e9d3972
|
merge from 2.1.11 and resolve conflicts
|
2012-04-27 11:37:11 +02:00 |
|
Evgeniy Khramtsov
|
deb87f2dfa
|
Cache caps timestamp before the IQ-request is done
|
2012-02-28 16:38:24 +10:00 |
|
Christophe Romain
|
7d7c739cb3
|
Merge remote-tracking branch 'mainline/2.1.x' into 2.2.x
|
2012-02-23 16:59:22 +01:00 |
|
Alexey Shchepin
|
b1e2538488
|
Update copyright dates
|
2012-02-23 17:52:34 +02:00 |
|
Pablo Polvorin
|
fead37d1c5
|
Avoid multiple disco#info request for caps.
Only send it when we receive the presence from the user,
if the user sends caps and we don't have it cached.
|
2012-01-27 16:08:28 -03: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 |
|
Evgeniy Khramtsov
|
03870f962c
|
Fix user_receive_packet hook
|
2010-12-16 23:54:02 +09:00 |
|
Evgeniy Khramtsov
|
02cfb11a6d
|
Merge branch '2.1.x' into mergefix
Conflicts:
.gitignore
src/ejabberd.app
src/ejabberd_c2s.erl
src/ejabberd_captcha.erl
src/ejabberd_node_groups.erl
src/mod_caps.erl
src/web/ejabberd_http.erl
src/web/ejabberd_http_bind.erl
|
2010-12-14 23:10:08 +09:00 |
|
Christophe Romain
|
7da8d9e4e3
|
merge resolved against latest 2.1.x
|
2010-10-13 11:02:22 +02:00 |
|
Evgeniy Khramtsov
|
36df8c9035
|
implement lifetime for broken hashes
|
2010-10-05 21:27:28 +10:00 |
|
Evgeniy Khramtsov
|
58a5ed9cdc
|
change caps hook name
|
2010-10-03 16:04:29 +10:00 |
|
Evgeniy Khramtsov
|
5ea909885e
|
call caps hook when caps is changed
|
2010-10-03 16:02:50 +10:00 |
|
Evgeniy Khramtsov
|
c13940e1de
|
new CAPS processing
|
2010-09-28 14:18:57 +10:00 |
|
Evgeniy Khramtsov
|
8e5297f4c3
|
fixes default value for cache_life_time
|
2010-09-21 04:31:18 +10:00 |
|
Christophe Romain
|
76d4ba66b2
|
merge 2.1.x to 2.2.x
|
2010-09-08 15:30:52 +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 |
|
Christophe Romain
|
23b28ec60f
|
Merge remote branch 'mainline/2.1.x' into 2.2.x
|
2010-08-09 10:04:11 +02:00 |
|
Evgeniy Khramtsov
|
d2d8a09b4a
|
Make MD2 autodetected (EJAB-1285)
|
2010-08-07 22:04:57 +10:00 |
|
Christophe Romain
|
cc0503fd5e
|
Add module to dump c2s connection
|
2010-07-13 18:45:49 +02:00 |
|
Evgeniy Khramtsov
|
f66f049ef3
|
Added support for all hash functions required by XEP-0115
|
2010-06-22 03:10:41 +10:00 |
|
Evgeniy Khramtsov
|
58590cf08d
|
full support for XEP-0115 v1.5 (EJAB-1223) (EJAB-1189)
|
2010-05-08 02:32:57 +10:00 |
|
Christophe Romain
|
6fb99fbb48
|
mod_caps optimizations (thanks evgeniy)
|
2010-03-05 10:34:15 +01:00 |
|
Badlop
|
7b76fdcde7
|
Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159)
SVN Revision: 2891
|
2010-01-12 16:11:32 +00:00 |
|
Badlop
|
b9f911554c
|
Fix ProcessOne name in comments.
SVN Revision: 2724
|
2009-11-04 20:14:22 +00:00 |
|
Evgeniy Khramtsov
|
6fa0f68239
|
fixes race condition in wait_caps/note_caps (EJAB-1054)
SVN Revision: 2632
|
2009-09-25 11:47:21 +00:00 |
|
Christophe Romain
|
726545ae86
|
improve waiting caps clean (EJAB-1054)
SVN Revision: 2627
|
2009-09-24 19:29:21 +00:00 |
|
Christophe Romain
|
fef762243c
|
caps storage indexed on case insensitive jid
SVN Revision: 2382
|
2009-07-21 20:51:14 +00:00 |
|
Christophe Romain
|
cdd3ab17ae
|
remove useless debug
SVN Revision: 2113
|
2009-05-28 23:02:02 +00:00 |
|
Christophe Romain
|
039d5b8367
|
pubsub: added configuration option in guide.tex, added last item cache, use default node type if given type is not configured, make node_flat the default node plugin. caps: improve cache handling
SVN Revision: 2112
|
2009-05-28 22:30:43 +00:00 |
|
Christophe Romain
|
20088d8a92
|
Prevent race condition when calling get_caps while note_caps has not been handled yet (EJAB-934)
SVN Revision: 2071
|
2009-05-11 17:16:25 +00:00 |
|
Christophe Romain
|
3d766c1cb5
|
several pubsub fixes and improvements. also fixes EJAB-913 and EJAB-871
SVN Revision: 2059
|
2009-05-07 00:09:02 +00:00 |
|
Christophe Romain
|
a4b715516e
|
typo fix
SVN Revision: 2051
|
2009-04-30 21:36:33 +00:00 |
|
Christophe Romain
|
0ed0c45aba
|
mod_caps: reduce memory and remove mnesia lock
SVN Revision: 2050
|
2009-04-30 21:09:45 +00:00 |
|
Christophe Romain
|
0770e0eee4
|
after check, last commit was useless
SVN Revision: 2019
|
2009-04-14 12:46:55 +00:00 |
|
Christophe Romain
|
e740cfcc47
|
minor change, back to original patch
SVN Revision: 2017
|
2009-04-14 09:48:34 +00:00 |
|
Christophe Romain
|
cd6587d9df
|
minor improvement for best readability
SVN Revision: 2014
|
2009-04-10 08:40:10 +00:00 |
|
Christophe Romain
|
549fa6e836
|
make sure caps table are clean on startup
SVN Revision: 2013
|
2009-04-10 08:01:08 +00:00 |
|
Christophe Romain
|
409ab48068
|
better hadling of presence in mod_caps
SVN Revision: 2012
|
2009-04-10 07:36:17 +00:00 |
|
Christophe Romain
|
020d6a46c5
|
Add roster subscriptions handling and make PEP events sent to all resources
SVN Revision: 1956
|
2009-03-03 22:42:37 +00:00 |
|
Badlop
|
f09509502e
|
* doc/guide.tex: Update copyright date 2008 to 2009 (EJAB-842)
* doc/guide.html: Likewise
* src/*/*.erl: Likewise
* src/*/*.erl: Remove unneeded blankspaces in license text
SVN Revision: 1804
|
2009-01-12 14:44:42 +00:00 |
|
Christophe Romain
|
17cbd1614a
|
typo fix
SVN Revision: 1748
|
2008-12-23 10:53:06 +00:00 |
|
Christophe Romain
|
4d20367a0c
|
make caps store only required user_caps_default
SVN Revision: 1747
|
2008-12-23 10:51:44 +00:00 |
|
Christophe Romain
|
5adfcfad7a
|
Improve handling of PEP sent to external contacts (EJAB-825)
SVN Revision: 1745
|
2008-12-23 10:20:34 +00:00 |
|
Christophe Romain
|
e2d8154a80
|
Reduce memory consumption due to caps handling
SVN Revision: 1712
|
2008-12-08 14:10:55 +00:00 |
|
Badlop
|
c3bda4aaee
|
* doc/guide.tex: Update Process-one name to ProcessOne (EJAB-708)
* doc/guide.html: Likewise
* doc/api/overview.edoc: Likewise
* src/*/*.erl: Likewise
* src/*/*.hrl: Likewise
* src/*/*.c: Likewise
* src/odbc/*.sql: Likewise
SVN Revision: 1499
|
2008-07-31 11:18:49 +00:00 |
|
Christophe Romain
|
35d25d3420
|
PubSub improvements, and solves (EJAB-453) (EJAB-608)
SVN Revision: 1408
|
2008-07-03 09:56:31 +00:00 |
|
Christophe Romain
|
2304f8cbc8
|
XEP-0115 patch (EJAB-618)
SVN Revision: 1313
|
2008-04-30 08:49:39 +00:00 |
|
Christophe Romain
|
d46b7d5908
|
Cache negative response (EJAB-474)
SVN Revision: 1294
|
2008-04-14 12:02:18 +00:00 |
|
Badlop
|
86df7de48f
|
* src/mod_caps.erl: Move two log calls ERROR_MSG to DEBUG
* src/shaper.erl: Move log call INFO_MSG to DEBUG
SVN Revision: 1247
|
2008-03-21 18:58:07 +00:00 |
|