Christophe Romain
|
db2baa8f84
|
pubsub clean now cluster aware
|
2010-09-24 16:11:39 +02:00 |
|
Christophe Romain
|
a894d25b1f
|
s2s and session are no longer part of replication init of joincluster
|
2010-09-24 16:11:12 +02:00 |
|
Alexey Shchepin
|
ba326eb976
|
Merge branch '2.1.x-applepush' of git@gitorious.process-one.net:+applepush/ejabberd/applepush.git into 2.2.x
|
2010-09-23 16:22:03 +03:00 |
|
Alexey Shchepin
|
fd50b2169b
|
Insert "priority" element in out-of-reception presences
|
2010-09-23 16:18:53 +03:00 |
|
Alexey Shchepin
|
00d8b2ac30
|
Merge branch '2.1.x-applepush' of git@gitorious.process-one.net:+applepush/ejabberd/applepush.git into aplepush-test
Conflicts:
src/ejabberd_c2s.erl
src/mod_offline.erl
src/mod_offline_odbc.erl
|
2010-09-22 22:38:32 +03:00 |
|
Alexey Shchepin
|
cac23c39c9
|
Disable notifications for a user on "Invalid token" error
|
2010-09-22 22:19:36 +03:00 |
|
Alexey Shchepin
|
a5813b798f
|
Fixed "sender" log field
|
2010-09-22 22:19:17 +03:00 |
|
Evgeniy Khramtsov
|
191cd2af3c
|
different hooks should be called for session migration and session close
|
2010-09-21 03:17:52 +10:00 |
|
Alexey Shchepin
|
f2cfee11de
|
Disable notifications for a user on "Invalid token" error
|
2010-09-20 13:35:42 +03:00 |
|
Eric Cestari
|
b0c79c57b0
|
Merge branch '2.2.x' of gitorious.process-one.net:+ejabberd-developers/ejabberd/maincustomers into 2.2.x
|
2010-09-17 16:26:09 +02:00 |
|
Eric Cestari
|
8ea523889b
|
[TECH-1151] Websockets are now handled in pure binary
|
2010-09-17 16:10:59 +02:00 |
|
Eric Cestari
|
b44c462b0e
|
[TECH-1151] IP now correctly stored
|
2010-09-17 14:49:04 +02:00 |
|
Eric Cestari
|
0987700a27
|
Rename protocol version 76 to 00 (new official name)
|
2010-09-17 14:24:24 +02:00 |
|
Eric Cestari
|
ff4f052bb1
|
[TECH-1151] Origin and Protocol parameters are configurable and set.
|
2010-09-17 14:23:34 +02:00 |
|
Christophe Romain
|
100b821c1a
|
added customer related tools
|
2010-09-17 09:11:03 +02:00 |
|
Christophe Romain
|
893c47a2e0
|
add ability to retreive only node names
|
2010-09-17 07:28:28 +02:00 |
|
Christophe Romain
|
694af69982
|
ejabberd.app now set to version 2.2.x
|
2010-09-17 06:46:40 +02:00 |
|
Christophe Romain
|
c576f340f9
|
upgrade to lattest pubsub schema
|
2010-09-17 06:40:48 +02:00 |
|
Badlop
|
179a0cf255
|
Remove some compiled files
|
2010-09-17 00:14:13 +02:00 |
|
Eric Cestari
|
a45ecb70ff
|
[TECH-1511] debug traces reorganized
|
2010-09-16 15:08:53 +02:00 |
|
Christophe Romain
|
df1ab9149f
|
remove garbage configuration
|
2010-09-16 14:53:20 +02:00 |
|
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 |
|
Alexey Shchepin
|
c86e4faba3
|
Fixed "sender" log field
|
2010-09-14 18:00:01 +03: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 |
|
Alexey Shchepin
|
261acfce54
|
Don't resend badge if there are no offline messages
|
2010-09-13 15:46:39 +03: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 |
|
Alexey Shchepin
|
73f7b2ba38
|
Do not disable push on send error
|
2010-09-13 06:22:14 +03:00 |
|
Alexey Shchepin
|
8a693df6e6
|
Added badge resending functions
|
2010-09-13 06:19:38 +03: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 |
|